ofscraper 3.10.dev6__tar.gz → 3.10.dev7__tar.gz

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/PKG-INFO

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

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/api/labels.py

@@ -27,8 +27,8 @@ log = logging.getLogger("shared")
 
 
 @run
-async def get_labels_progress(model_id, c=None):
-    labels_ = await get_labels_data_progress(model_id, c=c)
+async def get_labels(model_id, c=None):
+    labels_ = await get_labels_data(model_id, c=c)
     labels_ = (
         labels_
         if not read_args.retriveArgs().label
@@ -39,19 +39,18 @@ async def get_labels_progress(model_id, c=None):
             )
         )
     )
-    return await get_posts_for_labels_progress(labels_, model_id, c=c)
+    return await get_posts_for_labels(labels_, model_id, c=c)
 
 
 @run
-async def get_labels_data_progress(model_id, c=None):
+async def get_labels_data(model_id, c=None):
     tasks = []
     tasks.append(asyncio.create_task(scrape_labels(c, model_id)))
-    progress_utils.labelled_layout.visible = False
     return await process_tasks_labels(tasks)
 
 
 @run
-async def get_posts_for_labels_progress(labels, model_id, c=None):
+async def get_posts_for_labels(labels, model_id, c=None):
     tasks = []
 
     [
@@ -59,43 +58,11 @@ async def get_posts_for_labels_progress(labels, model_id, c=None):
         for label in labels
     ]
     labels_final = await process_tasks_get_posts_for_labels(tasks, labels, model_id)
-    progress_utils.labelled_layout.visible = False
     return labels_final
 
 
-@run
-async def get_labels(model_id, c=None):
-    labels_ = await get_labels_data(model_id, c=c)
-    labels_ = (
-        labels_
-        if not read_args.retriveArgs().label
-        else list(
-            filter(
-                lambda x: x.get("name").lower() in read_args.retriveArgs().label,
-                labels_,
-            )
-        )
-    )
-    return await get_posts_for_labels(labels_, model_id, c=c)
 
 
-@run
-async def get_labels_data(model_id, c=None):
-    with progress_utils.set_up_api_labels():
-        tasks = []
-        tasks.append(asyncio.create_task(scrape_labels(c, model_id)))
-        return await process_tasks_labels(tasks)
-
-
-@run
-async def get_posts_for_labels(labels, model_id, c=None):
-    with progress_utils.set_up_api_posts_labels():
-        tasks = []
-        [
-            tasks.append(asyncio.create_task(scrape_posts_labels(c, label, model_id)))
-            for label in labels
-        ]
-        return await process_tasks_get_posts_for_labels(tasks, labels, model_id)
 
 
 async def process_tasks_labels(tasks):

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/classes/sessionmanager.py

@@ -60,29 +60,29 @@ class SessionSleep:
         log = logging.getLogger("shared")
         if not self._sleep:
             self._sleep = self._init_sleep if self._init_sleep else constants.getattr("SESSION_SLEEP_INIT")
-            log.debug(f"too many req => setting sleep to init [{self._sleep} seconds]")
+            log.debug(f"too many req => setting sleep to init \\[{self._sleep} seconds]")
         elif arrow.now().float_timestamp - self._last_date.float_timestamp < self._difmin:
             log.debug(
-                f"too many req => not changing sleep [{self._sleep} seconds] because last call less than {self._difmin} seconds"
+                f"too many req => not changing sleep \\[{self._sleep} seconds] because last call less than {self._difmin} seconds"
             )
             return self._sleep
         else:
             self._sleep = self._sleep * 2
-            log.debug(f"too many req => setting sleep to [{self._sleep} seconds]")
+            log.debug(f"too many req => setting sleep to \\[{self._sleep} seconds]")
         self._last_date = arrow.now()
         return self._sleep
 
     async def async_do_sleep(self):
         if self._sleep:
             logging.getLogger("shared").debug(
-                f"too many req => waiting [{self._sleep} seconds] before next req"
+                f"too many req => waiting \\[{self._sleep} seconds] before next req"
             )
             await asyncio.sleep(self._sleep)
 
     def do_sleep(self):
         if self._sleep:
             logging.getLogger("shared").debug(
-                f"too many req => waiting [{self._sleep} seconds] before next req"
+                f"too many req => waiting \\[{self._sleep} seconds] before next req"
             )
             time.sleep(self._sleep)
 

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/commands/check.py

@@ -35,7 +35,7 @@ import ofscraper.utils.system.network as network
 from ofscraper.classes.table.row_names import row_names_all
 from ofscraper.commands.helpers.strings import check_str
 from ofscraper.db.operations_.media import batch_mediainsert, get_media_ids_downloaded
-from ofscraper.download.shared.utils.text import textDownloader
+from ofscraper.download.shared.text import textDownloader
 from ofscraper.utils.context.run_async import run
 
 log = logging.getLogger("shared")

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/commands/helpers/strings.py

@@ -14,8 +14,8 @@ post_str_manual = "Manual Mode: Getting media from {url}"
 download_manual_str = "Downloading individual media for {username}"
 check_str = "Checking {activity} for {username}"
 
-all_paid_progress_download_str="[{model_id}_{username}] Downloading Progress :{count}/{length} models"
+all_paid_progress_download_str="\\[{model_id}_{username}] Downloading Progress :{count}/{length} models"
 
-all_paid_progress_metadata_str="[{model_id}_{username}] Metadata Update Progress :{count}/{length} models"
+all_paid_progress_metadata_str="\\[{model_id}_{username}] Metadata Update Progress :{count}/{length} models"
 
 mark_stray_str="Marking Stray Items for {username} as downloaded"

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/commands/scraper/actions/like.py

@@ -161,10 +161,10 @@ def get_final_like_log(like_action,username,failed,post,liked):
 
     text_out=""
     if post==0:
-        text_out=f"[bold][{username}][/bold] [bold][Action {title}][/bold] [{post} post checked), ({liked_log}, {alt_liked_log}), {failed} post failed]"
+        text_out=f"[bold]\\[{username}][/bold] [bold][Action {title}][/bold] \\[{post} post checked), ({liked_log}, {alt_liked_log}), {failed} post failed]"
         log.warning(text_out)
     else:
-        text_out=f"[blue][bold][{username}][/bold] [bold][Action {title}][/bold] [[yellow]{post} post checked[/yellow], ({liked_log}, {alt_liked_log}), {failed_log}][/blue]"
+        text_out=f"[blue][bold]\\[{username}][/bold] [bold][Action {title}][/bold] [[yellow]{post} post checked[/yellow], ({liked_log}, {alt_liked_log}), {failed_log}][/blue]"
         log.warning(text_out)
     return text_out
 

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/commands/scraper/post.py

@@ -365,7 +365,7 @@ async def process_all_paid():
 @free.space_checker
 async def process_labels(model_id, username, c):
     try:
-        labelled_posts_ = await labels_api.get_labels_progress(model_id, c=c)
+        labelled_posts_ = await labels_api.get_labels(model_id, c=c)
 
         labelled_posts_labels = list(
             map(lambda x: labels.Label(x, model_id, username), labelled_posts_)
@@ -397,7 +397,6 @@ async def process_labels(model_id, username, c):
         log.debug(
             f"[bold]Label media count without locked[/bold] {sum(map(lambda x:len(x),unlocked_output))}"
         )
-        a
 
         return (
             [item for sublist in all_output for item in sublist],

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/alt_download.py

@@ -25,36 +25,39 @@ try:
 except ModuleNotFoundError:
     pass
 import ofscraper.classes.placeholder as placeholder
-import ofscraper.download.shared.common.general as common
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.general as common
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.cache as cache
 import ofscraper.utils.constants as constants
 import ofscraper.utils.live.screens as progress_utils
 from ofscraper.download.shared.classes.retries import download_retry
-from ofscraper.download.shared.common.alt_common import (
+from ofscraper.download.shared.alt_common import (
     media_item_keys_alt,
     media_item_post_process_alt,
 )
 
-from ofscraper.download.shared.common.handle_result import (
+from ofscraper.download.shared.handle_result import (
     handle_result_alt,
 )
-from ofscraper.download.shared.common.general import (
+from ofscraper.download.shared.general import (
     check_forced_skip,
     downloadspace,
-    get_ideal_chunk_size,
     get_medialog,
     get_resume_size,
-    get_update_count,
     size_checker,
 )
-from ofscraper.download.shared.utils.log import (
+from ofscraper.download.shared.log import (
     get_url_log,
     path_to_file_logger,
     temp_file_logger,
 )
 
-from ofscraper.download.shared.common.send_bar_msg import (
+from ofscraper.download.shared.progress.chunk import (
+    get_ideal_chunk_size,
+    get_update_count,
+)
+
+from ofscraper.download.shared.send.send_bar_msg import (
     send_bar_msg
 )
 

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/alt_downloadbatch.py

@@ -11,36 +11,38 @@ try:
 except ModuleNotFoundError:
     pass
 import ofscraper.classes.placeholder as placeholder
-import ofscraper.download.shared.common.general as common
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.general as common
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.cache as cache
 import ofscraper.utils.constants as constants
 import ofscraper.utils.live.screens as progress_utils
 import ofscraper.utils.system.system as system
 from ofscraper.download.shared.classes.retries import download_retry
-from ofscraper.download.shared.common.alt_common import (
+from ofscraper.download.shared.alt_common import (
     media_item_keys_alt,
     media_item_post_process_alt,
 )
-from ofscraper.download.shared.common.handle_result import (
+from ofscraper.download.shared.handle_result import (
     handle_result_alt,
 )
-from ofscraper.download.shared.common.general import (
+from ofscraper.download.shared.general import (
     check_forced_skip,
     downloadspace,
-    get_ideal_chunk_size,
     get_medialog,
     get_resume_size,
-    get_update_count,
     size_checker,
 )
-from ofscraper.download.shared.utils.log import (
+from ofscraper.download.shared.log import (
     get_url_log,
     path_to_file_logger,
     temp_file_logger,
 )
 
-from ofscraper.download.shared.common.send_bar_msg import (
+from ofscraper.download.shared.progress.chunk import (
+    get_ideal_chunk_size,
+    get_update_count,
+)
+from ofscraper.download.shared.send.send_bar_msg import (
     send_bar_msg_batch
 )
 
@@ -251,7 +253,6 @@ async def download_fileobject_writer(total, l, ele, placeholderObj):
             )
             await fileobject.write(chunk)
             await send_bar_msg_batch(
-                    {
                         partial(
                             progress_utils.update_download_multi_job_task,
                             ele.id,
@@ -260,7 +261,6 @@ async def download_fileobject_writer(total, l, ele, placeholderObj):
                             .stat()
                             .st_size,
                         ),count,update_count
-                    }
             )
             count += 1
             (await asyncio.sleep(download_sleep)) if download_sleep else None

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/download.py

@@ -11,9 +11,9 @@ import ofscraper.utils.constants as constants
 import ofscraper.utils.hash as hash
 import ofscraper.utils.settings as settings
 import ofscraper.utils.system.system as system
-from ofscraper.download.shared.utils.text import textDownloader
+from ofscraper.download.shared.text import textDownloader
 from ofscraper.utils.context.run_async import run
-from ofscraper.download.shared.utils.log import empty_log
+from ofscraper.download.shared.log import empty_log
 
 
 @run

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/downloadbatch.py

@@ -14,8 +14,8 @@ import more_itertools
 import psutil
 from aioprocessing import AioPipe
 
-import ofscraper.download.shared.common.general as common
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.general as common
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.models.selector as selector
 import ofscraper.utils.args.read as read_args
 import ofscraper.utils.cache as cache
@@ -32,14 +32,14 @@ import ofscraper.utils.system.system as system
 from ofscraper.download.alt_downloadbatch import alt_download
 from ofscraper.download.main_downloadbatch import main_download
 from ofscraper.download.shared.classes.session import download_session
-from ofscraper.download.shared.common.general import (
+from ofscraper.download.shared.general import (
     get_medialog,
     subProcessVariableInit,
 )
-from ofscraper.download.shared.utils.log import final_log, final_log_text   ,log_download_progress
-from ofscraper.download.shared.utils.metadata import metadata
-from ofscraper.download.shared.utils.paths import addGlobalDir, setDirectoriesDate
-from ofscraper.download.shared.utils.progress import convert_num_bytes
+from ofscraper.download.shared.log import final_log, final_log_text   ,log_download_progress
+from ofscraper.download.shared.metadata import metadata
+from ofscraper.download.shared.paths.paths import addGlobalDir, setDirectoriesDate
+from ofscraper.download.shared.progress.progress import convert_num_bytes
 from ofscraper.utils.context.run_async import run
 
 platform_name = platform.system()

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/downloadnormal.py

@@ -16,7 +16,7 @@ import logging
 import traceback
 from functools import partial
 
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.args.read as read_args
 import ofscraper.utils.cache as cache
 import ofscraper.utils.context.exit as exit
@@ -28,11 +28,11 @@ import ofscraper.utils.manager as manager_
 from ofscraper.download.alt_download import alt_download
 from ofscraper.download.main_download import main_download
 from ofscraper.download.shared.classes.session import download_session
-from ofscraper.download.shared.common.general import get_medialog
-from ofscraper.download.shared.utils.log import final_log, final_log_text,log_download_progress
-from ofscraper.download.shared.utils.metadata import metadata
-from ofscraper.download.shared.utils.paths import setDirectoriesDate
-from ofscraper.download.shared.utils.progress import convert_num_bytes
+from ofscraper.download.shared.general import get_medialog
+from ofscraper.download.shared.log import final_log, final_log_text,log_download_progress
+from ofscraper.download.shared.metadata import metadata
+from ofscraper.download.shared.paths.paths import setDirectoriesDate
+from ofscraper.download.shared.progress.progress import convert_num_bytes
 from ofscraper.utils.context.run_async import run
 
 

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/main_download.py

@@ -24,29 +24,31 @@ try:
 except ModuleNotFoundError:
     pass
 import ofscraper.classes.placeholder as placeholder
-import ofscraper.download.shared.common.general as common
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.general as common
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.cache as cache
 import ofscraper.utils.constants as constants
 import ofscraper.utils.live.screens as progress_utils
 from ofscraper.download.shared.classes.retries import download_retry
-from ofscraper.download.shared.common.general import (
+from ofscraper.download.shared.general import (
     check_forced_skip,
     downloadspace,
     get_data,
-    get_ideal_chunk_size,
     get_medialog,
     get_resume_size,
     get_unknown_content_type,
-    get_update_count,
     size_checker,
 )
-from ofscraper.download.shared.common.handle_result import handle_result_main
-from ofscraper.download.shared.utils.log import get_url_log, path_to_file_logger
-from ofscraper.download.shared.utils.metadata import force_download
-from ofscraper.download.shared.common.send_bar_msg import (
+from ofscraper.download.shared.handle_result import handle_result_main
+from ofscraper.download.shared.log import get_url_log, path_to_file_logger
+from ofscraper.download.shared.metadata import force_download
+from ofscraper.download.shared.send.send_bar_msg import (
     send_bar_msg
 )
+from ofscraper.download.shared.progress.chunk import (
+    get_ideal_chunk_size,
+    get_update_count,
+)
 
 
 async def main_download(c, ele, username, model_id):

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/main_downloadbatch.py

@@ -23,30 +23,32 @@ try:
 except ModuleNotFoundError:
     pass
 import ofscraper.classes.placeholder as placeholder
-import ofscraper.download.shared.common.general as common
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.general as common
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.cache as cache
 import ofscraper.utils.constants as constants
 import ofscraper.utils.live.screens as progress_utils
 import ofscraper.utils.settings as settings
 import ofscraper.utils.system.system as system
 from ofscraper.download.shared.classes.retries import download_retry
-from ofscraper.download.shared.common.general import (
+from ofscraper.download.shared.general import (
     check_forced_skip,
     downloadspace,
     get_data,
-    get_ideal_chunk_size,
     get_medialog,
     get_resume_size,
     get_unknown_content_type,
-    get_update_count,
     size_checker,
 )
-from ofscraper.download.shared.common.handle_result import handle_result_main
-from ofscraper.download.shared.utils.log import get_url_log, path_to_file_logger
-from ofscraper.download.shared.utils.metadata import force_download
+from ofscraper.download.shared.progress.chunk import (
+    get_ideal_chunk_size,
+    get_update_count,
+)
+from ofscraper.download.shared.handle_result import handle_result_main
+from ofscraper.download.shared.log import get_url_log, path_to_file_logger
+from ofscraper.download.shared.metadata import force_download
 
-from ofscraper.download.shared.common.send_bar_msg import (
+from ofscraper.download.shared.send.send_bar_msg import (
     send_bar_msg_batch
 )
 

{ofscraper-3.10.dev6/ofscraper/download/shared/common → ofscraper-3.10.dev7/ofscraper/download/shared}/alt_common.py

@@ -1,6 +1,6 @@
-import ofscraper.download.shared.common.general as common
-import ofscraper.download.shared.utils.keyhelpers as keyhelpers
-from ofscraper.download.shared.utils.metadata import force_download
+import ofscraper.download.shared.general as common
+import ofscraper.download.shared.keyhelpers as keyhelpers
+from ofscraper.download.shared.metadata import force_download
 
 
 

{ofscraper-3.10.dev6 → ofscraper-3.10.dev7}/ofscraper/download/shared/classes/session.py

@@ -1,5 +1,5 @@
 import ofscraper.classes.sessionmanager as sessionManager
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.constants as constants
 from ofscraper.download.shared.classes.retries import get_download_req_retries
 

{ofscraper-3.10.dev6/ofscraper/download/shared/common → ofscraper-3.10.dev7/ofscraper/download/shared}/general.py

@@ -16,10 +16,9 @@ import pathlib
 import re
 from functools import partial
 
-import psutil
 from humanfriendly import format_size
 
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.models.selector as selector
 import ofscraper.utils.args.write as write_args
 import ofscraper.utils.cache as cache
@@ -29,10 +28,10 @@ import ofscraper.utils.dates as dates
 import ofscraper.utils.hash as hash
 import ofscraper.utils.settings as settings
 import ofscraper.utils.system.free as system
-from ofscraper.download.shared.utils.log import get_medialog
-from ofscraper.download.shared.utils.media import add_path
-from ofscraper.download.shared.utils.message import send_msg, set_send_msg
-from ofscraper.download.shared.utils.progress import update_total
+from ofscraper.download.shared.log import get_medialog
+from ofscraper.download.shared.paths.media import add_path
+from ofscraper.download.shared.send.message import send_msg, set_send_msg
+from ofscraper.download.shared.progress.progress import update_total
 
 
 def add_additional_data(placeholderObj, ele):
@@ -178,48 +177,4 @@ def is_bad_url(url):
         return True
 
 
-def get_ideal_chunk_size(total_size, curr_file):
-    """
-    Suggests a chunk size based on file size and a calculated available memory buffer.
-
-    Args:
-        file_size (int): Size of the file being downloaded in bytes.
-
-    Returns:
-        int: Suggested chunk size in bytes.
-    """
-    curr_file_size = (
-        pathlib.Path(curr_file).absolute().stat().st_size
-        if pathlib.Path(curr_file).exists()
-        else 0
-    )
-    file_size = total_size - curr_file_size
-
-    # Estimate available memory (considering a buffer for system operations)
-    available_memory = (
-        psutil.virtual_memory().available - 1024 * 1024 * 512
-    )  # Reserve 512MB buffer
-
-    # Target a chunk size that utilizes a reasonable portion of available memory
-    max_chunk_size = min(
-        available_memory // 512, constants.getattr("MAX_CHUNK_SIZE")
-    )  # Max 10MB
-    # Adjust chunk size based on file size (consider smaller sizes for larger files, with minimum)
-    ideal_chunk_size = min(max_chunk_size, file_size // 512)
-    ideal_chunk_size = max(
-        ideal_chunk_size - (ideal_chunk_size % 4096),
-        constants.getattr("MIN_CHUNK_SIZE"),
-    )  # Minimum 4KB chunk
-    return ideal_chunk_size
-
-
-def get_update_count(total_size, curr_file, chunk_size):
-    curr_file_size = (
-        pathlib.Path(curr_file).absolute().stat().st_size
-        if pathlib.Path(curr_file).exists()
-        else 0
-    )
-    file_size = total_size - curr_file_size
-
-    return max((file_size // chunk_size) // constants.getattr("CHUNK_UPDATE_COUNT"), 1)
 

{ofscraper-3.10.dev6/ofscraper/download/shared/common → ofscraper-3.10.dev7/ofscraper/download/shared}/handle_result.py

@@ -3,10 +3,10 @@ import subprocess
 
 import arrow
 
-import ofscraper.download.shared.common.general as common
-import ofscraper.download.shared.globals as common_globals
-import ofscraper.download.shared.utils.log as common_logs
-import ofscraper.download.shared.utils.paths as common_paths
+import ofscraper.download.shared.general as common
+import ofscraper.download.shared.globals.globals as common_globals
+import ofscraper.download.shared.log as common_logs
+import ofscraper.download.shared.paths.paths as common_paths
 import ofscraper.utils.dates as dates
 import ofscraper.utils.system.system as system
 import ofscraper.classes.placeholder as placeholder

{ofscraper-3.10.dev6/ofscraper/download/shared/utils → ofscraper-3.10.dev7/ofscraper/download/shared}/keyhelpers.py

@@ -11,7 +11,7 @@ from pywidevine.cdm import Cdm
 from pywidevine.device import Device
 from pywidevine.pssh import PSSH
 
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.auth.request as auth_requests
 import ofscraper.utils.cache as cache
 import ofscraper.utils.config.data as config_data
@@ -19,7 +19,7 @@ import ofscraper.utils.constants as constants
 import ofscraper.utils.settings as settings
 from ofscraper.download.shared.classes.retries import get_cmd_download_req_retries
 from ofscraper.download.shared.classes.session import cdm_session
-from ofscraper.download.shared.common.general import get_medialog
+from ofscraper.download.shared.general import get_medialog
 
 log = None
 

{ofscraper-3.10.dev6/ofscraper/download/shared/utils → ofscraper-3.10.dev7/ofscraper/download/shared}/log.py

@@ -2,7 +2,7 @@ import re
 
 from humanfriendly import format_size
 
-import ofscraper.download.shared.globals as common_globals
+import ofscraper.download.shared.globals.globals as common_globals
 import ofscraper.utils.args.read as read_args
 import ofscraper.utils.constants as constants
 
@@ -14,20 +14,20 @@ def get_medialog(ele):
 def path_to_file_logger(placeholderObj, ele, innerlog=None):
     innerlog = innerlog or common_globals.log
     innerlog.debug(
-        f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] filename from config {placeholderObj.filename}"
+        f"{get_medialog(ele)} \\[attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] filename from config {placeholderObj.filename}"
     )
     innerlog.debug(
-        f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] full path from config {placeholderObj.filepath}"
+        f"{get_medialog(ele)} \\[attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] full path from config {placeholderObj.filepath}"
     )
     innerlog.debug(
-        f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] full path trunicated from config {placeholderObj.trunicated_filepath}"
+        f"{get_medialog(ele)} \\[attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] full path trunicated from config {placeholderObj.trunicated_filepath}"
     )
 
 
 def temp_file_logger(placeholderObj, ele, innerlog=None):
     innerlog = innerlog or common_globals.log
     innerlog.debug(
-        f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] filename from config {placeholderObj.tempfilepath}"
+        f"{get_medialog(ele)} \\[attempt {common_globals.attempt.get()}/{constants.getattr('API_NUM_TRIES')}] filename from config {placeholderObj.tempfilepath}"
     )
 
 
@@ -51,7 +51,7 @@ def log_download_progress(media_type):
     ) % 20 == 0:
         common_globals.log.debug(
             f"In progress -> {format_size(common_globals.total_bytes )}) ({common_globals.photo_count+common_globals.audio_count+common_globals.video_count} \
-downloads total [{common_globals.video_count} videos, {common_globals.audio_count} audios, {common_globals.photo_count} photos], \
+downloads total \\[{common_globals.video_count} videos, {common_globals.audio_count} audios, {common_globals.photo_count} photos], \
             {common_globals.forced_skipped} skipped, {common_globals.skipped} failed)"
         )
 
@@ -62,7 +62,7 @@ def final_log(username, log=None):
     )
 
 def final_log_text(username):
-    total_count=common_globals.audio_count+common_globals.audio_count+common_globals.video_count
+    total_count=common_globals.audio_count+common_globals.photo_count+common_globals.video_count
     size_log=f"[green]{format_size(common_globals.total_bytes )}[/green]"
 
     
@@ -79,10 +79,10 @@ def final_log_text(username):
     log_format=None
     skipped_log=""
     if read_args.retriveArgs().metadata:
-        log_format="[blue][bold][{username}][/bold] [bold][Action Metadata][/bold] ({size_log}) ([green]{total_count} changed media item total[/green][{video_log}, {audio_log}, {photo_log}], {skipped_log}, {failed_log}))[/blue]"
+        log_format="[blue][bold]\\[{username}][/bold] [bold]\\[Action Metadata][/bold] ({size_log}) ([green]{total_count} changed media item total[/green]\\[{video_log}, {audio_log}, {photo_log}], {skipped_log}, {failed_log}))[/blue]"
         skipped_log=f"[yellow]{common_globals.skipped} metadata unchanged[/yellow]"if common_globals.skipped>0 else f"{common_globals.forced_skipped} items unchanged"
     else:
-        log_format="[blue][bold]\\[{username}][/bold][bold][Action Download][/bold] ({size_log}) ([green]{total_count} downloads total[/green][{video_log}, {audio_log}, {photo_log}], {skipped_log}, {failed_log}))[/blue]"
+        log_format="[blue][bold]\\[{username}][/bold][bold]\\[Action Download][/bold] ({size_log}) ([green]{total_count} downloads total[/green]\\[{video_log}, {audio_log}, {photo_log}], {skipped_log}, {failed_log}))[/blue]"
         skipped_log=f"[yellow]{common_globals.video_count} skipped[/yellow]"if common_globals.skipped>0 else f"{common_globals.forced_skipped} skipped"
 
     return log_format.format(username=username,total_count=total_count,video_log=video_log,audio_log=audio_log,skipped_log=skipped_log,failed_log=failed_log,photo_log=photo_log,size_log=size_log)
@@ -92,9 +92,9 @@ def final_log_text(username):
 def empty_log(username):
 
     if read_args.retriveArgs().metadata:
-        return f"[white][bold][{username}][/bold] [bold][Action Metadata][/bold] ({0} MB) ({0}  changed media items total [{0}  videos, {0}  audios, {0}  photos], {0}  items unchanged, {0}  failed))[/white]"
+        return f"[white][bold]\\[{username}][/bold] [bold]\\[Action Metadata][/bold] ({0} MB) ({0}  changed media items total \\[{0}  videos, {0}  audios, {0}  photos], {0}  items unchanged, {0}  failed))[/white]"
     else:
-        return f"[white][bold][{username}][/bold] [bold][Action Download][/bold] ({0} MB) ({0}  downloads total [{0}  videos, {0}  audios, {0}  photos], {0}  skipped, {0}  failed))[/white]"
+        return f"[white][bold]\\[{username}][/bold] [bold]\\[Action Download][/bold] ({0} MB) ({0}  downloads total \\[{0}  videos, {0}  audios, {0}  photos], {0}  skipped, {0}  failed))[/white]"