more fixes

datawhores · Jan 10, 2024 · dbfdfac · dbfdfac
1 parent 7f4c768
commit dbfdfac
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/ofscraper/api/labels.py b/ofscraper/api/labels.py
@@ -149,7 +149,6 @@ async def scrape_labels(c, model_id, job_progress, offset=0):
                                     )
                                 )
                             )
-                        job_progress.remove_task(task)
                         return data.get("list")
 
                     else:
@@ -163,6 +162,7 @@ async def scrape_labels(c, model_id, job_progress, offset=0):
             except Exception as E:
                 log.traceback_(E)
                 log.traceback_(traceback.format_exc())
+                raise E
 
             finally:
                 sem.release()

diff --git a/ofscraper/classes/media.py b/ofscraper/classes/media.py
@@ -325,7 +325,7 @@ def license(self):
         if not self.mpd:
             return None
         responsetype = self.post.post["responseType"]
-        if responsetype in ["timeline", "archived", "pinned"]:
+        if responsetype in ["timeline", "archived", "pinned", "posts"]:
             responsetype = "post"
         return constants.getattr("LICENCE_URL").format(
             self.id, responsetype, self.postid

diff --git a/ofscraper/classes/posts.py b/ofscraper/classes/posts.py
@@ -82,9 +82,11 @@ def modified_responsetype(self):
 
         else:
             # remap some values
-            response = (
-                config.read_config().get("responsetype", {}).get(self.responsetype)
+            response_key = self.responsetype
+            response_key = (
+                "Timeline" if response_key.lower() in {"post", "post"} else response_key
             )
+            response = config.read_config().get("responsetype", {}).get(response_key)
 
             if response == "":
                 return self.responsetype.capitalize()

diff --git a/ofscraper/commands/manual.py b/ofscraper/commands/manual.py
@@ -66,7 +66,7 @@ def get_media_from_urls(urls):
             elif type == "msg2":
                 model_id = user_name_dict.get(model) or profile.get_id(model)
                 data = messages_.get_individual_post(model_id, postid, c=c) or {}
-                if (data).get("id") != postid:
+                if (data).get("id") != int(postid):
                     data = paid.get_individual_post(model, model_id, postid) or {}
                 id_dict[model_id] = id_dict.get(model_id, []) + [data]
             elif type == "unknown":

diff --git a/ofscraper/download/download.py b/ofscraper/download/download.py
@@ -26,7 +26,7 @@ def medialist_filter(medialist, model_id, username):
         log.debug(f"Final Number of media to download {len(medialist)}")
 
     else:
-        log.info(f"forcing all downloads media count {lense(medialist)}")
+        log.info(f"forcing all downloads media count {len(medialist)}")
     return medialist