ccfx 1.0.8__tar.gz → 1.0.9__tar.gz

{ccfx-1.0.8/ccfx.egg-info → ccfx-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccfx
-Version: 1.0.8
+Version: 1.0.9
 Summary: This package simplifies regular common actions for quick prototyping in a user friendly way
 Author-email: Celray James CHAWANDA <celray@chawanda.com>
 License-Expression: MIT

{ccfx-1.0.8 → ccfx-1.0.9}/ccfx/ccfx.py

@@ -479,9 +479,9 @@ def alert(message:str, server:str = "http://ntfy.sh", topic:str = "pythonAlerts"
     return: True if the alert was sent successfully, False otherwise
     '''
     print(message) if printIt else None; header_data = {}
-    if not messageTitle is None: header_data["Title"] = messageTitle
-    if not priority is None: header_data["Priority"] = priority
-    if not len(tags) == 0: header_data["Tags"] = ",".join(tags)
+    if not messageTitle is None: header_data["Title"] = str(messageTitle).replace("\r"," ").replace("\n"," ")
+    if not priority is None: header_data["Priority"] = str(int(priority))
+    if not len(tags) == 0: header_data["Tags"] = ",".join(map(str, tags))
 
     try:
         if v: print(f"sending alert to {server}/{topic}")
@@ -517,6 +517,7 @@ def deletePath(path:str, v:bool = False) -> bool:
         if v:
             print(f'! {path} does not exist')
         deleted = False
+    return deleted
 
 
 def downloadChunk(url: str, start: int, end: int, path: str) -> None:
@@ -528,6 +529,46 @@ def downloadChunk(url: str, start: int, end: int, path: str) -> None:
                 f.write(chunk)
 
 
+def correctFisheye(inputFile: str, outputFile: str = '',
+                        k1: float = -0.1, k2: float = 0.05,
+                        cx: float = 0.5, cy: float = 0.5,
+                        crf: int = 20) -> str:
+    """
+    Correct fisheye distortion in a video and save as MP4.
+
+    Args:
+        inputFile (str): Path to the input video (any format).
+        outputFile (str, optional): Path for the corrected MP4. If None, auto-creates.
+        k1, k2 (float): Lens distortion coefficients.
+        cx, cy (float): Optical center (0.5 = image center).
+        crf (int): Constant Rate Factor (lower = better quality, larger file).
+
+    Returns:
+        str: Path to the corrected MP4 file.
+    """
+    if not os.path.exists(inputFile):
+        raise FileNotFoundError(f"Input file not found: {inputFile}")
+
+    # Default output path
+    if outputFile == '':
+        base, _ = os.path.splitext(inputFile)
+        outputFile = f"{base}_corrected.mp4"
+
+    cmd = [
+        "ffmpeg", "-hide_banner", "-loglevel", "error", "-stats",
+        "-i", inputFile,
+        "-vf", f"lenscorrection=cx={cx}:cy={cy}:k1={k1}:k2={k2}",
+        "-c:v", "libx264", "-preset", "slow", f"-crf", str(crf),
+        "-pix_fmt", "yuv420p",
+        "-c:a", "aac", "-b:a", "192k",
+        "-movflags", "+faststart",
+        outputFile
+    ]
+
+    subprocess.run(cmd, check=True)
+    return outputFile
+
+
 def formatStringBlock(input_str: str, max_chars: int = 70) -> str:
     '''
     This function takes a string and formats it into a block of text
@@ -558,7 +599,6 @@ def formatStringBlock(input_str: str, max_chars: int = 70) -> str:
 
 
 
-
 def downloadFile(url: str, save_path: str, exists_action: str = 'resume', num_connections: int = 5, v: bool = False) -> None:
     if v:
         print(f"\ndownloading {url}")
@@ -573,13 +613,17 @@ def downloadFile(url: str, save_path: str, exists_action: str = 'resume', num_co
     if os.path.exists(save_fname):
         if exists_action == 'skip':
             if v:
-                print(f"File exists, skipping: {save_fname}")
+                print(f"file exists, skipping: {save_fname}")
             return
         elif exists_action == 'overwrite':
             os.remove(save_fname)
         # 'resume' is handled below
 
-    # Get file size
+    # Get file size (suppress urllib3 warnings when v=False)
+    import urllib3
+    if not v:
+        urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+        
     response = requests.head(url)
     file_size = int(response.headers.get('content-length', 0))
 
@@ -589,7 +633,7 @@ def downloadFile(url: str, save_path: str, exists_action: str = 'resume', num_co
         initial_pos = os.path.getsize(save_fname)
         if initial_pos >= file_size:
             if v:
-                print(f"File already completed: {save_fname}")
+                print(f"file already completed: {save_fname}")
             return
 
     # Calculate chunk sizes
@@ -609,14 +653,22 @@ def downloadFile(url: str, save_path: str, exists_action: str = 'resume', num_co
                 executor.submit(downloadChunk, url, start, end, temp_files[i])
             )
         
-        # Wait for all downloads to complete with progress bar
-        with tqdm(total=file_size-initial_pos, initial=initial_pos, unit='B', 
-                 unit_scale=True, desc=fname) as pbar:
-            completed = initial_pos
-            while completed < file_size:
+        # Wait for all downloads to complete with progress bar (conditionally show progress)
+        if v:
+            with tqdm(total=file_size-initial_pos, initial=initial_pos, unit='B', 
+                     unit_scale=True, desc=fname) as pbar:
+                completed = initial_pos
+                while completed < file_size:
+                    current = sum(os.path.getsize(f) for f in temp_files if os.path.exists(f))
+                    pbar.update(current - completed)
+                    completed = current
+        else:
+            # Wait silently without progress bar
+            while True:
                 current = sum(os.path.getsize(f) for f in temp_files if os.path.exists(f))
-                pbar.update(current - completed)
-                completed = current
+                if current >= file_size - initial_pos:
+                    break
+                time.sleep(0.1)
 
     # Merge chunks
     with open(save_fname, 'ab' if initial_pos > 0 else 'wb') as outfile:
@@ -627,6 +679,7 @@ def downloadFile(url: str, save_path: str, exists_action: str = 'resume', num_co
                 os.remove(temp_file)
 
 
+
 def mergeRasterTiles(tileList:list, outFile:str) -> str:
     '''
     Merge raster tiles into one raster file
@@ -1588,9 +1641,9 @@ def showProgress(count: int, end: int, message: str, barLength: int = 100) -> No
     percentStr = f'{percent:03.1f}'
     filled = int(barLength * count / end)
     bar = '█' * filled + '░' * (barLength - filled)
-    print(f'\r{message} |{bar}| {percent}% [{count}/{end}]', end='', flush=True)
+    print(f'\r{message} |{bar}| {percentStr}% [{count}/{end}]', end='', flush=True)
     if count == end:
-        print(f'\r{message} |{bar}| {percent}% [{count}/{end}]                          ', end='', flush=True)
+        print(f'\r{message} |{bar}| {percentStr}% [{count}/{end}]                          ', end='', flush=True)
         print()
 
 

{ccfx-1.0.8 → ccfx-1.0.9/ccfx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccfx
-Version: 1.0.8
+Version: 1.0.9
 Summary: This package simplifies regular common actions for quick prototyping in a user friendly way
 Author-email: Celray James CHAWANDA <celray@chawanda.com>
 License-Expression: MIT

{ccfx-1.0.8 → ccfx-1.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ccfx"
-version = "1.0.8"
+version = "1.0.9"
 description = "This package simplifies regular common actions for quick prototyping in a user friendly way"
 readme = "README.md"
 license = "MIT"