ofscraper 3.13.dev0__tar.gz → 3.13.dev2__tar.gz

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ofscraper
-Version: 3.13.dev0
+Version: 3.13.dev2
 Summary: automatically scrape onlyfans
 Author: datawhores
 Author-email: datawhores@riseup.net

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/ofscraper/main/open/load.py

@@ -49,7 +49,7 @@ def setLogger():
     logger.get_shared_logger()
     logs.discord_warning()
     logger.start_threads()
-
+    paths_manage.cleanup_logs()
 
 def systemSet():
     system.setName()

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/ofscraper/prompts/prompt_groups/config.py

@@ -104,6 +104,7 @@ def funct(prompt_):
     enable_auto_after: whether to dynamically set --after: default True
     default_user_list: default user list for --action
     default_black_list: default black list for --action
+    logs_expire_time: max age for a log before it is autodeleted
     remove_hash_match: remove files if hash matches
     ----------------------------------------------------------
     [Response Type]
@@ -638,6 +639,20 @@ Main user list with all active+expired users can be called main or ofscraper.mai
 Active user list can be called active or ofscraper.active
 Expired user list can be called expired or ofscraper.expired
 List are case insensitive\n
+""",
+            },
+
+                        {
+                "type": "input",
+                "name": "logs_expire_time",
+                "message": "Logs expire Time",
+                "default": data.get_logs_expire_time(),
+                "option_instruction": """
+A comma seperated list of userlists to set as black listed
+Main user list with all active+expired users can be called main or ofscraper.main
+Active user list can be called active or ofscraper.active
+Expired user list can be called expired or ofscraper.expired
+List are case insensitive\n
 """,
             },
             {

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/ofscraper/utils/config/data.py

@@ -266,6 +266,14 @@ def get_default_userlist(config=None):
     )
 
 
+@wrapper.config_reader
+def get_logs_expire(config=None):
+    val = (
+        config.get("logs_expire_time")
+        if not any(x == config.get("logs_expire_time") for x in [None, ""])
+        else config.get("advanced_options", {}).get("logs_expire_time")
+    )
+    return val
 @wrapper.config_reader
 def get_post_download_script(config=None):
     if config is False:

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/ofscraper/utils/config/schema.py

@@ -64,6 +64,7 @@ def get_current_config_schema(config: dict = None) -> dict:
             "enable_auto_after": data.get_enable_after(config=config),
             "default_user_list": data.get_default_userlist(config=config),
             "default_black_list": data.get_default_blacklist(config=config),
+            "logs_expire_time":data.get_logs_expire(config=config)
         },
         "scripts_options": {
             "post_download_script": data.get_post_download_script(config=config),

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/ofscraper/utils/paths/common.py

@@ -78,15 +78,13 @@ def getlogpath():
     path = None
     if not data.get_appendlog():
         path = (
-            get_config_home()
-            / "logging"
+            get_log_folder()
             / f'{data.get_main_profile()}_{dates_manager.getLogDate().get("day")}'
             / f'ofscraper_{data.get_main_profile()}_{dates_manager.getLogDate().get("now")}.log'
         )
     else:
         path = (
-            get_config_home()
-            / "logging"
+           get_log_folder()
             / f'ofscraper_{data.get_main_profile()}_{dates_manager.getLogDate().get("day")}.log'
         )
     path = pathlib.Path(path).resolve()
@@ -94,6 +92,11 @@ def getlogpath():
     return path
 
 
+def get_log_folder():
+    return (
+            get_config_home()
+            / "logging")
+
 def get_profile_path(name=None):
     if name:
         profile = get_config_home() / name

ofscraper-3.13.dev2/ofscraper/utils/paths/manage.py

@@ -0,0 +1,77 @@
+import logging
+import shutil
+import arrow
+import traceback
+import ofscraper.utils.paths.common as common_paths
+import ofscraper.utils.settings as settings
+import ofscraper.utils.context.stdout as stdout
+import ofscraper.utils.console as console_
+
+console=console_.get_shared_console()
+
+
+def make_folders():
+    common_paths.get_config_folder()
+    create_profile_path()
+
+
+def create_profile_path(name=None):
+    out = common_paths.get_profile_path(name)
+    out.mkdir(exist_ok=True, parents=True)
+    return out
+
+
+def copy_path(source, dst):
+    try:
+        shutil.copy2(source, dst)
+    except OSError as e:
+        logging.getLogger("shared").debug("failed to copy with copy2 using copy")
+        logging.getLogger("shared").traceback_(e)
+        logging.getLogger("shared").traceback_(traceback.format_exc())
+        shutil.copy(source, dst)
+    except Exception as e:
+        raise e
+
+
+def cleanup_logs():
+    """
+    Performs actions to cleanup logs
+    """
+    with stdout.lowstdout():
+        delete_old_logs()
+        delete_empty_folders()
+
+def delete_old_logs():
+    """
+    Recursively finds and deletes .log files in the specified folder
+    that are older than the given maximum age
+
+    Also cleans up folder
+    """
+    log_path = common_paths.get_log_folder()
+    now = arrow.now().float_timestamp
+    if not settings.get_settings().logs_expire_time:
+        return
+    for log_file in log_path.rglob("*.log"):  # rglob for recursive globbing
+        try:
+            if (now - log_file.stat().st_mtime) > settings.get_settings().logs_expire_time:
+                log_file.unlink()  # pathlib's way to delete a file
+                console.print(f"Deleted old log file: {log_file}")
+        except OSError as e:
+            console.print(f"Error deleting file {log_file}: {e}")
+def delete_empty_folders():
+    """
+    Recursively finds and deletes empty folders within thelog folder.
+
+    """
+    log_path = common_paths.get_log_folder()
+
+    # Iterate through all directories within the log folder and its subdirectories
+    for folder in sorted(log_path.rglob("*"), key=lambda p: len(str(p)), reverse=True):
+        if folder.is_dir() and not any(folder.iterdir()):
+            try:
+                folder.rmdir()
+                console.print(f"Deleted empty folder: {folder}")
+            except OSError as e:
+                console.print(f"Error deleting folder {folder}: {e}")
+

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/ofscraper/utils/settings.py

@@ -98,6 +98,7 @@ def setup_settings(mediatype):
     )
     merged.auto_resume = get_auto_resume(mediatype)
     merged.cached_disabled = get_auto_after_enabled()
+    merged.logs_expire_time=config_data.get_logs_expire()
 
     return merged
 

{ofscraper-3.13.dev0 → ofscraper-3.13.dev2}/pyproject.toml

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

ofscraper-3.13.dev0/ofscraper/utils/paths/manage.py

@@ -1,28 +0,0 @@
-import logging
-import shutil
-import traceback
-
-import ofscraper.utils.paths.common as common_paths
-
-
-def make_folders():
-    common_paths.get_config_folder()
-    create_profile_path()
-
-
-def create_profile_path(name=None):
-    out = common_paths.get_profile_path(name)
-    out.mkdir(exist_ok=True, parents=True)
-    return out
-
-
-def copy_path(source, dst):
-    try:
-        shutil.copy2(source, dst)
-    except OSError as e:
-        logging.getLogger("shared").debug("failed to copy with copy2 using copy")
-        logging.getLogger("shared").traceback_(e)
-        logging.getLogger("shared").traceback_(traceback.format_exc())
-        shutil.copy(source, dst)
-    except Exception as e:
-        raise e