auto detect file and playlist input, -up flag

.gitignore

@@ -1,6 +1,7 @@
 .vscode
 Downloads/
 test.py
+test.
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

pybalt/__main__.py

@@ -3,6 +3,7 @@
 from .cobalt import Cobalt, check_updates
 from os import path
 from time import time
+from importlib.metadata import version
 
 
 async def _():
@@ -70,18 +71,31 @@ async def _():
     parser.add_argument(
         "-v", "-version", help="Display current pybalt version", action="store_true"
     )
+    parser.add_argument("-up", "-update", help="Check for updates", action="store_true")
     args = parser.parse_args()
     if args.v:
-        raise NotImplementedError("Not implemented yet")
+        try:
+            print(f"pybalt {version('pybalt')}")
+        except Exception:
+            print("Failed to get pybalt version. Running from dev?")
+        return
+    if args.up:
+        await check_updates()
+        return
     if args.url_arg:
         args.url = args.url_arg
     urls = ([args.url] if args.url else []) + (
         [line.strip() for line in open(args.list)] if args.list else []
     )
+    if args.url and not path.isdir(args.url) and path.isfile(args.url):
+        urls = [
+            line.strip() for line in open(args.url_arg if args.url_arg else args.url)
+        ]
     if not urls and not args.playlist:
         print(
             "No URLs provided",
-            "Use -url 'https://...' or -list 'path/to/txt' or -playlist 'https://...'",
+            "Expected media url, path to file with list of URLs or youtube playlist link",
+            "Example: cobalt 'https://youtube.com/watch?...' -s",
             sep="\n",
         )
         return
@@ -126,7 +140,7 @@ def main():
             f.write("0")
     with open(update_check_file) as f:
         if int(f.read()) < int(time()) - 60 * 60:
-            print("Checking for updates...", end="", flush=True)
+            print("Checking for updates...", flush=True)
             run(check_updates())
             with open(update_check_file, "w") as f:
                 f.write(str(int(time())))

pybalt/cobalt.py

@@ -10,7 +10,7 @@
 from typing import Literal
 from dotenv import load_dotenv
 from re import findall
-from importlib.metadata import version
+from importlib.metadata import version, PackageNotFoundError
 
 
 async def check_updates() -> bool:
@@ -31,6 +31,8 @@ async def check_updates() -> bool:
                 f"pybalt {last_version} is avaliable (current: {current_version}). Update with pip install pyeasypay -U"
             )
             return False
+    except PackageNotFoundError:
+        print("pybalt is not installed. Running from dev?")
     except Exception as e:
         print(f"Failed to check for updates: {e}")
     return True
@@ -190,7 +192,7 @@ async def get_instance(self):
                                 raise exceptions.BadInstance()
                             self.api_instance = json["cobalt"]["url"]
                             break
-                    except Exception as exc:
+                    except Exception:
                         good_instances.pop(0)
         return self.api_instance
 
@@ -465,11 +467,11 @@ def shorten(s: str, additional_len: int = 0) -> str:
                                 downloaded_since_last = 0
                                 last_update = time()
                                 info = f"[{round(total_size / 1024 / 1024, 2)}Mb \u2015 {speed_display}] {progress_chars[progress_index]}"
+                                max_print_length, _ = get_terminal_size()
+                                max_print_length -= 3
                                 print_line = shorten(
                                     result_path, additional_len=len(info)
                                 )
-                                max_print_length, _ = get_terminal_size()
-                                max_print_length -= 3
                                 print(
                                     "\r" + print_line,
                                     " "

setup.py

@@ -8,7 +8,7 @@ def readme():
 
 setup(
     name="pybalt",
-    version="2024.11.13",
+    version="2024.11.14",
     author="nichind",
     author_email="[email protected]",
     description="Download mediafiles from YouTube, Twitter (X), Instagram, Reddit & more. CLI wrapper and python module for @imputnet's cobalt processing instance api.",