ofscraper 3.10.dev7__tar.gz → 3.10.dev9__tar.gz

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

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

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

@@ -1,7 +1,7 @@
 progress_str = "Progress {count}/{length}"
 data_str = "Data Retrival on {name}"
 avatar_str = "Avatar : {avatar}"
-area_str = "Getting \[[bold blue]{areas}[/bold blue]] for [bold]{name}[/bold]\n[bold]Subscription Active:[/bold] {active}"
+area_str = "Getting \[[bold deep_sky_blue2]{areas}[/bold deep_sky_blue2]] for [bold]{name}[/bold]\n[bold]Subscription Active:[/bold] {active}"
 all_paid_model_id_str = "getting username data for {model_id}"
 all_paid_str = "Creating databases for {username}"
 download_activity_str = "Performing Downloading Action on {username}"

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/commands/metadata.py

@@ -205,7 +205,7 @@ async def process_ele_user_first_data_retriver(ele=None, session=None):
 
 
 def process_selected_areas():
-    log.debug("[bold blue] Running Metadata Mode [/bold blue]")
+    log.debug("[bold deep_sky_blue2] Running Metadata Mode [/bold deep_sky_blue2]")
     force_change_download()
     progress_utils.update_activity_task(description="Running Metadata Mode")
     with scrape_context_manager():

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

@@ -164,7 +164,7 @@ def get_final_like_log(like_action,username,failed,post,liked):
         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"[deep_sky_blue2][bold]\\[{username}][/bold] [bold][Action {title}][/bold] [[yellow]{post} post checked[/yellow], ({liked_log}, {alt_liked_log}), {failed_log}][/deep_sky_blue2]"
         log.warning(text_out)
     return text_out
 

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

@@ -30,7 +30,7 @@ log = logging.getLogger("shared")
 
 
 def process_selected_areas():
-    log.debug("[bold blue] Running Action Mode [/bold blue]")
+    log.debug("[bold deep_sky_blue2] Running Action Mode [/bold deep_sky_blue2]")
     runner()
     while True:
         if not data.get_InfiniteLoop() or prompts.continue_prompt() == "No":

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/const/values/config.py

@@ -57,5 +57,5 @@ DEFAULT_LOG_LEVEL = "DEBUG"
 INCLUDE_LABELS_ALL = False
 DISCORD_THREAD_OVERRIDE = False
 DISCORD_ASYNC = False
-USE_CACHE_KEY = True
+USE_WIV_CACHE_KEY = True
 POST_SCRIPT_DEFAULT = None

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/const/values/other_url.py

@@ -8,6 +8,6 @@ FFMPEG_WINDOWS = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest
 FFMPEG_MAC = "https://evermeet.cx/ffmpeg/#api-download"
 CDRM2 = "http://172.106.17.134:8080/wv"
 KEYDB = "https://keysdb.net/api"
-CDRM = "https://cdrm-project.com/wv"
+CDRM = "https://old.cdrm-project.com/"
 LARGEZIP = "https://proof.ovh.net/files/100Mb.dat"
 BAD_URL_HOST = {"us.upload.onlyfans.com", "of2transcoder.s3-accelerate.amazonaws.com"}

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

@@ -140,27 +140,36 @@ async def alt_download_downloader(item, c, ele):
 
 
 async def resume_data_handler(data, item, c, ele, placeholderObj):
-    item["total"] = (
+    common_globals.log.debug(f"{get_medialog(ele)} Resume cached data {data}")
+    total=(
         int(data.get("content-total")) if data.get("content-total") else None
     )
+    item["total"]=total
+
     resume_size = get_resume_size(placeholderObj, mediatype=ele.mediatype)
-    if await check_forced_skip(ele, item["total"]) == 0:
+    common_globals.log.debug(f"{get_medialog(ele)} resume_size: {resume_size}  and total: {total }")
+
+    if await check_forced_skip(ele, total) == 0:
         item["total"] = 0
         return item
-    elif item["total"] == resume_size:
+    elif total == resume_size:
+        common_globals.log.debug(f"{get_medialog(ele)} total==resume_size skipping download")
+
         temp_file_logger(placeholderObj, ele)
-        total = item["total"]
         (
             await common.total_change_helper(None, total)
             if common.alt_attempt_get(item).get() == 1
             else None
         )
         return item
-    elif item["total"] != resume_size:
+    elif total!= resume_size:
         return await alt_download_sendreq(item, c, ele, placeholderObj)
 
 
 async def fresh_data_handler(item, c, ele, placeholderObj):
+    common_globals.log.debug(
+            f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] fresh download for media"
+    )
     result = None
     try:
         result = await alt_download_sendreq(item, c, ele, placeholderObj)
@@ -189,6 +198,7 @@ async def alt_download_sendreq(item, c, ele, placeholderObj):
 
 async def send_req_inner(c, ele, item, placeholderObj):
     try:
+
         resume_size = get_resume_size(placeholderObj, mediatype=ele.mediatype)
         headers = None if not resume_size else {"Range": f"bytes={resume_size}-"}
         params = {
@@ -200,7 +210,7 @@ async def send_req_inner(c, ele, item, placeholderObj):
         url = f"{base_url}{item['origname']}"
 
         common_globals.log.debug(
-            f"{get_medialog(ele)} [attempt {common.alt_attempt_get(item).get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] Downloading media with url {url}"
+            f"{get_medialog(ele)} [attempt {common.alt_attempt_get(item).get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] Downloading media with url  {ele.mpd}"
         )
         async with c.requests_async(
             url=url, headers=headers, params=params, forced=True
@@ -225,6 +235,9 @@ async def send_req_inner(c, ele, item, placeholderObj):
                 total = item["total"]
                 await common.total_change_helper(total, 0)
             elif total != resume_size:
+                common_globals.log.debug(
+                f"{get_medialog(ele)} [attempt {common.alt_attempt_get(item).get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] writing media to disk"
+                )
                 await download_fileobject_writer(total, l, ele, placeholderObj)
         await size_checker(placeholderObj.tempfilepath, ele, total)
         return item

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

@@ -57,8 +57,17 @@ async def alt_download(c, ele, username, model_id):
     )
     async for _ in download_retry():
         with _:
-            sharedPlaceholderObj = await placeholder.Placeholders(ele, "mp4").init()
-            audio, video = await ele.mpd_dict
+            try:
+                sharedPlaceholderObj = await placeholder.Placeholders(ele, "mp4").init()
+                audio, video = await ele.mpd_dict
+            except Exception as e:
+                common_globals.log.handlers[1].queue.put(
+                list(common_globals.innerlog.get().handlers[1].queue.queue)
+                )
+                common_globals.log.handlers[0].queue.put(
+                list(common_globals.innerlog.get().handlers[0].queue.queue)
+                )
+                raise e
     path_to_file_logger(sharedPlaceholderObj, ele, common_globals.innerlog.get())
     audio = await alt_download_downloader(audio, c, ele)
     video = await alt_download_downloader(video, c, ele)
@@ -121,29 +130,45 @@ async def alt_download_downloader(
                 common_globals.innerlog.get().traceback_(
                     f"{get_medialog(ele)} [attempt {_attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] {E}"
                 )
+                common_globals.log.handlers[1].queue.put(
+                list(common_globals.innerlog.get().handlers[1].queue.queue)
+                )
+                common_globals.log.handlers[0].queue.put(
+                list(common_globals.innerlog.get().handlers[0].queue.queue)
+                )
                 raise E
 
 
 async def resume_data_handler(data, item, c, ele, placeholderObj):
-    item["total"] = (
+    common_globals.log.debug(f"{get_medialog(ele)} Resume cached data {data}")
+    total=(
         int(data.get("content-total")) if data.get("content-total") else None
     )
+    item["total"] = total
+
     resume_size = get_resume_size(placeholderObj, mediatype=ele.mediatype)
-    if await check_forced_skip(ele, item["total"]) == 0:
+    common_globals.log.debug(f"{get_medialog(ele)} resume_size: {resume_size}  and total: {total }")
+    if await check_forced_skip(ele,total) == 0:
         item["total"] = 0
         return item
-    elif item["total"] == resume_size:
-        total = item["total"]
+    elif total == resume_size:
+        common_globals.log.debug(f"{get_medialog(ele)} total==resume_size skipping download")
+
         (
+
             await common.batch_total_change_helper(None, total)
             if common.alt_attempt_get(item).get() == 1
             else None
         )
+        return item
     elif item["total"] != resume_size:
         return await alt_download_sendreq(item, c, ele, placeholderObj)
 
 
 async def fresh_data_handler(item, c, ele, placeholderObj):
+    common_globals.log.debug(
+            f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] fresh download for media"
+    )
     result = None
     try:
         result = await alt_download_sendreq(item, c, ele, placeholderObj)
@@ -180,7 +205,7 @@ async def alt_download_sendreq(item, c, ele, placeholderObj):
 
 
 async def send_req_inner(c, ele, item, placeholderObj):
-    try:
+    try:        
         resume_size = get_resume_size(placeholderObj, mediatype=ele.mediatype)
         headers = None if not resume_size else {"Range": f"bytes={resume_size}-"}
         params = {
@@ -192,7 +217,7 @@ async def send_req_inner(c, ele, item, placeholderObj):
         url = f"{base_url}{item['origname']}"
 
         common_globals.log.debug(
-            f"{get_medialog(ele)} [attempt {common.alt_attempt_get(item).get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] Downloading media with url {url}"
+            f"{get_medialog(ele)} [attempt {common.alt_attempt_get(item).get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] Downloading media with url  {ele.mpd}"
         )
 
         async with c.requests_async(
@@ -218,6 +243,9 @@ async def send_req_inner(c, ele, item, placeholderObj):
                 total = item["total"]
                 await common.batch_total_change_helper(total, 0)
             elif total != resume_size:
+                common_globals.log.debug(
+                f"{get_medialog(ele)} [attempt {common.alt_attempt_get(item).get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] writing media to disk"
+                )
                 await download_fileobject_writer(total, l, ele, placeholderObj)
         await size_checker(placeholderObj.tempfilepath, ele, total)
         return item

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

@@ -113,6 +113,9 @@ async def main_download_downloader(c, ele):
 
 
 async def fresh_data_handler(c, tempholderObj, ele):
+    common_globals.log.debug(
+            f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] fresh download for media"
+    )
     result = None
     try:
         result = await main_download_sendreq(
@@ -124,15 +127,19 @@ async def fresh_data_handler(c, tempholderObj, ele):
 
 
 async def resume_data_handler(data, c, tempholderObj, ele):
+    common_globals.log.debug(f"{get_medialog(ele)} Resume cached data {data}")
     content_type = data.get("content-type").split("/")[-1]
     total = int(data.get("content-total")) if data.get("content-total") else None
     placeholderObj = await placeholder.Placeholders(ele, content_type).init()
     resume_size = get_resume_size(tempholderObj, mediatype=ele.mediatype)
+    common_globals.log.debug(f"{get_medialog(ele)} resume_size: {resume_size}  and total: {total}")
+
     # other
     if await check_forced_skip(ele, total) == 0:
         path_to_file_logger(placeholderObj, ele)
         return [0]
     elif total == resume_size:
+        common_globals.log.debug(f"{get_medialog(ele)} total==resume_size skipping download")
         (
             await common.total_change_helper(None, total)
             if common_globals.attempt.get() == 1
@@ -208,7 +215,9 @@ async def send_req_inner(c, ele, tempholderObj, placeholderObj=None, total=None)
                 total = 0
                 await common.total_change_helper(total, 0)
             elif total != resume_size:
-                total = total
+                common_globals.log.debug(
+            f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] writing to media to disk"
+                )
                 await download_fileobject_writer(
                     r, ele, tempholderObj, placeholderObj, total
                 )
@@ -227,7 +236,6 @@ async def download_fileobject_writer(r, ele, tempholderObj, placeholderObj, tota
         total=total,
     )
     try:
-        loop = asyncio.get_event_loop()
         fileobject = await aiofiles.open(tempholderObj.tempfilepath, "ab").__aenter__()
         download_sleep = constants.getattr("DOWNLOAD_SLEEP")
         chunk_size = get_ideal_chunk_size(total, tempholderObj.tempfilepath)

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

@@ -28,7 +28,6 @@ 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.general import (
@@ -113,11 +112,21 @@ async def main_download_downloader(c, ele):
                 common_globals.innerlog.get().traceback_(
                     f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] {E}"
                 )
+                common_globals.log.handlers[1].queue.put(
+                list(common_globals.innerlog.get().handlers[1].queue.queue)
+                )
+                common_globals.log.handlers[0].queue.put(
+                list(common_globals.innerlog.get().handlers[0].queue.queue)
+                )
                 raise E
 
 
 async def fresh_data_handler(c, ele, tempholderObj):
+    common_globals.log.debug(
+            f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] fresh download for media {ele.url}"
+    )
     result = None
+
     try:
         result = await main_download_sendreq(
             c, ele, tempholderObj, placeholderObj=None, total=None
@@ -128,10 +137,13 @@ async def fresh_data_handler(c, ele, tempholderObj):
 
 
 async def resume_data_handler(data, c, ele, tempholderObj):
+    common_globals.log.debug(f"{get_medialog(ele)} Resume cached data {data}")
     content_type = data.get("content-type").split("/")[-1]
     total = int(data.get("content-total")) if data.get("content-total") else None
     placeholderObj = await placeholder.Placeholders(ele, content_type).init()
     resume_size = get_resume_size(tempholderObj, mediatype=ele.mediatype)
+    common_globals.log.debug(f"{get_medialog(ele)} resume_size: {resume_size}  and total: {total}")
+
     # other
     if await check_forced_skip(ele, total) == 0:
         path_to_file_logger(placeholderObj, ele, common_globals.innerlog.get())
@@ -141,6 +153,7 @@ async def resume_data_handler(data, c, ele, tempholderObj):
             placeholderObj,
         )
     elif total == resume_size:
+        common_globals.log.debug(f"{get_medialog(ele)} total==resume_size skipping download")
         path_to_file_logger(placeholderObj, ele, common_globals.innerlog.get())
         (
             await common.batch_total_change_helper(None, total)
@@ -209,6 +222,9 @@ async def send_req_inner(c, ele, tempholderObj, placeholderObj=None, total=None)
                 total = 0
                 await common.batch_total_change_helper(total, 0)
             elif total != resume_size:
+                common_globals.log.debug(
+                f"{get_medialog(ele)} [attempt {common_globals.attempt.get()}/{constants.getattr('DOWNLOAD_FILE_NUM_TRIES')}] writing media to disk"
+                )       
                 await download_fileobject_writer(
                     r, ele, total, tempholderObj, placeholderObj
                 )

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

@@ -37,7 +37,7 @@ async def un_encrypt(item, c, ele, input_=None):
         await asyncio.get_event_loop().run_in_executor(
             common_globals.thread, partial(cache.get, ele.license)
         )
-        if constants.getattr("USE_CACHE_KEY")
+        if constants.getattr("USE_WIV_CACHE_KEY")
         else None
     )
     if past_key:

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

@@ -63,27 +63,27 @@ def final_log(username, log=None):
 
 def final_log_text(username):
     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]"
+    size_log=f"[bold green]{format_size(common_globals.total_bytes )}[/bold green]"
 
     
-    photo_log=f"[green]{common_globals.photo_count} photos[/green]"if common_globals.photo_count>0 else f"{common_globals.photo_count} photos"
+    photo_log=f"[bold green]{common_globals.photo_count} photos[/bold green]"if common_globals.photo_count>0 else f"{common_globals.photo_count} photos"
 
-    audio_log=f"[green]{common_globals.audio_count} audios[/green]"if common_globals.audio_count>0 else f"{common_globals.audio_count} audios"
+    audio_log=f"[bold green]{common_globals.audio_count} audios[/bold green]"if common_globals.audio_count>0 else f"{common_globals.audio_count} audios"
 
 
-    video_log=f"[green]{common_globals.video_count} videos[/green]"if common_globals.video_count>0 else f"{common_globals.video_count} videos"
+    video_log=f"[bold green]{common_globals.video_count} videos[/bold green]"if common_globals.video_count>0 else f"{common_globals.video_count} videos"
 
 
-    failed_log=f"[red]{common_globals.video_count} failed[/red]"if common_globals.skipped>0 else f"{common_globals.skipped} failed"
+    failed_log=f"[bold red]{common_globals.skipped} failed[/bold red]"if common_globals.skipped>0 else f"{common_globals.skipped} failed"
 
     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]"
-        skipped_log=f"[yellow]{common_globals.skipped} metadata unchanged[/yellow]"if common_globals.skipped>0 else f"{common_globals.forced_skipped} items unchanged"
+        log_format="[deep_sky_blue2][bold]\\[{username}][/bold] [bold]\\[Action Metadata][/bold] ({size_log}) ([bold green]{total_count} changed media item total [/bold green]\\[{video_log}, {audio_log}, {photo_log}], {skipped_log}, {failed_log}))[/deep_sky_blue2]"
+        skipped_log=f"[bold yellow]{common_globals.forced_skipped} metadata unchanged[/bold yellow]"if common_globals.forced_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]"
-        skipped_log=f"[yellow]{common_globals.video_count} skipped[/yellow]"if common_globals.skipped>0 else f"{common_globals.forced_skipped} skipped"
+        log_format="[deep_sky_blue2][bold]\\[{username}][/bold] [bold]\\[Action Download][/bold] ({size_log}) ([bold green]{total_count} downloads total [/bold green]\\[{video_log}, {audio_log}, {photo_log}], {skipped_log}, {failed_log}))[/deep_sky_blue2]"
+        skipped_log=f"[bold yellow]{common_globals.forced_skipped} skipped[/bold yellow]"if common_globals.forced_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)
 

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/prompts/helpers/prompt_helpers.py

@@ -26,36 +26,36 @@ def model_details(prompt_):
             f"""
         ========================================================================================================================================
 
-        Name: [bold blue]{selected.name}[/bold blue]
+        Name: [bold deep_sky_blue2]{selected.name}[/bold deep_sky_blue2]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        ID: [bold blue]{selected.id}[/bold blue]
+        ID: [bold deep_sky_blue2]{selected.id}[/bold deep_sky_blue2]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Renewed Date: [bold blue]{selected.renewed_string}[/bold blue]
+        Renewed Date: [bold deep_sky_blue2]{selected.renewed_string}[/bold deep_sky_blue2]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Subscribed Date: [bold blue]{selected.subscribed_string}[/bold blue]
+        Subscribed Date: [bold deep_sky_blue2]{selected.subscribed_string}[/bold deep_sky_blue2]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Expired Date: [bold blue]{selected.expired_string}[/bold blue]
+        Expired Date: [bold deep_sky_blue2]{selected.expired_string}[/bold deep_sky_blue2]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Last Seen: [bold blue] {selected.last_seen_formatted}[/bold blue]
+        Last Seen: [bold deep_sky_blue2] {selected.last_seen_formatted}[/bold deep_sky_blue2]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Original Sub Price: [bold blue]{selected.sub_price}[/bold blue]   [Current Subscription Price]
+        Original Sub Price: [bold deep_sky_blue2]{selected.sub_price}[/bold deep_sky_blue2]   [Current Subscription Price]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Original Regular Price: [bold blue]{selected.regular_price}[/bold blue]   [Regular Subscription Price Set By Model]
+        Original Regular Price: [bold deep_sky_blue2]{selected.regular_price}[/bold deep_sky_blue2]   [Regular Subscription Price Set By Model]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Original Claimable Promo Price: [bold blue]{selected.lowest_promo_claim}[/bold blue]   [Lowest Promotional Price Marked as Claimable]
+        Original Claimable Promo Price: [bold deep_sky_blue2]{selected.lowest_promo_claim}[/bold deep_sky_blue2]   [Lowest Promotional Price Marked as Claimable]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Original Any Promo Price: [bold blue]{selected.lowest_promo_all}[/bold blue]   [Lowest of Any Promotional Price]
+        Original Any Promo Price: [bold deep_sky_blue2]{selected.lowest_promo_all}[/bold deep_sky_blue2]   [Lowest of Any Promotional Price]
         =======================================================================================================================================
         
         [italic yellow]Final Prices Detail =>[ https://of-scraper.gitbook.io/of-scraper/batch-scraping-and-bot-actions/model-selection-sorting/price-filtering-sort][/italic yellow]
         ---------------------------------------------------------------------------------------------------------------------------------------
-        Final Current Price: [bold blue]{selected.final_current_price}[/bold blue]   [Sub Price or Lowest Claimable Promo Price or Regular Price| See Final Price Details]
+        Final Current Price: [bold deep_sky_blue2]{selected.final_current_price}[/bold deep_sky_blue2]   [Sub Price or Lowest Claimable Promo Price or Regular Price| See Final Price Details]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Final Promo Price: [bold blue]{selected.final_promo_price}[/bold blue]   [Lowest Any Promo Price or Regular Price | See Final Price Details]
+        Final Promo Price: [bold deep_sky_blue2]{selected.final_promo_price}[/bold deep_sky_blue2]   [Lowest Any Promo Price or Regular Price | See Final Price Details]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Final Renewal Price: [bold blue]{selected.final_renewal_price}[/bold blue]   [Lowest Claimable Promo or Regular Price | See Final Price Details]
+        Final Renewal Price: [bold deep_sky_blue2]{selected.final_renewal_price}[/bold deep_sky_blue2]   [Lowest Claimable Promo or Regular Price | See Final Price Details]
         ----------------------------------------------------------------------------------------------------------------------------------------
-        Final Regular Price: [bold blue]{selected.final_regular_price}[/bold blue]   [Regular Price | See Final Price Details]
+        Final Regular Price: [bold deep_sky_blue2]{selected.final_regular_price}[/bold deep_sky_blue2]   [Regular Price | See Final Price Details]
         =======================================================================================================================================  
 
         PRESS ENTER TO RETURN
@@ -75,16 +75,16 @@ def price_info(prompt_):
 [italic yellow]Final Prices Detail =>[ https://of-scraper.gitbook.io/of-scraper/batch-scraping-and-bot-actions/model-selection-sorting/price-filtering-sort][/italic yellow]
 
 ---------------------------------------------------------------------------------------
-current_price => [bold blue]{read_args.retriveArgs().current_price if read_args.retriveArgs().current_price else 'paid and free'}[/bold blue]
+current_price => [bold deep_sky_blue2]{read_args.retriveArgs().current_price if read_args.retriveArgs().current_price else 'paid and free'}[/bold deep_sky_blue2]
 [Sub Price or Lowest Claimable Promo Price or Regular Price| See Final Price Details]
 ---------------------------------------------------------------------------------------
-promo_price => [bold blue]{read_args.retriveArgs().promo_price if read_args.retriveArgs().promo_price else 'paid and free'}[/bold blue]
+promo_price => [bold deep_sky_blue2]{read_args.retriveArgs().promo_price if read_args.retriveArgs().promo_price else 'paid and free'}[/bold deep_sky_blue2]
 [Lowest Any Promo Price or Regular Price | See Final Price Details]
 ---------------------------------------------------------------------------------------
-regular_price => [bold blue]{read_args.retriveArgs().regular_price if read_args.retriveArgs().regular_price else 'paid and free'}[/bold blue]
+regular_price => [bold deep_sky_blue2]{read_args.retriveArgs().regular_price if read_args.retriveArgs().regular_price else 'paid and free'}[/bold deep_sky_blue2]
 [Lowest Claimable Promo or Regular Price | See Final Price Details]
 ---------------------------------------------------------------------------------------
-renewal_price => [bold blue]{read_args.retriveArgs().renewal_price if read_args.retriveArgs().renewal_price else 'paid and free'}[/bold blue]
+renewal_price => [bold deep_sky_blue2]{read_args.retriveArgs().renewal_price if read_args.retriveArgs().renewal_price else 'paid and free'}[/bold deep_sky_blue2]
 [Regular Price | See Final Price Details]
 ==========================================================================================================================================
 
@@ -103,9 +103,9 @@ def sort_info(prompt_):
             f"""
 ========================================================================================================================================
 
-sorting by =>  [bold blue]{read_args.retriveArgs().sort}[/bold blue]
+sorting by =>  [bold deep_sky_blue2]{read_args.retriveArgs().sort}[/bold deep_sky_blue2]
 ---------------------------------------------------------------------------------------
-sorting direction => [bold blue]{'desc' if read_args.retriveArgs().desc else 'asc'}[/bold blue]
+sorting direction => [bold deep_sky_blue2]{'desc' if read_args.retriveArgs().desc else 'asc'}[/bold deep_sky_blue2]
 ========================================================================================================================================
 PRESS ENTER TO RETURN
 
@@ -231,47 +231,47 @@ def get_current_filters(prompt_):
             f"""
 ========================================================================================================================================
 
-subscription => [bold blue]{'active' if read_args.retriveArgs().sub_status else 'expired' if read_args.retriveArgs().sub_status is False else 'expired and active'}[/bold blue]
+subscription => [bold deep_sky_blue2]{'active' if read_args.retriveArgs().sub_status else 'expired' if read_args.retriveArgs().sub_status is False else 'expired and active'}[/bold deep_sky_blue2]
 ---------------------------------------------------------------------------------------
-renew => [bold blue]{'renew on' if read_args.retriveArgs().renewal else 'renew off' if read_args.retriveArgs().renewal is False else 'renew on/off'}[/bold blue]
+renew => [bold deep_sky_blue2]{'renew on' if read_args.retriveArgs().renewal else 'renew off' if read_args.retriveArgs().renewal is False else 'renew on/off'}[/bold deep_sky_blue2]
 ==========================================================================================================================================
 
-user-list in use=> [bold blue]{settings.get_userlist() or 'no userlist'}[/bold blue]
+user-list in use=> [bold deep_sky_blue2]{settings.get_userlist() or 'no userlist'}[/bold deep_sky_blue2]
 ---------------------------------------------------------------------------------------
-black-list in use=> [bold blue]{settings.get_blacklist() or 'no blacklist'}[/bold blue]
+black-list in use=> [bold deep_sky_blue2]{settings.get_blacklist() or 'no blacklist'}[/bold deep_sky_blue2]
 ==========================================================================================================================================
 
-promo status => [bold blue]{'promo on' if read_args.retriveArgs().promo else 'promo off' if read_args.retriveArgs().promo is False else 'promo off/on'}[/bold blue]
+promo status => [bold deep_sky_blue2]{'promo on' if read_args.retriveArgs().promo else 'promo off' if read_args.retriveArgs().promo is False else 'promo off/on'}[/bold deep_sky_blue2]
 ---------------------------------------------------------------------------------------
-all promo status => [bold blue]{'all promo on' if read_args.retriveArgs().all_promo else 'all promo off' if read_args.retriveArgs().all_promo is False else 'all promo off/on'}[/bold blue]
+all promo status => [bold deep_sky_blue2]{'all promo on' if read_args.retriveArgs().all_promo else 'all promo off' if read_args.retriveArgs().all_promo is False else 'all promo off/on'}[/bold deep_sky_blue2]
 ==========================================================================================================================================
 
-last-seen => [bold blue]{read_args.retriveArgs().last_seen}[/bold blue]
+last-seen => [bold deep_sky_blue2]{read_args.retriveArgs().last_seen}[/bold deep_sky_blue2]
 ---------------------------------------------------------------------------------------
-last-seen-before => [bold blue]{read_args.retriveArgs().last_seen_before}[/bold blue]
+last-seen-before => [bold deep_sky_blue2]{read_args.retriveArgs().last_seen_before}[/bold deep_sky_blue2]
 ---------------------------------------------------------------------------------------
-last-seen-after => [bold blue]{read_args.retriveArgs().last_seen_after}[/bold blue]
+last-seen-after => [bold deep_sky_blue2]{read_args.retriveArgs().last_seen_after}[/bold deep_sky_blue2]
 ==========================================================================================================================================
 
 [italic yellow]Final Prices Detail =>[ https://of-scraper.gitbook.io/of-scraper/batch-scraping-and-bot-actions/model-selection-sorting/price-filtering-sort][/italic yellow]
 
 ---------------------------------------------------------------------------------------
-current_price => [bold blue]{read_args.retriveArgs().current_price if read_args.retriveArgs().current_price else 'paid and free'}[/bold blue]
+current_price => [bold deep_sky_blue2]{read_args.retriveArgs().current_price if read_args.retriveArgs().current_price else 'paid and free'}[/bold deep_sky_blue2]
 [Sub Price or Lowest Claimable Promo Price or Regular Price| See Final Price Details]
 ---------------------------------------------------------------------------------------
-promo_price => [bold blue]{read_args.retriveArgs().promo_price if read_args.retriveArgs().promo_price else 'paid and free'}[/bold blue]
+promo_price => [bold deep_sky_blue2]{read_args.retriveArgs().promo_price if read_args.retriveArgs().promo_price else 'paid and free'}[/bold deep_sky_blue2]
 [Lowest Any Promo Price or Regular Price | See Final Price Details]
 ---------------------------------------------------------------------------------------
-regular_price => [bold blue]{read_args.retriveArgs().regular_price if read_args.retriveArgs().regular_price else 'paid and free'}[/bold blue]
+regular_price => [bold deep_sky_blue2]{read_args.retriveArgs().regular_price if read_args.retriveArgs().regular_price else 'paid and free'}[/bold deep_sky_blue2]
 [Lowest Claimable Promo or Regular Price | See Final Price Details]
 ---------------------------------------------------------------------------------------
-renewal_price => [bold blue]{read_args.retriveArgs().renewal_price if read_args.retriveArgs().renewal_price else 'paid and free'}[/bold blue]
+renewal_price => [bold deep_sky_blue2]{read_args.retriveArgs().renewal_price if read_args.retriveArgs().renewal_price else 'paid and free'}[/bold deep_sky_blue2]
 [Regular Price | See Final Price Details]
 =======================================================================================================================================
 
-sorting by =>  [bold blue]{read_args.retriveArgs().sort}[/bold blue]
+sorting by =>  [bold deep_sky_blue2]{read_args.retriveArgs().sort}[/bold deep_sky_blue2]
 ---------------------------------------------------------------------------------------
-sorting direction => [bold blue]{'desc' if read_args.retriveArgs().desc else 'asc'}[/bold blue]
+sorting direction => [bold deep_sky_blue2]{'desc' if read_args.retriveArgs().desc else 'asc'}[/bold deep_sky_blue2]
 =======================================================================================================================================
 
 PRESS ENTER TO RETURN

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/utils/auth/helpers.py

@@ -52,10 +52,10 @@ def get_empty():
 def authwarning(authFile):
     console.print(
         "[bold yellow]For an example of how your auth file should look see \
-            \n [bold blue]https://of-scraper.gitbook.io/of-scraper/auth#example[/bold blue][/bold yellow]"
+            \n [bold deep_sky_blue2]https://of-scraper.gitbook.io/of-scraper/auth#example[/bold deep_sky_blue2][/bold yellow]"
     )
     console.print(
-        f"[bold yellow]If you still can't authenticate after editing from script consider manually edit the file at\n[bold blue]{authFile}[/bold blue][/bold yellow]"
+        f"[bold yellow]If you still can't authenticate after editing from script consider manually edit the file at\n[bold deep_sky_blue2]{authFile}[/bold deep_sky_blue2][/bold yellow]"
     )
 
 

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/utils/live/groups.py

@@ -49,9 +49,9 @@ api_progress_group = Group(
 
 # download
 
-overall_panel = Blue_Panel(download_overall_progress, style="bold blue")
-multi_panel = Blue_Panel(multi_download_job_progress, style="bold blue")
-single_panel = Blue_Panel(download_job_progress, style="bold blue")
+overall_panel = Blue_Panel(download_overall_progress, style="bold deep_sky_blue2")
+multi_panel = Blue_Panel(multi_download_job_progress, style="bold deep_sky_blue2")
+single_panel = Blue_Panel(download_job_progress, style="bold deep_sky_blue2")
 download_progress_group = None
 multi_download_progress_group = None
 

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/utils/live/panel.py

@@ -2,4 +2,4 @@ from functools import partial
 
 from rich.panel import Panel
 
-Blue_Panel = partial(Panel, style="bold blue")
+Blue_Panel = partial(Panel, style="bold deep_sky_blue2")

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/utils/logs/classes.py

@@ -267,12 +267,13 @@ class DiscordFormatter(SensitiveFormatter):
     @staticmethod
     def _filter(s):
         t = SensitiveFormatter._filter(s)
-        t=re.sub("\\\\+","",t)
-        t=re.sub(r"\[(bold|/?bold(?:\s\w+\s\w+)?)\]","**",t)
+        t=re.sub("\\\\+","\\\\",t)
+        t=re.sub("\[bold[^\]]*]","**",t)
+        t=re.sub("\[\/bold[^\]]*]","**",t)
         t=Text.from_markup(Text(t).plain).plain
+        t=re.sub("  +"," ",t)
         t=re.sub("\*\*+","**",t)
-        return t
-
+        t=re.sub("\\\\+","",t)
 
 
 class LogFileFormatter(SensitiveFormatter):

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/ofscraper/utils/menu.py

@@ -26,7 +26,7 @@ def get_count():
 
 def main_menu_action():
     global count
-    log.debug("[bold blue] Running Prompt Menu Mode[/bold blue]")
+    log.debug("[bold deep_sky_blue2] Running Prompt Menu Mode[/bold deep_sky_blue2]")
     while True:
         result_main_prompt = prompts.main_prompt()
         if result_main_prompt == "action":

{ofscraper-3.10.dev7 → ofscraper-3.10.dev9}/pyproject.toml

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