abstract-webtools 0.1.6.104__py3-none-any.whl → 0.1.6.106__py3-none-any.whl

abstract_webtools/k2s_downloader.py

@@ -11,6 +11,7 @@ from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from abstract_security import *
 from abstract_webtools import *
+from abstract_utilities import safe_dump_to_file,safe_load_from_json
 DOWNLOAD_DIR = os.path.abspath("./downloads")
 class K2SDownloader:
     def __init__(self,env_path=None,download_dir=None,json_file_path=None):
@@ -116,28 +117,36 @@ class dlsManager:
     def __init__(self, downloader):
         self.downloader = downloader
         self.json_file_path = self.downloader.json_file_path
-        all_dls= None
+        all_dls = None
         if self.json_file_path:
             all_dls = safe_load_from_json(self.json_file_path)
-        self.all_dls = all_dls or  []
+        self.all_dls = all_dls or []
         self.last_data = None
+
     def is_prev_dl(self, data):
-        if check_json_data(self.all_dls,data):
+        # Include metadata in data for duplicate checking
+        extended_data = data.copy()
+        if data.get('k2s'):
+            metadata = self.downloader.get_file_metadata(data['k2s'])
+            extended_data.update({
+                'filename': metadata['filename'],
+                'size': metadata['size']
+            })
+        if check_json_data(self.all_dls, extended_data):
             self.last_data = None
             return True
-        self.last_data = data
+        self.last_data = extended_data
         return False
 
     def dl_k2s_link(self, k2s_link):
         if k2s_link:
             print(f"Downloading: {k2s_link}")
-            self.downloader.download_file(k2s_link)
+            metadata = self.downloader.download_file(k2s_link)
             time.sleep(10)
-            if self.json_file_path:
+            if metadata and self.json_file_path and self.last_data:
+                self.last_data.update(metadata)  # Merge download metadata
                 self.all_dls.append(self.last_data)
-                safe_dump_to_file(data=self.all_dls,
-                                  file_path=self.json_file_path)
-
+                safe_dump_to_file(data=self.all_dls, file_path=self.json_file_path)
 
 def get_soup(url):
     try:

{abstract_webtools-0.1.6.104.dist-info → abstract_webtools-0.1.6.106.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_webtools
-Version: 0.1.6.104
+Version: 0.1.6.106
 Summary: Abstract Web Tools is a Python package that provides various utility functions for web scraping tasks. It is built on top of popular libraries such as `requests`, `BeautifulSoup`, and `urllib3` to simplify the process of fetching and parsing web content.
 Home-page: https://github.com/AbstractEndeavors/abstract_essentials/tree/main/abstract_webtools
 Author: putkoff

{abstract_webtools-0.1.6.104.dist-info → abstract_webtools-0.1.6.106.dist-info}/RECORD

@@ -6,7 +6,7 @@ abstract_webtools/big_user_agent_list.py,sha256=5ZkrUWmfzYL5yaULREslh9ZiRQeITbSj
 abstract_webtools/domain_identifier.py,sha256=AvWlGD7C19rySa_J_Brxi3kz43LMWvGsshuuZNg7MvI,3320
 abstract_webtools/extention_list.py,sha256=gRSO4nMbuuXDYzd-ss4s64sS80ZHmUoazMCpgoKG5vE,4884
 abstract_webtools/find_dirs.py,sha256=BlE4ruzMABqmv03NcutZ1j5N3pCc-Q4uNEAMpNolZCQ,2609
-abstract_webtools/k2s_downloader.py,sha256=RUYwPaBisO6suuZ3PbrQ65uc-O-z5PvuJXHjfPvVjeU,6203
+abstract_webtools/k2s_downloader.py,sha256=aiUTLqFSNC_S9lOs98hfuUVj5agDbEiEVWmUqDLXdPU,6708
 abstract_webtools/main.py,sha256=_I7pPXPkoLZOoYGLQDrSLGhGuQt6-PVyXEHZSmglk2g,1329
 abstract_webtools/soup_gui.py,sha256=n95YAps1R6DpMwR4UbthSqQby0C5WHUa9tsW-f2qpLg,5184
 abstract_webtools/url_grabber.py,sha256=pnCCev7ZIuM-6cAGTLmK5HfzZg_AX-fLcRpB6ZE70B8,10441
@@ -42,7 +42,7 @@ abstract_webtools/managers/soupManager/soupManager.py,sha256=U3_o189-OWoBRaSCe2s
 abstract_webtools/managers/urlManager/__init__.py,sha256=gaJCHeK91Z-eYsBnxgdhbIUten1-gbx-zqx70R6ag-Y,26
 abstract_webtools/managers/urlManager/urlManager.py,sha256=vCFuLADmv3h7icaaoAsImGqb_49VizPY_ZvMl-C7PYk,7756
 abstract_webtools/managers/videos/Heather brooke swallo from condom.mp4,sha256=h-bKFLAHt7pGLGu4EcMvSSox7BPRK0Nga3u813iMVKQ,8335544
-abstract_webtools-0.1.6.104.dist-info/METADATA,sha256=7tzHLrTR4fkClFQHubSixPV8eYsVfmavU5veMbr23-s,7289
-abstract_webtools-0.1.6.104.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-abstract_webtools-0.1.6.104.dist-info/top_level.txt,sha256=2DMJ7RmjTcjCsa-uwAV0K6eXXlIIkFDEjBLg_uyCmCI,18
-abstract_webtools-0.1.6.104.dist-info/RECORD,,
+abstract_webtools-0.1.6.106.dist-info/METADATA,sha256=Sxl5mcl7sgkg4FHIpNmaGT7cKHSoGp5DXOGpmkLJSWI,7289
+abstract_webtools-0.1.6.106.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+abstract_webtools-0.1.6.106.dist-info/top_level.txt,sha256=2DMJ7RmjTcjCsa-uwAV0K6eXXlIIkFDEjBLg_uyCmCI,18
+abstract_webtools-0.1.6.106.dist-info/RECORD,,