fix manual and check mode

ofscraper/api/archive.py

@@ -215,9 +215,11 @@ async def get_archived_media(model_id, username, forced_after=None, rescan=None)
                     or cache.get("{model_id}_scrape_archived")
                     and not read_args.retriveArgs().after
                 )
-                after = after = (
-                    0 if rescan else forced_after or get_after(model_id, username)
-                )
+                if forced_after != None:
+                    after = forced_after
+                else:
+                    after = get_after() if rescan == None else 0
+
                 log.info(
                     f"""
 Setting initial archived scan date for {username} to {arrow.get(after).format('YYYY.MM.DD')}

ofscraper/api/messages.py

@@ -106,9 +106,11 @@ async def get_messages(model_id, username, forced_after=None, rescan=None):
                     or cache.get("{model_id}_scrape_messages")
                     and not read_args.retriveArgs().after
                 )
-                after = after = (
-                    0 if rescan else forced_after or get_after(model_id, username)
-                )
+
+                if forced_after != None:
+                    after = forced_after
+                else:
+                    after = get_after() if rescan == None else 0
                 log.debug(f"Messages after = {after}")
 
                 log.debug(f"Messages before = {before}")

ofscraper/api/timeline.py

@@ -202,7 +202,10 @@ async def get_timeline_media(model_id, username, forced_after=None, rescan=None)
             cache.get("{model_id}_scrape_timeline")
             and not read_args.retriveArgs().after
         )
-        after = after = 0 if rescan else forced_after or get_after(model_id, username)
+        if forced_after != None:
+            after = forced_after
+        else:
+            after = get_after() if rescan == None else 0
 
         log.info(
             f"""

ofscraper/commands/check.py

@@ -20,6 +20,7 @@
 import ofscraper.commands.manual as manual
 import ofscraper.db.operations as operations
 import ofscraper.download.downloadnormal as downloadnormal
+import ofscraper.models.selector as selector
 import ofscraper.utils.args.read as read_args
 import ofscraper.utils.args.write as write_args
 import ofscraper.utils.auth as auth
@@ -58,10 +59,13 @@ def process_download_cart():
             if process_download_cart.counter == 0:
                 if not network.check_cdm():
                     log.info(
-                        "error was raised by cdm checker\nncdm will not be check again\n\n"
+                        "error was raised by cdm checker\ncdm will not be check again\n\n"
                     )
                 else:
                     log.info("cdm checker was fine\ncdm will not be check again\n\n")
+                # should be done once before downloads
+                log.info("Getting Models")
+                selector.all_subs_helper()
 
             process_download_cart.counter = process_download_cart.counter + 1
             log.info("Getting items from queue")

ofscraper/commands/manual.py

@@ -26,6 +26,7 @@ def manual_download(urls=None):
     args = read_args.retriveArgs()
     args.dupe = True
     write_args.setArgs(args)
+    # should be done before downloads
     selector.all_subs_helper()
     for value in media_dict.values():
         if len(value) == 0:

ofscraper/download/main_download.py

@@ -308,7 +308,7 @@ async def main_download_datahandler(r, progress, ele, placeholderObj, total):
         data.get_show_downloadprogress() or read_args.retriveArgs().downloadbars
     )
     task1 = progress.add_task(
-        f"{(pathstr[:constants.getattr('PATH_STR_MAX)')] + '....') if len(pathstr) > constants.getattr('PATH_STR_MAX') else pathstr}\n",
+        f"{(pathstr[:constants.getattr('PATH_STR_MAX')] + '....') if len(pathstr) > constants.getattr('PATH_STR_MAX') else pathstr}\n",
         total=total,
         visible=True if downloadprogress else False,
     )

ofscraper/models/selector.py

@@ -19,6 +19,7 @@
 
 
 def get_model_fromParsed(name):
+    global ALL_SUBS
     if not ALL_SUBS:
         all_subs_helper()
     modelObjs = list(filter(lambda x: x.name == name, ALL_SUBS))