Split download function

script.py

@@ -472,20 +472,80 @@ def postExists(POST):
     else:
         return False
 
+def downloadPost(SUBMISSION,EXCLUDE):
+    directory = GLOBAL.directory / SUBMISSION['postSubreddit']
+
+    global lastRequestTime
+
+    downloaders = {"imgur":Imgur,"gfycat":Gfycat,"direct":Direct,"self":Self}
+
+    if SUBMISSION['postType'] in downloaders and \
+       not SUBMISSION['postType'] in EXCLUDE:
+
+        print(SUBMISSION['postType'].upper())
+
+        if SUBMISSION['postType'] == "imgur":
+            
+            if int(time.time() - lastRequestTime) <= 2:
+                pass
+
+            credit = Imgur.get_credits()
+
+            IMGUR_RESET_TIME = credit['UserReset']-time.time()
+            USER_RESET = ("after " \
+                            + str(int(IMGUR_RESET_TIME/60)) \
+                            + " Minutes " \
+                            + str(int(IMGUR_RESET_TIME%60)) \
+                            + " Seconds") 
+
+            print(
+                "Client: {} - User: {} - Reset {}".format(
+                    credit['ClientRemaining'],
+                    credit['UserRemaining'],
+                    USER_RESET
+                )
+            )
+
+            if not (credit['UserRemaining'] == 0 or \
+                    credit['ClientRemaining'] == 0):
+
+                """This block of code is needed
+                """
+                if int(time.time() - lastRequestTime) <= 2:
+                    pass
+
+                lastRequestTime = time.time()
+
+            else:
+                if credit['UserRemaining'] == 0:
+                    KEYWORD = "user"
+                elif credit['ClientRemaining'] == 0:
+                    KEYWORD = "client"
+
+                raise ImgurLimitError('{} LIMIT EXCEEDED\n'.format(KEYWORD.upper()))
+
+        downloaders[SUBMISSION['postType']] (directory,SUBMISSION)
+
+    else:
+        raise NoSuitablePost
+
+    return None
+
 def download(submissions):
     """Analyze list of submissions and call the right function
     to download each one, catch errors, update the log files
     """
 
     subsLenght = len(submissions)
+    global lastRequestTime
     lastRequestTime = 0
     downloadedCount = subsLenght
     duplicates = 0
-    BACKUP = {}
+
     if GLOBAL.arguments.exclude is not None:
-        ToBeDownloaded = GLOBAL.arguments.exclude
+        DoNotDownload = GLOBAL.arguments.exclude
     else:
-        ToBeDownloaded = []
+        DoNotDownload = []
 
     FAILED_FILE = createLogFile("FAILED")
 
@@ -499,132 +559,46 @@ def download(submissions):
         )
 
         if postExists(submissions[i]):
-            result = False
             print(submissions[i]['postType'].upper())
             print("It already exists")
             duplicates += 1
             downloadedCount -= 1
             continue
 
-        directory = GLOBAL.directory / submissions[i]['postSubreddit']
+        try:
+            downloadPost(submissions[i],DoNotDownload)
         
-        if submissions[i]['postType'] == 'imgur' and not 'imgur' in ToBeDownloaded:
+        except FileAlreadyExistsError:
-            print("IMGUR",end="")
+            print("It already exists")
+            duplicates += 1
+            downloadedCount -= 1
 
-            while int(time.time() - lastRequestTime) <= 2:
+        except ImgurLoginError:
-                pass
-            credit = Imgur.get_credits()
-
-            IMGUR_RESET_TIME = credit['UserReset']-time.time()
-            USER_RESET = ("after " \
-                          + str(int(IMGUR_RESET_TIME/60)) \
-                          + " Minutes " \
-                          + str(int(IMGUR_RESET_TIME%60)) \
-                          + " Seconds") 
             print(
-                " => Client: {} - User: {} - Reset {}".format(
+                "Imgur login failed. \nQuitting the program "\
-                    credit['ClientRemaining'],
+                "as unexpected errors might occur."
-                    credit['UserRemaining'],
-                    USER_RESET
-                )
             )
+            sys.exit()
 
-            if not (credit['UserRemaining'] == 0 or \
+        except ImgurLimitError as exception:
-                    credit['ClientRemaining'] == 0):
+            FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
+            downloadedCount -= 1
 
-                """This block of code is needed
+        except NotADownloadableLinkError as exception:
-                """
+            print(exception)
-                while int(time.time() - lastRequestTime) <= 2:
+            FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
-                    pass
+            downloadedCount -= 1
-                lastRequestTime = time.time()
 
-                try:
+        except NoSuitablePost:
-                    Imgur(directory,submissions[i])
-
-                except FileAlreadyExistsError:
-                    print("It already exists")
-                    duplicates += 1
-                    downloadedCount -= 1
-
-                except ImgurLoginError:
-                    print(
-                        "Imgur login failed. Quitting the program "\
-                        "as unexpected errors might occur."
-                    )
-                    sys.exit()
-
-                except Exception as exception:
-                    print(exception)
-                    FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
-                    downloadedCount -= 1
-
-            else:
-                if credit['UserRemaining'] == 0:
-                    KEYWORD = "user"
-                elif credit['ClientRemaining'] == 0:
-                    KEYWORD = "client"
-
-                print('{} LIMIT EXCEEDED\n'.format(KEYWORD.upper()))
-                FAILED_FILE.add(
-                    {int(i+1):['{} LIMIT EXCEEDED\n'.format(KEYWORD.upper()),
-                               submissions[i]]}
-                )
-                downloadedCount -= 1
-
-        elif submissions[i]['postType'] == 'gfycat' and not 'gfycat' in ToBeDownloaded:
-            print("GFYCAT")
-            try:
-                Gfycat(directory,submissions[i])
-
-            except FileAlreadyExistsError:
-                print("It already exists")
-                duplicates += 1
-                downloadedCount -= 1
-                
-            except NotADownloadableLinkError as exception:
-                print(exception)
-                FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
-                downloadedCount -= 1
-
-            except Exception as exception:
-                print(exception)
-                FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
-                downloadedCount -= 1
-
-        elif submissions[i]['postType'] == 'direct' and not 'direct' in ToBeDownloaded:
-            print("DIRECT")
-            try:
-                Direct(directory,submissions[i])
-
-            except FileAlreadyExistsError:
-                print("It already exists")
-                downloadedCount -= 1
-                duplicates += 1
-
-            except Exception as exception:
-                print(exception)
-                FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
-                downloadedCount -= 1
-        
-        elif submissions[i]['postType'] == 'self' and not 'self' in ToBeDownloaded:
-            print("SELF")
-            try:
-                Self(directory,submissions[i])
-
-            except FileAlreadyExistsError:
-                print("It already exists")
-                downloadedCount -= 1
-                duplicates += 1
-
-            except Exception as exception:
-                print(exception)
-                FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
-                downloadedCount -= 1
-
-        else:
             print("No match found, skipping...")
             downloadedCount -= 1
         
+        except Exception as exception:
+            # raise exception
+            print(exception)
+            FAILED_FILE.add({int(i+1):[str(exception),submissions[i]]})
+            downloadedCount -= 1
+
     if duplicates:
         print("\n There was {} duplicates".format(duplicates))
 
@@ -634,6 +608,8 @@ def download(submissions):
     else:
         print(" Total of {} links downloaded!".format(downloadedCount))
 
+    return None
+
 def main():
     GLOBAL.arguments = parseArguments()
 
@@ -705,10 +681,12 @@ if __name__ == "__main__":
         print = printToFile
         GLOBAL.RUN_TIME = time.time()
         main()
+
     except KeyboardInterrupt:
         if GLOBAL.directory is None:
             GLOBAL.directory = Path(".\\")
         print("\nQUITTING...")
+        
     except Exception as exception:
         if GLOBAL.directory is None:
             GLOBAL.directory = Path(".\\")
@@ -716,4 +694,4 @@ if __name__ == "__main__":
                       exc_info=full_exc_info(sys.exc_info()))
         print(log_stream.getvalue())
 
-    input("Press enter to quit\n")
+    input("\nPress enter to quit\n")

src/errors.py

@@ -81,3 +81,9 @@ class InvalidSortingType(Exception):
 
 class FileNotFoundError(Exception):
     pass
+
+class NoSuitablePost(Exception):
+    pass
+
+class ImgurLimitError(Exception):
+    pass