abstract-webtools 0.1.6.78__tar.gz → 0.1.6.80__tar.gz

{abstract_webtools-0.1.6.78 → abstract_webtools-0.1.6.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_webtools
-Version: 0.1.6.78
+Version: 0.1.6.80
 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.78 → abstract_webtools-0.1.6.80}/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.78',
+    version='0.1.6.80',
     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.80/src/abstract_webtools/managers/allss//.py

@@ -0,0 +1,19 @@
+allss = """BASE_DIR = Path('/var/www/clownworld')
+TEMPLATES_DIR = BASE_DIR / 'templates'
+TEMPLATES_FOLDER_PATH = TEMPLATES_DIR / 'videos'
+FLASK_APP_DIR = BASE_DIR  / 'video_player'
+VIDEO_REACT = BASE_DIR / 'bolshevid'
+BUILD_DIR = VIDEO_REACT / 'build'
+STATIC_DIR = BUILD_DIR / 'static'
+IMGS_DIR = STATIC_DIR / 'imgs'
+CSS_DIR = STATIC_DIR / 'css'
+JS_DIR = STATIC_DIR / 'js'
+DATA_DIR = BASE_DIR / 'data'
+VIDEOS_DIR = DATA_DIR / 'videos'
+USERS_DIR = DATA_DIR / 'users'
+DOWNLOADS_DIR = DATA_DIR / 'downloads'
+DOWNLOADS_VIDS_DIR = DOWNLOADS_DIR / 'videos'"""
+ste = ''
+for alls in allss.split('\n'):
+    ste+=f"{alls.split(' ')[0]},"
+input(ste)

{abstract_webtools-0.1.6.78 → abstract_webtools-0.1.6.80}/src/abstract_webtools/managers/videoDownloader.py

@@ -240,49 +240,89 @@ def optimize_video_for_safari(input_file, reencode=False):
         
         try:
             subprocess.run(command, check=True)
-            shutil.copy2(local_output, input_file)
+    
+            os.remove(input_file)
+            shutil.move(local_output, input_file)
             print(f"Optimized video saved as {input_file}")
         except subprocess.CalledProcessError as e:
             print(f"Error during optimization: {e}")
         return input_file
     finally:
         shutil.rmtree(tmp_dir)
-
-def downloadvideo(url, directory=False, rename_display=True, thumbnails=True, audio=False,safari_optimize=False):
+def bool_or_default(obj,default=True):
+    if obj == None:
+        obj =  default
+    return obj
+def get_video_info(url,download_directory=None,output_filename=None,get_info=None,download_video=None):
     directory = directory or os.getcwd()
-    temp_id = re.sub(r'[^\w\d.-]', '_', url)[-20:]
-    temp_filename = f"temp_{temp_id}.mp4"
+    output_filename = output_filename or get_temp_file_name(url)
+    get_info = bool_or_true(get_info)
+    download_video = bool_or_default(download_video,default=False)
     video_mgr = VideoDownloader(
         url=url,
         download_directory=directory,
-        download_video=True,
-        get_info=True,
-        output_filename=temp_filename
+        download_video=download_video,
+        get_info=get_info,
+        output_filename=output_filename
     )
-    info = video_mgr.info
+    return video_mgr
+def get_temp_id(url):
+    url = str(url)
+    url_length = len(url)
+    len_neg = 20
+    len_neg = len_neg if url_length >= len_neg else url_length
+    temp_id = re.sub(r'[^\w\d.-]', '_', url)[-len_neg:]
+    return temp_id
+def get_temp_file_name(url):
+    temp_id = get_temp_id(url)
+    temp_filename = f"temp_{temp_id}.mp4"
+    return temp_filename
+def get_display_id(info):
     display_id = info.get('display_id') or info.get('id')
-    directory = os.path.join(directory, display_id)
+    return display_id
+def get_video_title(info):
+    title = info.get('title', 'video')[:30]
+    return title
+def get_safe_title(title):
+    re_str = r'[^\w\d.-]'
+    safe_title = re.sub(re_str, '_', title)
+    return safe_title
+def downloadvideo(url, directory=None,output_filename=None, rename_display=None, thumbnails=None, audio=None,safari_optimize=None,download_video=None,*args,**kwargs):
+    rename_display = bool_or_default(rename_display)
+    thumbnails= bool_or_default(thumbnails)
+    audio= bool_or_default(thumbnails,default=False)
+    safari_optimize=bool_or_default(thumbnails,default=True)
+    download_video =bool_or_default(download_video,default=True)
+    output_filename = output_filename or get_temp_file_name(url)
+    video_mgr = get_video_info(url,download_directory=directory,output_filename=output_filename,download_video=download_video)
+    info = video_mgr.info
+    display_id = get_display_id(info)
     os.makedirs(directory, exist_ok=True)
-    
-    if rename_display and info and 'file_path' in info:
+    video_directory = os.path.join(directory, display_id)
+    os.makedirs(video_directory, exist_ok=True)
+    file_path = None
+    if info:
+        file_path = info.get('file_path')
+    if rename_display and file_path:
         # Rename using metadata
-        video_id = info.get('id', temp_id)
-        title = info.get('title', 'video')[:30]  # Limit to 30 chars
-        safe_title = re.sub(r'[^\w\d.-]', '_', title)
-        final_filename = f"{safe_title}_{video_id}.mp4"
-        new_path = os.path.join(directory, final_filename)
+        video_id = info.get('id', get_temp_id(url))
+        title = output_filename or get_video_title(info)
+        safe_title = get_safe_title(title)
+        final_filename = output_filename or f"{safe_title}_{video_id}"
+        final_filename = f"{final_filename}.mp4"
+        new_path = os.path.join(video_directory, final_filename)
         if os.path.exists(info['file_path']):
             os.rename(info['file_path'], new_path)
             info['file_path'] = new_path
+        info['file_path'] = new_path
             
             # *** Here we call the optimization function ***
     video_path = info.get('file_path')
     if video_path and video_path.lower().endswith('.mp4') and safari_optimize:
         info['file_path'] = optimize_video_for_safari(video_path,reencode=safari_optimize)
-
-    info_path = os.path.join(directory, 'info.json')
+    info_path = os.path.join(video_directory, 'info.json')
     if thumbnails:
-        info = get_thumbnails(directory, info)
+        info = get_thumbnails(video_directory, info)
     if audio:
         try:
             info = download_audio(directory, info)

{abstract_webtools-0.1.6.78 → abstract_webtools-0.1.6.80}/src/abstract_webtools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_webtools
-Version: 0.1.6.78
+Version: 0.1.6.80
 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.78 → abstract_webtools-0.1.6.80}/src/abstract_webtools.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ src/abstract_webtools.egg-info/dependency_links.txt
 src/abstract_webtools.egg-info/requires.txt
 src/abstract_webtools.egg-info/top_level.txt
 src/abstract_webtools/managers/__init__.py
+src/abstract_webtools/managers/allss\.py
 src/abstract_webtools/managers/cipherManager.py
 src/abstract_webtools/managers/crawlManager.py
 src/abstract_webtools/managers/crawlmgr2.py