fix: snaptik

tiktok_downloader/scrapper.py

@@ -8,12 +8,17 @@
 from .utils import info_videotiktok
 import re
 
-def extract_id(initf: Callable[[info_post, str], None])->Callable[[info_post, str], None]:
+
+def extract_id(
+    initf: Callable[[info_post, str], None]
+) -> Callable[[info_post, str], None]:
     subdo_redirect = ['vt', 'vm']
+
     def regex(url: str) -> str:
         if not findall(r'[0-9]{19}', url):
             raise InvalidUrl()
         return findall(r'[0-9]{19}', url)[0]
+
     def apply(cls: info_post, url: str):
         subdo = re.findall(r'://(\w+)\.', url)
         if subdo and subdo[0] in subdo_redirect:
@@ -23,6 +28,7 @@ def apply(cls: info_post, url: str):
         initf(cls, regex(url))
     return apply
 
+
 class Author:
     def __init__(self, ascp: dict):
         self.username = ascp['unique_id']

tiktok_downloader/snaptik.py

@@ -58,15 +58,13 @@ def get_media(self) -> list[info_videotiktok]:
                 i,
                 self
             )
-            for i in set(
-                map(
-                    lambda x:x[0].strip('\\'),
-                    findall(
-                        r'\"(https?://(tikcdn\.net|snapsave\.info).*?)\"',
-                        dec
-                    )
-                )
-            )
+            for i in set(['https://snaptik.app'+x.strip('\\') for x in findall(
+                r'(/file.php?.*?)\"',
+                dec
+            )] + [i.strip('\\') for i in findall(
+                r'\"(https?://snapxcdn.*?)\"',
+                dec
+            )])
         ]
 
     def __iter__(self):

tiktok_downloader/utils.py

@@ -8,7 +8,6 @@
 simplefilter('ignore')
 
 
-
 class Odummy:
     def __init__(self):
         pass
@@ -61,16 +60,19 @@ def download(
                 open(out, 'wb') if isinstance(
                     out,
                     str) else BytesIO())
-        with tqdm(
-            total=int(request.headers['Content-Length']),
-            unit='iB',
-                unit_scale=True) if bar else Odummy() as pbar:
-            for i in request.iter_content(chunk_size):
-                stream.write(i)
-                pbar.update(i.__len__())
-            pbar.update(int(request.headers['Content-Length']))
-            if not isinstance(pbar, Odummy):
-                sleep(1)
+        if request.headers.get('content-length'):
+            with tqdm(
+                total=int(request.headers['Content-Length']),
+                unit='iB',
+                    unit_scale=True) if bar else Odummy() as pbar:
+                for i in request.iter_content(chunk_size):
+                    stream.write(i)
+                    pbar.update(i.__len__())
+                pbar.update(int(request.headers['Content-Length']))
+                if not isinstance(pbar, Odummy):
+                    sleep(1)
+        else:
+            stream.write(request.content)
         return None if isinstance(out, (str, BufferedWriter)) else stream
 
     def __str__(self) -> str: