ofscraper 3.7.0.dev11__tar.gz → 3.8.0.dev0__tar.gz

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ofscraper
-Version: 3.7.0.dev11
+Version: 3.8.0.dev0
 Summary: automatically scrape onlyfans
 Author: datawhores
 Author-email: datawhores@riseup.net

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/actions/process.py

@@ -23,11 +23,13 @@ import ofscraper.actions.like as like
 import ofscraper.actions.scraper as OF
 import ofscraper.api.init as init
 import ofscraper.api.profile as profile
+import ofscraper.classes.models as models
 import ofscraper.classes.placeholder as placeholder
 import ofscraper.db.operations as operations
 import ofscraper.download.download as download
 import ofscraper.filters.media.main as filters
 import ofscraper.models.selector as userselector
+import ofscraper.models.selector as selector
 import ofscraper.utils.actions as actions
 import ofscraper.utils.args.areas as areas
 import ofscraper.utils.args.read as read_args
@@ -119,10 +121,13 @@ def scrape_paid(user_dict=None):
         )
         for ele in output
     ]
+    oldUsers = selector.get_ALL_SUBS_DICT()
     for value in user_dict.values():
         model_id = value[0].post.model_id
         username = value[0].post.username
-
+        selector.set_ALL_SUBS_DICTVManger(
+            {username: models.Model(profile.scrape_profile(model_id))}
+        )
         operations.create_tables(model_id=model_id, username=username)
         operations.create_backup(model_id, username)
         operations.write_profile_table(model_id=model_id, username=username)
@@ -131,6 +136,8 @@ def scrape_paid(user_dict=None):
             model_id,
             value,
         )
+    # restore og users
+    selector.set_ALL_SUBS_DICT(oldUsers)
 
 
 @exit.exit_wrapper
@@ -169,42 +176,6 @@ def normal_post_process():
                 log.traceback_(f"failed with exception: {e}")
                 log.traceback_(traceback.format_exc())
 
-        if read_args.retriveArgs().scrape_paid:
-            user_dict = {}
-            [
-                user_dict.update(
-                    {ele.post.model_id: user_dict.get(ele.post.model_id, []) + [ele]}
-                )
-                for ele in OF.process_all_paid()
-            ]
-            for value in user_dict.values():
-                try:
-                    model_id = value[0].post.model_id
-                    username = value[0].post.username
-                    log.info(
-                        f"inserting {len(value)} items into  into media table for {username}"
-                    )
-                    operations.batch_mediainsert(
-                        value,
-                        operations.write_media_table_batch,
-                        model_id=model_id,
-                        username=username,
-                        downloaded=False,
-                    )
-                    operations.create_tables(model_id=model_id, username=username)
-                    operations.create_backup(model_id, username)
-                    operations.write_profile_table(model_id=model_id, username=username)
-                    download.download_picker(
-                        username,
-                        model_id,
-                        value,
-                    )
-                except Exception as E:
-                    if isinstance(e, KeyboardInterrupt):
-                        raise E
-                    log.traceback_(f"failed with exception: {E}")
-                    log.traceback_(traceback.format_exc())
-
 
 @exit.exit_wrapper
 def process_like():

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/actions/scraper.py

@@ -406,7 +406,7 @@ def process_all_paid():
             f"[bold]Paid Media for all models[/bold] {sum(map(lambda x:len(x.media),post_array))}"
         )
 
-        return output
+        return filters.filterMedia(output)
 
 
 @free.space_checker

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/api/archive.py

@@ -183,11 +183,6 @@ async def get_archived_media(model_id, username, forced_after=None, rescan=None)
         min_posts = 50
         responseArray = []
         page_count = 0
-        setCache = (
-            True
-            if (read_args.retriveArgs().after == 0 or not read_args.retriveArgs().after)
-            else False
-        )
 
         with Live(
             progress_group, refresh_per_second=5, console=console.get_shared_console()
@@ -221,11 +216,9 @@ async def get_archived_media(model_id, username, forced_after=None, rescan=None)
                     )
                     after = 0
 
-                elif forced_after != None:
-                    after = forced_after
                 else:
-                    after = get_after(model_id, username)
-
+                    after = get_after(model_id, username, forced_after)
+                    # set check
                 log.info(
                     f"""
 Setting initial archived scan date for {username} to {arrow.get(after).format('YYYY.MM.DD')}
@@ -334,23 +327,28 @@ Setting initial archived scan date for {username} to {arrow.get(after).format('Y
             )
         )
         log.debug(f"[bold]Archived Count without Dupes[/bold] {len(unduped)} found")
-        if setCache and not read_args.retriveArgs().after:
-            newCheck = {}
-            for post in cache.get(f"archived_check_{model_id}", []) + list(
-                unduped.values()
-            ):
-                newCheck[post["id"]] = post
-            cache.set(
-                f"archived_check_{model_id}",
-                list(newCheck.values()),
-                expire=constants.getattr("DAY_SECONDS"),
-            )
-            cache.close()
-
+        set_check(unduped, model_id, after)
     return list(unduped.values())
 
 
-def get_after(model_id, username):
+def set_check(unduped, model_id, after):
+    if not after:
+        newCheck = {}
+        for post in cache.get(f"archived_check_{model_id}", []) + list(
+            unduped.values()
+        ):
+            newCheck[post["id"]] = post
+        cache.set(
+            f"archived_check_{model_id}",
+            list(newCheck.values()),
+            expire=constants.getattr("DAY_SECONDS"),
+        )
+        cache.close()
+
+
+def get_after(model_id, username, forced_after=None):
+    if forced_after != None:
+        return forced_after
     if read_args.retriveArgs().after:
         return read_args.retriveArgs().after.float_timestamp
     curr = operations.get_archived_media(model_id=model_id, username=username)

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/api/messages.py

@@ -111,10 +111,9 @@ async def get_messages(model_id, username, forced_after=None, rescan=None):
                     )
                     after = 0
 
-                elif forced_after != None:
-                    after = forced_after
                 else:
-                    after = get_after(model_id, username)
+                    after = get_after(model_id, username, forced_after)
+
                 log.debug(f"Messages after = {after}")
 
                 log.debug(f"Messages before = {before}")
@@ -305,9 +304,23 @@ Setting initial message scan date for {username} to {arrow.get(after).format('YY
                 )
             )
         )
+        set_check(unduped, model_id, after)
         return list(unduped.values())
 
 
+def set_check(unduped, model_id, after):
+    if not after:
+        newCheck = {}
+        for post in cache.get(f"message_check_{model_id}", []) + list(unduped.values()):
+            newCheck[post["id"]] = post
+        cache.set(
+            f"message_check_{model_id}",
+            list(newCheck.values()),
+            expire=constants.getattr("DAY_SECONDS"),
+        )
+        cache.close()
+
+
 async def scrape_messages(
     c, model_id, progress, message_id=None, required_ids=None
 ) -> list:
@@ -449,7 +462,9 @@ def get_individual_post(model_id, postid, c=None):
             log.debug(f"[bold]Individual message  headers:[/bold] {r.headers}")
 
 
-def get_after(model_id, username):
+def get_after(model_id, username, forced_after=None):
+    if forced_after != None:
+        return forced_after
     if read_args.retriveArgs().after:
         return read_args.retriveArgs().after.float_timestamp
     curr = operations.get_messages_media(model_id=model_id, username=username)

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/api/paid.py

@@ -30,6 +30,7 @@ from tenacity import (
 )
 
 import ofscraper.classes.sessionbuilder as sessionbuilder
+import ofscraper.utils.args.read as read_args
 import ofscraper.utils.cache as cache
 import ofscraper.utils.console as console
 import ofscraper.utils.constants as constants
@@ -104,15 +105,22 @@ async def get_paid_posts(username, model_id):
                 )
             )
         )
-        cache.set(
-            f"purchased_check_{model_id}",
-            list(outdict.values()),
-            expire=constants.getattr("DAY_SECONDS"),
-        )
-        cache.close()
+        set_check(outdict, model_id)
         return list(outdict.values())
 
 
+def set_check(unduped, model_id):
+    newCheck = {}
+    for post in cache.get(f"purchased_check_{model_id}", []) + list(unduped.values()):
+        newCheck[post["id"]] = post
+    cache.set(
+        f"purchased_check_{model_id}",
+        list(newCheck.values()),
+        expire=constants.getattr("DAY_SECONDS"),
+    )
+    cache.close()
+
+
 async def scrape_paid(c, username, job_progress, offset=0):
     """Takes headers to access onlyfans as an argument and then checks the purchased content
     url to look for any purchased content. If it finds some it will return it as a list.

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/api/timeline.py

@@ -208,11 +208,8 @@ async def get_timeline_media(model_id, username, forced_after=None, rescan=None)
                 "Used --after previously. Scraping all timeline posts required to make sure content is not missing"
             )
             after = 0
-
-        elif forced_after != None:
-            after = forced_after
         else:
-            after = get_after(model_id, username)
+            after = get_after(model_id, username, forced_after)
 
         log.info(
             f"""
@@ -330,9 +327,25 @@ Setting initial timeline scan date for {username} to {arrow.get(after).format('Y
             )
         )
         log.debug(f"[bold]Timeline Count without Dupes[/bold] {len(unduped)} found")
+        set_check(unduped, model_id, after)
         return list(unduped.values())
 
 
+def set_check(unduped, model_id, after):
+    if not after:
+        newCheck = {}
+        for post in cache.get(f"timeline_check_{model_id}", []) + list(
+            unduped.values()
+        ):
+            newCheck[post["id"]] = post
+        cache.set(
+            f"timeline_check_{model_id}",
+            list(newCheck.values()),
+            expire=constants.getattr("DAY_SECONDS"),
+        )
+        cache.close()
+
+
 def get_individual_post(id, c=None):
     with c.requests(constants.getattr("INDVIDUAL_TIMELINE").format(id))() as r:
         if r.ok:
@@ -344,7 +357,9 @@ def get_individual_post(id, c=None):
             log.debug(f"[bold]individual post headers:[/bold] {r.headers}")
 
 
-def get_after(model_id, username):
+def get_after(model_id, username, forced_after=None):
+    if forced_after != None:
+        return forced_after
     if read_args.retriveArgs().after:
         return read_args.retriveArgs().after.float_timestamp
     curr = operations.get_timeline_media(model_id=model_id, username=username)

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/classes/media.py

@@ -18,6 +18,7 @@ from tenacity import (
 )
 
 import ofscraper.classes.sessionbuilder as sessionbuilder
+import ofscraper.utils.args.quality as quality
 import ofscraper.utils.config.data as data
 import ofscraper.utils.constants as constants
 
@@ -32,11 +33,29 @@ class Media:
         self._media = media
         self._count = count
         self._post = post
+        self._final_url = None
 
     @property
     def expires(self):
         return self._post.expires
 
+    @property
+    def media_source(self):
+        return self._media.get("source", {})
+
+    @property
+    def files_source(self):
+        return self._media.get("files", {}).get("source", {})
+        allowed = quality.get_allowed_qualities()
+        for ele in ["240", "720", "source"]:
+            if ele in allowed and self._media.get("files", {}).get(ele):
+                return self._media.get("files", {}).get(ele)
+        return {}
+
+    @property
+    def quality(self):
+        return self._media.get("videoSources", {})
+
     @property
     def mediatype(self):
         if self._media["type"] == "photo":
@@ -50,9 +69,7 @@ class Media:
 
     @property
     def length(self):
-        return self._media.get("duration") or self._media.get("source", {}).get(
-            "duration"
-        )
+        return self._media.get("duration") or self.media_source.get("duration")
 
     @property
     def numeric_length(self):
@@ -62,12 +79,21 @@ class Media:
 
     @property
     def url(self):
+        if self._final_url:
+            return self._final_url
         if self.responsetype == "stories" or self.responsetype == "highlights":
-            return self._media.get("files", {}).get("source", {}).get("url")
+            self._final_url = self.files_source.get("url")
         elif self.responsetype == "profile":
-            return self._media.get("url")
+            self._final_url = self._media.get("url")
         else:
+            self._final_url = self._url_source_helper()
+        return self._final_url
+
+    def _url_source_helper(self):
+        quality = self.selected_quality
+        if quality == "source":
             return self._media.get("source", {}).get("source")
+        return self._media.get("videoSources", {}).get(quality)
 
     @property
     def post(self):
@@ -256,9 +282,17 @@ class Media:
     def final_filename(self):
         filename = self.filename or self.id
         if self.mediatype == "videos":
-            filename = (
-                filename if re.search("_source", filename) else f"{filename}_source"
-            )
+            filename = re.sub("_[a-z0-9]+$", f"", filename)
+            filename = f"{filename}_{self.selected_quality}"
+        # cleanup
+        filename = self.cleanup(filename)
+        return filename
+
+    @property
+    def no_quality_final_filename(self):
+        filename = self.filename or self.id
+        if self.mediatype == "videos":
+            filename = re.sub("_[a-z]+", f"", filename)
         # cleanup
         filename = self.cleanup(filename)
         return filename
@@ -322,10 +356,20 @@ class Media:
     def mediatype(self, val):
         self._media["type"] = val
 
+    @property
+    def selected_quality(self):
+        allowed = quality.get_allowed_qualities()
+        if self.mediatype != "videos":
+            return "source"
+        for ele in ["240", "720"]:
+            if ele in allowed and self._media.get("videoSources", {}).get(ele):
+                return ele
+        return "source"
+
     # for use in dynamic names
     @property
     def needs_count(self):
-        if set(["filename", "file_name", "text", "postid", "post_id"]).isdisjoint(
+        if set(["text", "postid", "post_id"]).isdisjoint(
             [
                 name
                 for text, name, spec, conv in list(

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/classes/placeholder.py

@@ -128,6 +128,12 @@ class Placeholders:
         self._variables.update({"media_id": media_id})
         self._variables.update({"mediaid": media_id})
         self._variables.update({"modelObj": selector.get_model_fromParsed(username)})
+        self._variables.update({"quality": ele.selected_quality})
+        self._variables.update({"filename": ele.final_filename})
+        self._variables.update({"file_name": ele.final_filename})
+        self._variables.update({"only_file_name": ele.no_quality_final_filename})
+        self._variables.update({"only_filename": ele.no_quality_final_filename})
+        self._variables.update({"text": ele.file_text})
         self.add_price_variables(username)
 
     @wrapper
@@ -235,11 +241,7 @@ class Placeholders:
     @wrapper
     def createfilename(self, ele, username, model_id, ext):
         filename = ele.final_filename
-        self._variables.update({"filename": filename})
-        self._variables.update({"file_name": filename})
         self._variables.update({"ext": ext})
-        text = ele.file_text
-        self._variables.update({"text": text})
         self.add_common_variables(ele, username, model_id)
         globals().update(self._variables)
         log.trace(

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/commands/scraper.py

@@ -119,7 +119,7 @@ def scrapper():
         if len(args.action) == 0 and not args.scrape_paid:
             prompts.action_prompt()
         daemon_process()
-    elif len(args.action) > 0:
+    elif len(args.action) > 0 or args.scrape_paid:
         process_selected_areas()
     elif len(args.action) == 0:
         process_prompts()

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/const/other_url.py

@@ -8,5 +8,5 @@ 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"
+CDRM = "https://cdrm-project.com/wv"
 LARGEZIP = "https://proof.ovh.net/files/100Mb.dat"

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/download/common.py

@@ -524,11 +524,8 @@ def log_download_progress(media_type):
     if media_type is None:
         return
     if (photo_count + audio_count + video_count + forced_skipped + skipped) % 20 == 0:
-        None
-
-
-#         log.debug(
-#             f"In progress -> {format_size(total_bytes )}) ({photo_count+audio_count+video_count} \
-# downloads total [{video_count} videos, {audio_count} audios, {photo_count} photos], \
-#             {forced_skipped} skipped, {skipped} failed)"
-#         )
+        log.debug(
+            f"In progress -> {format_size(total_bytes )}) ({photo_count+audio_count+video_count} \
+downloads total [{video_count} videos, {audio_count} audios, {photo_count} photos], \
+            {forced_skipped} skipped, {skipped} failed)"
+        )

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/filters/media/helpers.py

@@ -149,3 +149,7 @@ def mass_msg_filter(media):
         return list((filter(lambda x: x.mass is True, media)))
     elif read_args.retriveArgs().mass_msg is False:
         return list((filter(lambda x: x.mass is False, media)))
+
+
+def url_filter(media):
+    return list((filter(lambda x: x.url or x.mpd, media)))

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/filters/media/main.py

@@ -214,6 +214,24 @@ def filterMedia(media):
             )
         )
     )
-    log.debug(f"filter{count}->  all media mass message filter count: {len(media)}")
+
+    media = helpers.url_filter(media)
+    count += 1
+    log.trace(
+        "\n\n\n".join(
+            list(
+                map(
+                    lambda x: logformater.format(
+                        f"filter {count}->  valid url filter: ",
+                        x.media,
+                        x.id,
+                        x.postid,
+                    ),
+                    media,
+                )
+            )
+        )
+    )
+    log.debug(f"filter{count}->  all media valid url filter count {len(media)}")
 
     return media

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/models/retriver.py

@@ -10,7 +10,7 @@ import ofscraper.utils.context.stdout as stdout
 import ofscraper.utils.me as me_util
 
 
-def get_models(accounts=None) -> list:
+def get_models(main=False) -> list:
     """
     Get user's subscriptions in form of a list.
     """
@@ -48,6 +48,17 @@ def get_via_list(count):
     return models_objects
 
 
+def get_main_list(count):
+    out = []
+    active_subscriptions = subscriptions.get_subscriptions(count[0], forced=True)
+    expired_subscriptions = subscriptions.get_subscriptions(
+        count[1], account="expired", forced=True
+    )
+    out.extend(active_subscriptions)
+    out.extend(expired_subscriptions)
+    return out
+
+
 def get_via_individual():
     out = individual.get_subscription()
     console.get_shared_console().print(

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/models/selector.py

@@ -34,9 +34,8 @@ def set_ALL_SUBS_DICT(subsDict=None):
         subList = subsDict or ALL_SUBS
         if not subList:
             all_subs_helper()
-        if not ALL_SUBS_DICT:
-            ALL_SUBS_DICT = {}
-            [ALL_SUBS_DICT.update({ele.name: ele}) for ele in subList]
+        ALL_SUBS_DICT = {}
+        [ALL_SUBS_DICT.update({ele.name: ele}) for ele in subList]
 
 
 def get_ALL_SUBS_DICT():
@@ -45,17 +44,8 @@ def get_ALL_SUBS_DICT():
 
 
 def set_ALL_SUBS_DICTVManger(subsDict=None):
-    global ALL_SUBS
     global ALL_SUBS_DICT
-    if subsDict and isinstance(subsDict, dict):
-        ALL_SUBS_DICT = subsDict
-    else:
-        subList = subsDict or ALL_SUBS
-        if not subList:
-            all_subs_helper()
-        if not ALL_SUBS_DICT:
-            ALL_SUBS_DICT = {}
-            [ALL_SUBS_DICT.update({ele.name: ele}) for ele in subList]
+    set_ALL_SUBS_DICT(subsDict)
     manager.update_dict({"subs": ALL_SUBS_DICT})
 
 
@@ -94,12 +84,12 @@ def getselected_usernames(rescan=False, reset=False):
     return PARSED_SUBS
 
 
-def all_subs_helper(refetch=True):
+def all_subs_helper(refetch=True, main=False):
     global ALL_SUBS
     if bool(ALL_SUBS) and not refetch:
         return
     while True:
-        ALL_SUBS = retriver.get_models()
+        ALL_SUBS = retriver.get_models(main)
         if len(ALL_SUBS) > 0:
             set_ALL_SUBS_DICTVManger()
             break

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/utils/args/parse.py

@@ -8,7 +8,7 @@ import ofscraper.utils.args.helpers as helpers
 import ofscraper.utils.args.write as write_args
 import ofscraper.utils.system.system as system
 from ofscraper.__version__ import __version__
-from ofscraper.const.constants import KEY_OPTIONS, OFSCRAPER_RESERVED_LIST
+from ofscraper.const.constants import KEY_OPTIONS
 
 
 def create_parser(input=None):
@@ -119,6 +119,15 @@ def create_parser(input=None):
         default=False,
         help="Bypass the dupe check and redownload all files",
     )
+
+    post.add_argument(
+        "-q",
+        "--quality",
+        default="source",
+        help="Set the minimum allowed quality for videos",
+        choices=["240", "720", "source"],
+    )
+
     post.add_argument(
         "-o",
         "--posts",
@@ -722,8 +731,7 @@ def create_parser(input=None):
     group11.add_argument(
         "-fl",
         "--force-list",
-        help="When --username arg is provided searches entire list based on the currently enabled\
-config settings for userlist or the --user-list arg",
+        help="When --username arg is provided searches entire enabled list(s) before filtering for usernames",
         default=False,
         action="store_true",
     )
@@ -732,7 +740,7 @@ config settings for userlist or the --user-list arg",
     group12.add_argument(
         "-md",
         "--metadata",
-        help="Skip all media downloads and gathers metadata only\nNo change to download status",
+        help="Skip all media downloads and gathers metadata only\nNo change to download status in media table",
         default=None,
         action="store_const",
         dest="metadata",
@@ -741,7 +749,7 @@ config settings for userlist or the --user-list arg",
     group12.add_argument(
         "-mu",
         "--metadata-update",
-        help="Skip all media downloads and gathers metadata only\nUpdates downloads based on file presence",
+        help="Skip all media downloads and gathers metadata only\nUpdates downloaded status in media table based on file presence",
         default=None,
         action="store_const",
         dest="metadata",
@@ -750,7 +758,7 @@ config settings for userlist or the --user-list arg",
     group12.add_argument(
         "-mc",
         "--metadata-complete",
-        help="Skip all media downloads and gathers metadata only\nMarks each media item as downloaded",
+        help="Skip all media downloads and gathers metadata only\nMarks each media item as downloaded in media table",
         default=None,
         action="store_const",
         dest="metadata",

ofscraper-3.8.0.dev0/ofscraper/utils/args/quality.py

@@ -0,0 +1,13 @@
+import ofscraper.utils.args.read as read_args
+
+
+def get_allowed_qualities():
+    qualities = {"source": 4000, "240": 240, "720": 720}
+    minQuality = read_args.retriveArgs().quality
+    validQualities = list(
+        filter(
+            lambda x: x[1] >= qualities.get(minQuality),
+            qualities.items(),
+        )
+    )
+    return list(map(lambda x: x[0], validQualities))

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/ofscraper/utils/args/read.py

@@ -11,7 +11,8 @@ def retriveArgsVManager():
             manager.get_manager_dict()["args"] = parse_args.parse_args()
         return manager.get_manager_dict().get("args")
     except SystemExit as E:
-        print(f"Passed Args {sys.argv[1:]}")
+        if not any(ele in sys.argv[1:] for ele in ["-h", "-v"]):
+            print(f"Passed Args {sys.argv[1:]}")
         raise E
 
 
@@ -21,5 +22,6 @@ def retriveArgs():
             global_args.args = parse_args.parse_args()
         return global_args.args
     except SystemExit as E:
-        print(f"Passed Args {sys.argv[1:]}")
+        if not any(ele in sys.argv[1:] for ele in ["-h", "-v"]):
+            print(f"Passed Args {sys.argv[1:]}")
         raise E

{ofscraper-3.7.0.dev11 → ofscraper-3.8.0.dev0}/pyproject.toml

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