chore: add pyproject.toml for project configuration

Author: zackees

pyproject.toml

@@ -0,0 +1,40 @@
+[build-system]
+requires = ["setuptools>=45", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "static_ffmpeg"
+version = "2.9"
+description = "Cross platform ffmpeg to work on various systems."
+readme = "README.md"
+authors = [
+    {name = "Zach Vorhies", email = "[email protected]"}
+]
+license = {text = "MIT"}
+requires-python = ">=3.6.0"
+dependencies = [
+    "requests",
+    "filelock",
+    "progress",
+    "twine>=3.8.0",
+]
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.9",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX",
+    "Operating System :: MacOS :: MacOS X",
+    "Environment :: Console",
+]
+
+[project.optional-dependencies]
+test = ["pytest"]
+
+[project.scripts]
+static_ffmpeg = "static_ffmpeg.run:main_static_ffmpeg"
+static_ffprobe = "static_ffmpeg.run:main_static_ffprobe"
+static_ffmpeg_paths = "static_ffmpeg.run:main_print_paths"
+
+[tool.setuptools]
+packages = ["static_ffmpeg"]

setup.py

@@ -1,31 +1,10 @@
 import os
 import sys
 from shutil import rmtree
-
-from setuptools import Command, find_packages, setup
-
-# The directory containing this file
-HERE = os.path.dirname(__file__)
-
-NAME = "static_ffmpeg"
-DESCRIPTION = "Cross platform ffmpeg to work on various systems."
-URL = "https://github.com/zackees/static_ffmpeg"
-EMAIL = "[email protected]"
-AUTHOR = "Zach Vorhies"
-REQUIRES_PYTHON = ">=3.6.0"
-VERSION = "2.8"
-
-# The text of the README file
-with open(os.path.join(HERE, "README.md")) as fd:
-    LONG_DESCRIPTION = fd.read()
-
-with open(os.path.join(HERE, "requirements.txt")) as fd:
-    REQUIREMENTS = [line.strip() for line in fd.readlines() if line.strip()]
-
+from setuptools import setup, Command
 
 class UploadCommand(Command):
     """Support setup.py upload."""
-
     description = "Build and publish the package."
     user_options = []
 
@@ -42,7 +21,7 @@ def finalize_options(self):
     def run(self):
         try:
             self.status("Removing previous builds…")
-            rmtree(os.path.join(HERE, "dist"))
+            rmtree(os.path.join(os.path.dirname(__file__), "dist"))
         except OSError:
             pass
 
@@ -53,48 +32,14 @@ def run(self):
         os.system("twine upload dist/*")
 
         self.status("Pushing git tags…")
-        os.system("git tag v{0}".format(VERSION))
+        os.system("git tag v2.8")
         os.system("git push --tags")
 
         sys.exit()
 
-
-setup(
-    name=NAME,
-    python_requires=REQUIRES_PYTHON,
-    version=VERSION,
-    description=DESCRIPTION,
-    long_description=LONG_DESCRIPTION,
-    long_description_content_type="text/markdown",
-    url=URL,
-    author="Zach Vorhies",
-    author_email="[email protected]",
-    license="MIT",
-    classifiers=[
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.9",
-        "Operating System :: Microsoft :: Windows",
-        "Operating System :: POSIX",
-        "Operating System :: MacOS :: MacOS X",
-        "Environment :: Console",
-    ],
-    install_requires=REQUIREMENTS,
-
-    entry_points={
-        "console_scripts": [
-            "static_ffmpeg = static_ffmpeg.run:main_static_ffmpeg",
-            "static_ffprobe = static_ffmpeg.run:main_static_ffprobe",
-            "static_ffmpeg_paths = static_ffmpeg.run:main_print_paths",
-        ],
-    },
-    packages=find_packages(exclude=["tests", "*.tests", "*.tests.*", "tests.*"]),
-    package_data={},
-    include_package_data=True,
-    extras_require={
-        "test": ["pytest"],
-    },
-    cmdclass={
-        "upload": UploadCommand,
-    },
-)
+if __name__ == '__main__':
+    setup(
+        cmdclass={
+            "upload": UploadCommand,
+        },
+    )

static_ffmpeg/run.py

@@ -1,5 +1,5 @@
 """
-    Entry point for running the ffmpeg executable.
+Entry point for running the ffmpeg executable.
 """
 
 import os
@@ -12,6 +12,7 @@
 
 import requests  # type: ignore
 from filelock import FileLock, Timeout
+from progress.bar import Bar  # type: ignore
 from progress.spinner import Spinner  # type: ignore
 
 TIMEOUT = 10 * 60  # Wait upto 10 minutes to validate install
@@ -50,17 +51,21 @@ def download_file(url, local_path):
     """Downloads a file to the give path."""
     # NOTE the stream=True parameter below
     print(f"Downloading {url} -> {local_path}")
+    chunk_size = (1024 * 1024) // 4
     with requests.get(url, stream=True, timeout=TIMEOUT) as req:
         req.raise_for_status()
+        spinner: Spinner | Bar = Spinner("ffmpeg: ")
+        size = -1
+        try:
+            size = int(req.headers.get("content-length", 0))
+            spinner = Bar("ffmpeg: ", max=size, suffix="%(percent).1f%% - %(eta)ds")
+        except ValueError:
+            pass
         with open(local_path, "wb") as file_d:
-            with Spinner() as spinner:
-                for chunk in req.iter_content(chunk_size=8192 * 16):
-                    # If you have chunk encoded response uncomment if
-                    # and set chunk_size parameter to None.
-                    # if chunk:
-                    sys.stdout.write(".")
+            with spinner as spinner:
+                for chunk in req.iter_content(chunk_size):
                     file_d.write(chunk)
-                    spinner.next()
+                    spinner.next(len(chunk))
             sys.stdout.write(f"\nDownload of {url} -> {local_path} completed.\n")
     return local_path
 

tests/test_bug9.py

@@ -1,5 +1,5 @@
 """
-    Tests that https://github.com/zackees/static_ffmpeg/issues/9 is resolved. This bug did not allow spaces in the names.
+Tests that https://github.com/zackees/static_ffmpeg/issues/9 is resolved. This bug did not allow spaces in the names.
 """
 
 import os