abstract-webtools 0.1.6.70__py3-none-any.whl → 0.1.6.71__py3-none-any.whl

abstract_webtools/managers/videoDownloader.py

@@ -2,7 +2,7 @@ from .requestManager.requestManager import requestManager
 from .urlManager.urlManager import urlManager
 from .soupManager.soupManager import soupManager
 from .linkManager.linkManager import linkManager
-import threading,os,re,yt_dlp,urllib.request,m3u8_To_MP4,subprocess,requests
+import threading,os,re,yt_dlp,urllib.request,m3u8_To_MP4,subprocess,requests,,tempfile
 from abstract_utilities import get_logFile,safe_dump_to_file,get_time_stamp
 from m3u8 import M3U8  # Install: pip install m3u8
 from urllib.parse import urljoin
@@ -201,34 +201,54 @@ def get_thumbnails(directory,info):
         info['thumbnails'][i]['path']=thumbnail_path
         download_image(thumbnail_url, save_path=thumbnail_path)
     return info
-def optimize_video_for_safari(input_file):
+def optimize_video_for_safari(input_file, reencode=False):
     """
     Optimizes an MP4 file for Safari by moving the 'moov' atom to the beginning.
-    The optimized file will be saved as <original>_optimized.mp4.
+    Optionally, re-encodes the video for maximum compatibility.
     
     Args:
         input_file (str): Path to the original MP4 file.
+        reencode (bool): If True, re-encode the video for Safari compatibility.
         
     Returns:
         str: Path to the optimized MP4 file.
     """
-    # Build the output file name
-    base, ext = os.path.splitext(input_file)
-    output_file = f"{base}_optimized{ext}"
-    
-    # ffmpeg command to copy streams and reposition the moov atom
-    command = ["ffmpeg", "-i", input_file, "-c", "copy", "-movflags", "faststart", output_file]
+    tmp_dir = tempfile.mkdtemp()
     try:
-        subprocess.run(command, check=True)
-        # Optionally, you could remove the original file or keep both.
-        os.remove(input_file)
-        os.rename(output_file, input_file)
-        print(f"Optimized video saved as {input_file}")
-    except subprocess.CalledProcessError as e:
-        print(f"Error during optimization: {e}")
-    return input_file
+        local_input = os.path.join(tmp_dir, os.path.basename(input_file))
+        shutil.copy2(input_file, local_input)
+        
+        base, ext = os.path.splitext(local_input)
+        local_output = f"{base}_optimized{ext}"
+        
+        if reencode:
+            # Re-encoding command for maximum Safari compatibility
+            command = [
+                "ffmpeg", "-i", local_input,
+                "-c:v", "libx264", "-profile:v", "baseline", "-level", "3.0", "-pix_fmt", "yuv420p",
+                "-c:a", "aac", "-b:a", "128k",
+                "-movflags", "faststart",
+                local_output
+            ]
+        else:
+            # Simple faststart with stream copy
+            command = [
+                "ffmpeg", "-i", local_input,
+                "-c", "copy", "-movflags", "faststart",
+                local_output
+            ]
+        
+        try:
+            subprocess.run(command, check=True)
+            shutil.copy2(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):
+def downloadvideo(url, directory=False, rename_display=True, thumbnails=True, audio=False,safai_optimize=False):
     directory = directory or os.getcwd()
     temp_id = re.sub(r'[^\w\d.-]', '_', url)[-20:]
     temp_filename = f"temp_{temp_id}.mp4"
@@ -256,8 +276,8 @@ def downloadvideo(url, directory=False, rename_display=True, thumbnails=True, au
             info['file_path'] = new_path
             
             # *** Here we call the optimization function ***
-            if new_path.lower().endswith('.mp4'):
-                info['file_path'] = optimize_video_for_safari(new_path)
+            if new_path.lower().endswith('.mp4') and safai_optimize:
+                info['file_path'] = optimize_video_for_safari(new_path,reencode=safai_optimize)
     
     info_path = os.path.join(directory, 'info.json')
     if thumbnails:

{abstract_webtools-0.1.6.70.dist-info → abstract_webtools-0.1.6.71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_webtools
-Version: 0.1.6.70
+Version: 0.1.6.71
 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.70.dist-info → abstract_webtools-0.1.6.71.dist-info}/RECORD

@@ -25,7 +25,7 @@ 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=cUaOlcCTzftVBCp9ZHwMXR9IB1wAE-03YSVwUBaIFLM,2514
-abstract_webtools/managers/videoDownloader.py,sha256=aH1Lu-pxdmzaHg6UDxZxxJ2riZc_NiJUJ_3k1Xes5bA,11653
+abstract_webtools/managers/videoDownloader.py,sha256=pF0S4Oh9hRAWwLJ61UhNSxAK1sMkUDHBpXDiDs5e0S4,12415
 abstract_webtools/managers/videoDownloader2.py,sha256=v3H6akdhvVWGrB-r35m3cp_-aKkNWadpfCiMylOnv6w,12748
 abstract_webtools/managers/linkManager/__init__.py,sha256=NpfWNzvTLSfsIWSeLYIxPzeLHADk_grSx5rfgCeWERw,27
 abstract_webtools/managers/linkManager/linkManager.py,sha256=roxOzOELca0rOlcMaJkTQHN3S0XF7dJihZmMq-uIXPQ,12184
@@ -37,7 +37,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.70.dist-info/METADATA,sha256=p1B2GUVN6SXGxZEnAhokHvDNikp-L0TKJWXhprTQk4U,16029
-abstract_webtools-0.1.6.70.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-abstract_webtools-0.1.6.70.dist-info/top_level.txt,sha256=2DMJ7RmjTcjCsa-uwAV0K6eXXlIIkFDEjBLg_uyCmCI,18
-abstract_webtools-0.1.6.70.dist-info/RECORD,,
+abstract_webtools-0.1.6.71.dist-info/METADATA,sha256=SAnPlOjvIk9qkhVwxlOZf4ukox7WG84kNd2kgjUP8Jw,16029
+abstract_webtools-0.1.6.71.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+abstract_webtools-0.1.6.71.dist-info/top_level.txt,sha256=2DMJ7RmjTcjCsa-uwAV0K6eXXlIIkFDEjBLg_uyCmCI,18
+abstract_webtools-0.1.6.71.dist-info/RECORD,,