ofscraper 3.10.dev4__tar.gz → 3.10.dev5__tar.gz

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ofscraper
-Version: 3.10.dev4
+Version: 3.10.dev5
 Summary: automatically scrape onlyfans
 Author: datawhores
 Author-email: datawhores@riseup.net

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/commands/helpers/context.py

@@ -47,7 +47,8 @@ def get_user_action_function(func):
                         raise e
                 finally:
                     progress_utils.increment_user_activity()
-            records=chain.from_iterable(data)
+            records=list(chain.from_iterable(data))
+
             if len(records)<2:
                 return
             for record in records:

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/commands/metadata.py

@@ -54,9 +54,6 @@ log = logging.getLogger("shared")
 def metadata():
     with progress_utils.setup_activity_progress_live(stop=True):
         if read_args.retriveArgs().scrape_paid:
-            progress_utils.update_activity_task(
-                description="Updating Metadata for  Entire Paid page"
-            )
             metadata_paid_all()
         if not run_action_bool():
             return

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/commands/scraper/post.py

@@ -58,7 +58,6 @@ async def post_media_process(ele, c=None):
 
     username = ele.name
     model_id = ele.id
-    data = None
     console.get_shared_console().clear()
     console.get_shared_console().clear_live()
     await operations.table_init_create(model_id=model_id, username=username)

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/filters/media/helpers.py

@@ -37,7 +37,7 @@ def dupefilterPost(post):
     for item in post:
         if not output[item.id]:
             output[item.id]=item
-        elif item.open and not output[item.id].open:
+        elif item.opened and not output[item.id].opened:
              output[item.id]=item
     return output.values()
 

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/prompts/promptConvert.py

@@ -7,7 +7,6 @@ from prompt_toolkit.shortcuts import prompt as prompt
 
 import ofscraper.prompts.keybindings as keybindings
 import ofscraper.prompts.prompt_strings as prompt_strings
-import ofscraper.utils.console as console
 from ofscraper.utils.live.empty import prompt_live
 
 
@@ -15,8 +14,6 @@ def wrapper(funct):
     def inner(*args, **kwargs):
         # setup
         with prompt_live():
-            console.get_shared_console().clear()
-            console.get_shared_console().clear_live()
             long_message = functools.partial(
                 handle_skip_helper,
                 kwargs.pop("long_message", None) or get_default_instructions(funct),

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/runner/exit.py

@@ -9,11 +9,13 @@ import ofscraper.utils.paths.common as common_paths
 def shutdown():
     close_log.gracefulClose()
     manager.shutdown()
+    closeCache()
 
 
 def forcedShutDown():
     close_log.forcedClose()
     manager.shutdown()
+    closeCache()
 
 
 def closeCache():

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/runner/run.py

@@ -20,18 +20,15 @@ def main():
         try:
             with exit_context.DelayedKeyboardInterrupt():
                 exit_manager.forcedShutDown()
-                exit_manager.closeCache()
         except KeyboardInterrupt as E:
             with exit_context.DelayedKeyboardInterrupt():
                 exit_manager.forcedShutDown()
-                raise E
     except Exception as E:
         logging.getLogger("shared").debug(traceback.format_exc())
         logging.getLogger("shared").debug(E)
         try:
             with exit_context.DelayedKeyboardInterrupt():
-                exit_manager.forcedShutDown()
-                exit_manager.closeCache()
+                exit_manager.shutdown()
         except KeyboardInterrupt as E:
             with exit_context.DelayedKeyboardInterrupt():
                 exit_manager.forcedShutDown()

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/ofscraper/utils/live/empty.py

@@ -1,12 +1,16 @@
 import contextlib
 
 from ofscraper.utils.live.live import get_live
+import ofscraper.utils.console as console
+
 
 
 @contextlib.contextmanager
 def prompt_live():
     old_render = get_live().renderable
     get_live().stop()
+    console.get_shared_console().clear()
+    console.get_shared_console().clear_live()
     yield
     live = get_live(recreate=True)
     live.start()

{ofscraper-3.10.dev4 → ofscraper-3.10.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ofscraper"
-version = "3.10.dev4"
+version = "3.10.dev5"
 description = "automatically scrape onlyfans"
 authors = ["datawhores <datawhores@riseup.net>"]
 readme = "README.md"