abstract-webtools 0.1.6.104__tar.gz → 0.1.6.106__tar.gz

{abstract_webtools-0.1.6.104 → abstract_webtools-0.1.6.106}/PKG-INFO

@@ -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 → abstract_webtools-0.1.6.106}/setup.py

@@ -4,7 +4,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 setuptools.setup(
     name='abstract_webtools',
-    version='0.1.6.104',
+    version='0.1.6.106',
     author='putkoff',
     author_email='partners@abstractendeavors.com',
     description='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.',

{abstract_webtools-0.1.6.104 → abstract_webtools-0.1.6.106}/src/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 → abstract_webtools-0.1.6.106}/src/abstract_webtools.egg-info/PKG-INFO

@@ -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