ofscraper 3.13.dev3__tar.gz → 3.13.dev4__tar.gz

{ofscraper-3.13.dev3 → ofscraper-3.13.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ofscraper
-Version: 3.13.dev3
+Version: 3.13.dev4
 Summary: automatically scrape onlyfans
 Author: datawhores
 Author-email: datawhores@riseup.net
@@ -51,6 +51,7 @@ Requires-Dist: speedtest-cli (>=2.1.3,<3.0.0)
 Requires-Dist: tenacity (>=8.2.3,<9.0.0)
 Requires-Dist: textual (==1.0.0)
 Requires-Dist: tqdm (>=4.66.4,<5.0.0)
+Requires-Dist: ua-generator (>=2.0.5,<3.0.0)
 Requires-Dist: uvloop (>=0.19.0,<0.20.0) ; sys_platform == "linux" or sys_platform == "linux2"
 Requires-Dist: win32-setctime (>=1.1.0,<2.0.0)
 Requires-Dist: xxhash (>=3.4.1,<4.0.0)

{ofscraper-3.13.dev3 → ofscraper-3.13.dev4}/ofscraper/classes/sessionmanager/sessionmanager.py

@@ -18,6 +18,8 @@ import ofscraper.utils.config.data as data
 import ofscraper.utils.constants as constants
 from ofscraper.utils.auth.utils.warning.print import print_auth_warning
 import ofscraper.utils.settings as settings
+import ua_generator
+
 
 TOO_MANY = "too_many"
 AUTH = "auth"
@@ -25,6 +27,7 @@ FORCED_NEW = "get_new_sign"
 SIGN = "get_sign"
 COOKIES = "get_cookies_str"
 HEADERS = "create_header"
+AGENT=str(ua_generator.generate())
 
 
 def is_rate_limited(exception, sleeper):
@@ -343,17 +346,21 @@ class sessionManager:
                 try:
                     sleeper.do_sleep()
                     # remake each time
-                    headers = (
-                        self._create_headers(
-                            headers, url, SIGN in actions, FORCED_NEW in actions
-                        )
-                        if (
+                    if (
                             SIGN in actions
                             or FORCED_NEW in actions
                             or HEADERS in actions
-                        )
-                        else None
-                    )
+                       ):
+                            headers = self._create_headers(
+                                    headers, url, SIGN in actions, FORCED_NEW in actions
+                                )
+                    elif not headers or not "user-agent" in headers:
+                        headers=headers or {}
+                        headers.update({"user-agent":AGENT})
+                        
+                        
+                       
+                    
                     cookies = self._create_cookies() if COOKIES in actions else None
                     r = self._httpx_funct(
                         method,
@@ -448,17 +455,21 @@ class sessionManager:
                 await sem.acquire()
                 try:
                     await sleeper.async_do_sleep()
-                    headers = (
-                        self._create_headers(
-                            headers, url, SIGN in actions, FORCED_NEW in actions
-                        )
-                        if (
+                    if (
                             SIGN in actions
                             or FORCED_NEW in actions
                             or HEADERS in actions
+                    ): 
+                        headers = (
+                        self._create_headers(
+                            headers, url, SIGN in actions, FORCED_NEW in actions
                         )
-                        else headers
+                       
                     )
+                    elif not headers or not "user-agent" in headers:
+                        headers= headers or {}
+                        headers.update({"user-agent":AGENT})
+                        
 
                     cookies = self._create_cookies() if COOKIES in actions else None
                     json = json

{ofscraper-3.13.dev3 → ofscraper-3.13.dev4}/ofscraper/data/api/common/after.py

@@ -10,7 +10,7 @@ def get_after_pre_checks(model_id, api):
         val = 0
     elif settings.get_settings().after is not None:
         val = settings.get_settings().after.float_timestamp
-    elif not settings.get_settings().auto_after():
+    elif not settings.get_settings().auto_after:
         val = 0
     elif read_full_after_scan_check(model_id, api):
         val = 0

{ofscraper-3.13.dev3 → ofscraper-3.13.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ofscraper"
-version = "3.13.dev3"
+version = "3.13.dev4"
 description = "automatically scrape onlyfans"
 authors = ["datawhores <datawhores@riseup.net>"]
 readme = "README.md"
@@ -53,6 +53,7 @@ async-property = "^0.2.2"
 limiter = "^0.5.0"
 aiolimiter = "^1.1.0"
 textual = "1.0.0"
+ua-generator = "^2.0.5"
 
 
 [tool.poetry.group.dev.dependencies]