abstract-webtools 0.1.6.25__py3-none-any.whl → 0.1.6.27__py3-none-any.whl

abstract_webtools/managers/videoDownloader.py

@@ -1,12 +1,10 @@
 from abstract_webtools import requestManager, urlManager, soupManager, requests, linkManager
 import threading,os,re,yt_dlp,urllib.request,m3u8_To_MP4,subprocess
 from abstract_utilities import get_logFile,safe_dump_to_file
-
 from m3u8 import M3U8  # Install: pip install m3u8
 from urllib.parse import urljoin
 from yt_dlp.postprocessor.ffmpeg import FFmpegFixupPostProcessor
 from abstract_math import divide_it,add_it,multiply_it,subtract_it
-from abstract_webtools import *
 logger = get_logFile('video_bp')
 class VideoDownloader:
     def __init__(self, url, title=None, download_directory=os.getcwd(), user_agent=None, video_extention='mp4', 
@@ -200,7 +198,7 @@ def get_thumbnails(directory,info):
         info['thumbnails'][i]['path']=thumbnail_path
         download_image(thumbnail_url, save_path=thumbnail_path)
     return info
-def downloadvideo(url,directory=False,thumbnails=True):
+def downloadvideo(url,directory=False,rename_display=True,thumbnails=True,audio=False):
     directory = directory or os.getcwd()
     temp_id = re.sub(r'[^\w\d.-]', '_', url)[-20:]
     temp_filename = f"temp_{temp_id}.mp4"
@@ -212,7 +210,27 @@ def downloadvideo(url,directory=False,thumbnails=True):
         output_filename=temp_filename
     )
     info = video_mgr.info
+    display_id= info.get('display_id') or info.get('id')
+    directory =os.path.join(directory,display_id)
+    os.makedirs(directory, exist_ok=True)
+    if rename_display and info and 'file_path' in info:
+        # 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)
+        if os.path.exists(info['file_path']):
+            os.rename(info['file_path'], new_path)
+            info['file_path'] = new_path
+    info_path = os.path.join(directory,'info.json')
     if thumbnails:
         info = get_thumbnails(directory,info)
+    if audio:
+        try:
+            info = download_audio(directory, info)
+        except:
+            info['audio_path'] = audio_path
+    safe_dump_to_file(info,info_path)
     return info
 

{abstract_webtools-0.1.6.25.dist-info → abstract_webtools-0.1.6.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: abstract_webtools
-Version: 0.1.6.25
+Version: 0.1.6.27
 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.25.dist-info → abstract_webtools-0.1.6.27.dist-info}/RECORD

@@ -23,11 +23,11 @@ abstract_webtools/managers/sslManager.py,sha256=C-QgQw9CW84uOE5kx2MPjC3RsLbE2JQq
 abstract_webtools/managers/tlsAdapter.py,sha256=XZSMZz9EUOhv-h3_Waf6mjV1dA3oN_M_oWuoo4VZ_HE,1454
 abstract_webtools/managers/urlManager.py,sha256=Dvf-TiSo5j_YjZS2Eq6lFfbhveneD6NA_wEE0xUXy_E,8858
 abstract_webtools/managers/userAgentManager.py,sha256=33SB2p2FG7EYZl7l2iYm1U4gI9PcdkGTZHw5lg_Ogrw,1653
-abstract_webtools/managers/videoDownloader.py,sha256=oFmRsN84_GACAhVpk21SzFJbHfJZMBLQHMUVLcKK9OI,9388
+abstract_webtools/managers/videoDownloader.py,sha256=7RGgk4-ctTED-62rug0u8ubpxReExsjhcVFq5wKc2hk,10271
 abstract_webtools/managers/videoDownloader2.py,sha256=v3H6akdhvVWGrB-r35m3cp_-aKkNWadpfCiMylOnv6w,12748
 abstract_webtools/managers/videos/Heather brooke swallo from condom.mp4,sha256=h-bKFLAHt7pGLGu4EcMvSSox7BPRK0Nga3u813iMVKQ,8335544
-abstract_webtools-0.1.6.25.dist-info/LICENSE,sha256=g3WEJFiVS27HyCGRTwKSsMLyciMaGFdWcZGOe1QalZk,3877
-abstract_webtools-0.1.6.25.dist-info/METADATA,sha256=_Jl7eCzHpI7lehgiyjXQlXWQhtDNqpFFqSojUhxx0JY,16051
-abstract_webtools-0.1.6.25.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-abstract_webtools-0.1.6.25.dist-info/top_level.txt,sha256=2DMJ7RmjTcjCsa-uwAV0K6eXXlIIkFDEjBLg_uyCmCI,18
-abstract_webtools-0.1.6.25.dist-info/RECORD,,
+abstract_webtools-0.1.6.27.dist-info/LICENSE,sha256=g3WEJFiVS27HyCGRTwKSsMLyciMaGFdWcZGOe1QalZk,3877
+abstract_webtools-0.1.6.27.dist-info/METADATA,sha256=UoJxhmemLf8FSnKEGv9i36HMf5xNCqpK3kb4BDiUp1s,16051
+abstract_webtools-0.1.6.27.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+abstract_webtools-0.1.6.27.dist-info/top_level.txt,sha256=2DMJ7RmjTcjCsa-uwAV0K6eXXlIIkFDEjBLg_uyCmCI,18
+abstract_webtools-0.1.6.27.dist-info/RECORD,,