ffmpeg-update 2.0.0__tar.gz → 2.0.1__tar.gz

{ffmpeg_update-2.0.0 → ffmpeg_update-2.0.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.3
 Name: ffmpeg-update
-Version: 2.0.0
+Version: 2.0.1
 Summary: Package manager for FFmpeg, FFprobe, and FFplay static binaries
-Keywords: ffmpeg,ffprobe,ffplay,static,binary,manager,installer,downloader,command-line,cli,tool
+Keywords: updater,installer,downloader,binary,program,executable,command,line,cli,tool
 Author: Asadullah Shaikh
 Classifier: Topic :: Utilities
 Classifier: Topic :: Terminals
@@ -22,10 +22,10 @@ Classifier: Intended Audience :: Information Technology
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: fire>=0.7.1,<0.8.0
-Requires-Dist: requests>=2.32.5,<3.0.0
+Requires-Dist: niquests>=3.15.2,<4.0.0
 Requires-Dist: tqdm>=4.67.1,<5.0.0
 Requires-Python: >=3.9
-Project-URL: homepage, https://github.com/pantheraleo-7/ffmpeg-update
+Project-URL: Repository, https://github.com/pantheraleo-7/ffmpeg-update
 Description-Content-Type: text/markdown
 
 # FFUp

{ffmpeg_update-2.0.0 → ffmpeg_update-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ffmpeg-update"
-version = "2.0.0"
+version = "2.0.1"
 description = "Package manager for FFmpeg, FFprobe, and FFplay static binaries"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -8,15 +8,14 @@ authors = [
     { name = "Asadullah Shaikh" },
 ]
 keywords = [
-    "ffmpeg",
-    "ffprobe",
-    "ffplay",
-    "static",
-    "binary",
-    "manager",
+    "updater",
     "installer",
     "downloader",
-    "command-line",
+    "binary",
+    "program",
+    "executable",
+    "command",
+    "line",
     "cli",
     "tool",
 ]
@@ -39,10 +38,10 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Programming Language :: Python :: 3",
 ]
-urls = { homepage = "https://github.com/pantheraleo-7/ffmpeg-update" }
+urls = { Repository = "https://github.com/pantheraleo-7/ffmpeg-update" }
 dependencies = [
     "fire>=0.7.1,<0.8.0",
-    "requests>=2.32.5,<3.0.0",
+    "niquests>=3.15.2,<4.0.0",
     "tqdm>=4.67.1,<5.0.0",
 ]
 

{ffmpeg_update-2.0.0 → ffmpeg_update-2.0.1}/src/ffup/cli.py

@@ -1,3 +1,4 @@
+import io
 import os as os_
 import platform
 import re
@@ -8,7 +9,7 @@ import zipfile
 from pathlib import Path
 
 import fire
-import requests
+import niquests
 from tqdm import tqdm
 
 
@@ -35,10 +36,13 @@ class FFUp:
             or ("arm64" if platform.machine() in ["arm64", "aarch64"] else "amd64")
         )
         self.build = build or os_.getenv("FFUP_BUILD") or "snapshot"
-        self._TMPDIR = tempfile.TemporaryDirectory()
+
+        self._client = niquests.Session(base_url="https://ffmpeg.martin-riedl.de")
+        self._tmpdir = tempfile.TemporaryDirectory()
 
     def __del__(self):
-        self._TMPDIR.cleanup()
+        self._client.close()
+        self._tmpdir.cleanup()
 
     def install(self, *bins):
         for bin in self._get_bins(bins):
@@ -46,7 +50,7 @@ class FFUp:
             path = self.dir / bin
 
             print("Installing:", bin)
-            file = self._download(url)
+            file = self._download(url, bin)
             self._install(file, path)
             print("Installed:", path)
 
@@ -71,7 +75,7 @@ class FFUp:
             if current_version != latest_version:
                 print("Update available")
                 if not dry_run:
-                    file = self._download(url)
+                    file = self._download(url, bin)
                     self._install(file, path)
                     print("Updated:", path)
             else:
@@ -84,7 +88,7 @@ class FFUp:
         return set(bins) or {os_.getenv("FFUP_BIN") or "ffmpeg"}
 
     def _get_url(self, bin):
-        return f"https://ffmpeg.martin-riedl.de/redirect/latest/{self.os}/{self.arch}/{self.build}/{bin}.zip"
+        return f"/redirect/latest/{self.os}/{self.arch}/{self.build}/{bin}.zip"
 
     def _current(self, path):
         output = subprocess.check_output([path, "-version"], text=True)
@@ -100,8 +104,7 @@ class FFUp:
         return match.group(1)
 
     def _latest(self, url):
-        response = requests.get(url, allow_redirects=False)
-
+        response = self._client.get(url, allow_redirects=False)
         response.raise_for_status()
         if response.status_code == 307:
             match = re.search(
@@ -120,32 +123,29 @@ class FFUp:
             print("Error: unexpected", response, file=sys.stderr)
             sys.exit(1)
 
-    def _download(self, url):
-        with requests.get(url, stream=True) as response:
-            response.raise_for_status()
-            bar = tqdm(
-                desc="Downloading",
-                total=int(response.headers["content-length"]),
-                unit="B",
-                unit_scale=True,
-                dynamic_ncols=True,
-            )
-            file = Path(self._TMPDIR.name, "ff.zip")
-            with file.open("wb") as zf:
-                for chunk in response.iter_content(chunk_size=4096):
-                    chunk_size = zf.write(chunk)
-                    bar.update(chunk_size)
-        return file
+    def _download(self, url, bin):
+        response = self._client.get(url, stream=True)
+        response.raise_for_status()
+        bar = tqdm(
+            desc="Downloading",
+            total=int(response.headers["content-length"]),
+            unit="B",
+            unit_scale=True,
+            dynamic_ncols=True,
+        )
+        with io.BytesIO() as buf:
+            for chunk in response.iter_content():
+                chunk_size = buf.write(chunk)
+                bar.update(chunk_size)
+            with zipfile.ZipFile(buf) as zf:
+                return zf.extract(bin, self._tmpdir.name)
 
     def _install(self, file, path):
-        with zipfile.ZipFile(file, "r") as zf:
-            bin = zf.extract(path.name, self._TMPDIR.name)
-            os_.chmod(bin, 0o755)
-
+        os_.chmod(file, 0o755)
         try:
-            os_.replace(bin, path)
+            os_.replace(file, path)
         except PermissionError:
-            subprocess.run(["sudo", "mv", bin, path], check=True, capture_output=True)
+            subprocess.run(["sudo", "mv", file, path], check=True, capture_output=True)
 
     def _uninstall(self, path):
         try: