mnamer 2.6.1.dev7__tar.gz → 2.6.1.dev18__tar.gz

mnamer-2.6.1.dev18/.python-version

@@ -0,0 +1 @@
+3.14

{mnamer-2.6.1.dev7 → mnamer-2.6.1.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mnamer
-Version: 2.6.1.dev7
+Version: 2.6.1.dev18
 Summary: A command-line utility for organizing media files.
 Author-email: Jessy Williams <jessy@jessywilliams.com>
 Maintainer-email: Jessy Williams <jessy@jessywilliams.com>
@@ -30,14 +30,13 @@ Project-URL: repository, https://github.com/jkwill87/mnamer
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: appdirs>=1.4.4
-Requires-Dist: babelfish>=0.6.0
-Requires-Dist: guessit>=3.8.0
-Requires-Dist: requests>=2.32.0
-Requires-Dist: requests-cache~=0.9.8
-Requires-Dist: setuptools-scm>=8.0.0
-Requires-Dist: teletype>=1.3.4
-Requires-Dist: typing-extensions>=4.7.0
+Requires-Dist: appdirs~=1.4.4
+Requires-Dist: babelfish~=0.6.1
+Requires-Dist: guessit~=3.8.0
+Requires-Dist: requests~=2.33.1
+Requires-Dist: requests-cache~=1.3.1
+Requires-Dist: setuptools-scm>=10.0.0
+Requires-Dist: teletype~=1.3.4
 Dynamic: license-file
 
 [![PyPI](https://img.shields.io/pypi/v/mnamer.svg?style=for-the-badge)](https://pypi.python.org/pypi/mnamer)

{mnamer-2.6.1.dev7 → mnamer-2.6.1.dev18}/mnamer/__version__.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
 
-__version__ = "2.6.1.dev7"
+__version__ = "2.6.1.dev18"

{mnamer-2.6.1.dev7 → mnamer-2.6.1.dev18}/mnamer/argument.py

@@ -1,5 +1,5 @@
 import argparse
-from typing import Any
+from typing import Any, final, override
 
 from mnamer.const import USAGE
 from mnamer.setting_spec import SettingSpec
@@ -28,6 +28,7 @@ DIRECTIVES:
 """
 
 
+@final
 class ArgLoader(argparse.ArgumentParser):
     """
     An overridden ArgumentParser class which is build to accommodate mnamer's setting
@@ -49,7 +50,9 @@ class ArgLoader(argparse.ArgumentParser):
             SettingType.PARAMETER,
             SettingType.POSITIONAL,
         }
-        [self._add_spec(spec) for spec in specs if spec.group in groups]
+        for spec in specs:
+            if spec.group in groups:
+                self._add_spec(spec)
 
     def _add_spec(self, spec: SettingSpec):
         if spec.group is SettingType.PARAMETER:
@@ -63,7 +66,7 @@ class ArgLoader(argparse.ArgumentParser):
         args, kwargs = spec.registration
         if not args or not kwargs.get("help"):
             raise RuntimeError("Cannot register ArgumentSpec")
-        group.add_argument(*args, **kwargs)
+        _action = group.add_argument(*args, **kwargs)
 
     __iadd__ = _add_spec
 
@@ -73,6 +76,7 @@ class ArgLoader(argparse.ArgumentParser):
             raise RuntimeError(f"invalid arguments: {','.join(unknowns)}")
         return vars(load_arguments)
 
+    @override
     def format_help(self) -> str:
         """
         Overrides ArgumentParser's format_help to dynamically generate a help message

{mnamer-2.6.1.dev7 → mnamer-2.6.1.dev18}/mnamer/const.py

@@ -1,6 +1,7 @@
 """Shared constant definitions."""
 
 import datetime as dt
+from importlib.metadata import PackageNotFoundError, version as pkg_version
 from pathlib import Path
 from platform import platform, python_version
 from sys import argv, gettrace, version_info
@@ -8,15 +9,16 @@ from sys import argv, gettrace, version_info
 VERSION: str
 
 try:
-    from mnamer.__version__ import __version__ as VERSION  # type: ignore
+    from mnamer.__version__ import (
+        __version__ as VERSION,  # type: ignore  # pyright: ignore
+    )
 except ModuleNotFoundError:
     from setuptools_scm import get_version  # type: ignore
 
-    VERSION = get_version(root="..", relative_to=__file__, local_scheme="dirty-tag")
-
+    VERSION = get_version(root="..", relative_to=__file__, local_scheme="dirty-tag")  # pyright: ignore
 try:
-    from appdirs import __version__ as appdirs_version  # type: ignore
-except ModuleNotFoundError:
+    appdirs_version = pkg_version("appdirs")
+except PackageNotFoundError:
     appdirs_version = "N/A"
 
 try:
@@ -27,44 +29,40 @@ except ModuleNotFoundError:
     cache_dir = "N/A"
 
 try:
-    from guessit import __version__ as guessit_version  # type: ignore
-except ModuleNotFoundError:
+    guessit_version = pkg_version("guessit")
+except PackageNotFoundError:
     guessit_version = "N/A"
 
 try:
-    from requests import __version__ as requests_version
-except ModuleNotFoundError:
+    requests_version = pkg_version("requests")
+except PackageNotFoundError:
     requests_version = "N/A"
 
 try:
-    from requests_cache import __version__ as requests_cache_version
-except ModuleNotFoundError:
+    requests_cache_version = pkg_version("requests_cache")
+except PackageNotFoundError:
     requests_cache_version = "N/A"
 
 try:
-    from teletype import VERSION as teletype_version
-except ModuleNotFoundError:
+    teletype_version = pkg_version("teletype")
+except PackageNotFoundError:
     teletype_version = "N/A"
 
 
 CACHE_PATH = Path(
-    cache_dir, f"mnamer-py{version_info.major}.{version_info.minor}"
+    cache_dir, f"mnamer-py{version_info.major}.{version_info.minor}.sqlite"
 ).absolute()
 
 CURRENT_YEAR = dt.datetime.now().year
-
 DEPRECATED = {"no_replace", "replacements"}
-
 IS_DEBUG = gettrace() is not None
-
 SUBTITLE_CONTAINERS = [".srt", ".idx", ".sub"]
 
-
 SYSTEM = {
     "date": dt.date.today(),
     "platform": platform(),
     "arguments": argv[1:],
-    "cache location": f"{CACHE_PATH}.sqlite",
+    "cache location": CACHE_PATH,
     "python version": python_version(),
     "mnamer version": VERSION,
     "appdirs version": appdirs_version,