mnamer 2.7.2.dev8__py3-none-any.whl → 2.7.3.dev3__py3-none-any.whl

mnamer/__version__.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
 
-__version__ = "2.7.2.dev8"
+__version__ = "2.7.3.dev3"

mnamer/endpoints.py

@@ -26,12 +26,15 @@ MAX_RETRIES = 5
 class OmdbSearchEntry(TypedDict):
     imdb_id: str
     year: str
+    type: str
     title: NotRequired[str]
 
 
 class OmdbTitleResponse(TypedDict):
     title: str
     year: str
+    response: str
+    type: str
     released: NotRequired[str]
     plot: NotRequired[str]
     imdb_id: str
@@ -47,6 +50,7 @@ class OmdbSearchResponse(TypedDict):
 class TmdbSearchEntry(TypedDict):
     id: int
     title: str
+    original_title: str
     release_date: NotRequired[str]
     overview: NotRequired[str]
 
@@ -67,6 +71,8 @@ class TmdbSearchResponse(TypedDict):
 
 class TvdbLinks(TypedDict):
     last: int
+    next: int | None
+    prev: int | None
 
 
 class TvdbSeriesData(TypedDict):
@@ -79,6 +85,7 @@ class TvdbSeriesResponse(TypedDict):
 
 
 class TvdbEpisodeEntry(TypedDict):
+    id: int
     first_aired: str
     aired_episode_number: int
     aired_season: int
@@ -93,6 +100,7 @@ class TvdbEpisodesResponse(TypedDict):
 
 class TvdbSearchEntry(TypedDict):
     id: int
+    series_name: str
 
 
 class TvdbSearchResponse(TypedDict):
@@ -115,6 +123,7 @@ class TvMazeSearchEntry(TypedDict):
 
 
 class TvMazeEpisode(TypedDict):
+    id: int
     airdate: str | None
     number: int | None
     season: int
@@ -330,7 +339,7 @@ def tvdb_refresh_token(token: str) -> str:
     Online docs: api.thetvdb.com/swagger#!/Authentication/get_refresh_token.
     """
     url = "https://api.thetvdb.com/refresh_token"
-    headers = {"Authorization": f"Bearer {token}"}
+    headers = _tvdb_headers(token)
     status, content = request_json(url, headers=headers, cache=False)
     if status == 401:
         raise MnamerException("invalid token")
@@ -339,6 +348,15 @@ def tvdb_refresh_token(token: str) -> str:
     return content["token"]
 
 
+def _tvdb_headers(token: str, language: Language | None = None) -> dict[str, str]:
+    if token.count(".") != 2:
+        raise MnamerException("invalid token")
+    headers = {"Authorization": f"Bearer {token}"}
+    if language:
+        headers["Accept-Language"] = language.a2
+    return headers
+
+
 def tvdb_episodes_id(
     token: str,
     id_tvdb: str,
@@ -352,9 +370,7 @@ def tvdb_episodes_id(
     """
     Language.ensure_valid_for_tvdb(language)
     url = f"https://api.thetvdb.com/episodes/{id_tvdb}"
-    headers = {"Authorization": f"Bearer {token}"}
-    if language:
-        headers["Accept-Language"] = language.a2
+    headers = _tvdb_headers(token, language)
     status, content = request_json(
         url, headers=headers, cache=cache is True and language is None
     )
@@ -384,9 +400,7 @@ def tvdb_series_id(
     """
     Language.ensure_valid_for_tvdb(language)
     url = f"https://api.thetvdb.com/series/{id_tvdb}"
-    headers = {"Authorization": f"Bearer {token}"}
-    if language:
-        headers["Accept-Language"] = language.a2
+    headers = _tvdb_headers(token, language)
     status, content = request_json(
         url, headers=headers, cache=cache is True and language is None
     )
@@ -417,9 +431,7 @@ def tvdb_series_id_episodes(
     """
     Language.ensure_valid_for_tvdb(language)
     url = f"https://api.thetvdb.com/series/{id_tvdb}/episodes"
-    headers = {"Authorization": f"Bearer {token}"}
-    if language:
-        headers["Accept-Language"] = language.a2
+    headers = _tvdb_headers(token, language)
     parameters: dict[str, Any] = {"page": page}
     status, content = request_json(
         url, parameters, headers=headers, cache=cache is True and language is None
@@ -452,9 +464,7 @@ def tvdb_series_id_episodes_query(
     """
     Language.ensure_valid_for_tvdb(language)
     url = f"https://api.thetvdb.com/series/{id_tvdb}/episodes/query"
-    headers = {"Authorization": f"Bearer {token}"}
-    if language:
-        headers["Accept-Language"] = language.a2
+    headers = _tvdb_headers(token, language)
     parameters: dict[str, Any] = {
         "airedSeason": season,
         "airedEpisode": episode,
@@ -497,9 +507,7 @@ def tvdb_search_series(
         "imdbId": id_imdb,
         "zap2itId": id_zap2it,
     }
-    headers = {"Authorization": f"Bearer {token}"}
-    if language:
-        headers["Accept-Language"] = language.a2
+    headers = _tvdb_headers(token, language)
     status, content = request_json(
         url, parameters, headers=headers, cache=cache is True and language is None
     )

mnamer/frontends.py

@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from typing import override
 
 from mnamer import tty
-from mnamer.const import SYSTEM, USAGE, VERSION  # pyright: ignore
+from mnamer.const import SYSTEM, USAGE, VERSION
 from mnamer.exceptions import (
     MnamerAbortException,
     MnamerException,

mnamer/providers.py

@@ -31,7 +31,7 @@ from mnamer.language import Language
 from mnamer.metadata import Metadata, MetadataEpisode, MetadataMovie
 from mnamer.setting_store import SettingStore
 from mnamer.types import MediaType, ProviderType
-from mnamer.utils import parse_date, year_range_parse
+from mnamer.utils import parse_date, year_parse, year_range_parse
 
 
 class Provider[M: Metadata](ABC):
@@ -44,8 +44,7 @@ class Provider[M: Metadata](ABC):
         """Initializes the provider."""
         if api_key:
             self.api_key = api_key
-        if cache:
-            self.cache = cache
+        self.cache = cache
 
     @classmethod
     def from_settings(cls, settings: SettingStore) -> Self:
@@ -141,7 +140,7 @@ class Omdb(Provider[MetadataMovie]):
             synopsis=response.get("plot"),
             id_imdb=response["imdb_id"],
         )
-        if meta.synopsis == "N/A":
+        if meta.synopsis and meta.synopsis.upper() == "N/A":
             meta.synopsis = None
         yield meta
 
@@ -212,6 +211,7 @@ class Tmdb(Provider[MetadataMovie]):
         self, name: str, year: str | None, language: Language | None
     ) -> Iterator[MetadataMovie]:
         assert self.api_key
+        requested_year = year_parse(year) if year else None
         page = 1
         page_max = 5  # each page yields a maximum of 20 results
         found = False
@@ -226,17 +226,19 @@ class Tmdb(Provider[MetadataMovie]):
             )
             for entry in response["results"]:
                 try:
-                    meta = MetadataMovie(
+                    result_year = year_parse(entry.get("release_date", ""))
+                    if result_year is None:
+                        continue
+                    if requested_year and result_year != requested_year:
+                        continue
+                    found = True
+                    yield MetadataMovie(
                         id_tmdb=str(entry["id"]),
                         name=entry["title"],
                         language=language,
                         synopsis=entry.get("overview"),
                         year=entry.get("release_date"),
                     )
-                    if not meta.year:
-                        continue
-                    yield meta
-                    found = True
                 except (AttributeError, KeyError, TypeError, ValueError):
                     continue
             if page == response["total_pages"]:

mnamer/utils.py

@@ -3,7 +3,7 @@
 import datetime as dt
 import json
 import re
-from collections.abc import Callable, Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator, Mapping
 from contextlib import nullcontext
 from os import walk
 from os.path import exists, expanduser, expandvars, getsize, splitdrive, splitext
@@ -18,7 +18,7 @@ from mnamer.const import CACHE_PATH, CURRENT_YEAR, SUBTITLE_CONTAINERS
 
 
 def clean_dict(
-    target_dict: dict[str, Any], whitelist: Iterable[str] | None = None
+    target_dict: Mapping[Any, Any], whitelist: Iterable[Any] | None = None
 ) -> dict[str, str]:
     """Convenience function that removes a dicts keys that have falsy values."""
     return {
@@ -121,7 +121,7 @@ def fn_pipe[T](*fn_list: Callable[[T], T]) -> Callable[[T], T]:
     return resolver
 
 
-def format_dict(body: dict[str, Any]) -> str:
+def format_dict(body: Mapping[Any, Any]) -> str:
     """
     Formats a dictionary into a multi-line bulleted string of key-value pairs.
     """
@@ -248,7 +248,7 @@ def request_json(
     url: str,
     parameters: dict[str, Any] | list[tuple[str, Any]] | None = None,
     body: dict[str, Any] | None = None,
-    headers: dict[str, str] | None = None,
+    headers: dict[str, Any] | None = None,
     cache: bool = True,
 ) -> tuple[int, Any]:
     """

{mnamer-2.7.2.dev8.dist-info → mnamer-2.7.3.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mnamer
-Version: 2.7.2.dev8
+Version: 2.7.3.dev3
 Summary: A command-line utility for organizing media files.
 Author-email: Jessy Williams <jessy@jessywilliams.com>
 Maintainer-email: Jessy Williams <jessy@jessywilliams.com>
@@ -34,7 +34,7 @@ Requires-Dist: appdirs~=1.4.4
 Requires-Dist: babelfish~=0.6.1
 Requires-Dist: guessit~=3.8.0
 Requires-Dist: requests<2.35.0,>=2.33.1
-Requires-Dist: requests-cache~=1.3.1
+Requires-Dist: requests-cache~=1.3.2
 Requires-Dist: setuptools-scm>=10.0.0
 Requires-Dist: teletype~=1.3.4
 Dynamic: license-file

{mnamer-2.7.2.dev8.dist-info → mnamer-2.7.3.dev3.dist-info}/RECORD

@@ -1,24 +1,24 @@
 mnamer/__init__.py,sha256=ZjNNbifQHIhjmUekOwc_VZQQdR289XCqqSIdjDSF5pw,344
 mnamer/__main__.py,sha256=8AEEyLkBtfYQKOvrbg-XlLxEu9_0G-1-Rd657EBlnI8,913
-mnamer/__version__.py,sha256=RBCcQ_PgBZmTWJZcxA5Qyyto_6zqxd8dAOveMBFcIck,110
+mnamer/__version__.py,sha256=8md2jnIUU7jY401PJIcnxnIZ5zjtEiuV6iwwW-nxtQw,110
 mnamer/argument.py,sha256=PicJzTRGmamHeSKCWwhNMuf5WBSso8AbuPoZ3yOwcI4,3293
 mnamer/const.py,sha256=__YSxzRc8qDJqp4mlJncjiaRnKoi3wMLtGT1AVAm2mc,2035
-mnamer/endpoints.py,sha256=QAC1Vb-T_rDYOr-Fu92THffK9Dc48nJ3Jn12nC5yA_0,22778
+mnamer/endpoints.py,sha256=Lt5LUT-wFd2bpa-zPt_7_g5okKe4B9dR9hlwrdkzWyk,22857
 mnamer/exceptions.py,sha256=dyTHFfJmkntafSg4glTxGAOsBgjlY3IGKWo5KUFgFp8,629
-mnamer/frontends.py,sha256=x67vmtCbylxMQK5uKeKg190srhAbIY4OEjuYElZsjeM,6984
+mnamer/frontends.py,sha256=XGo5FcVCy338zxwrXyTtp-pPpmeeilNrVbBYLuCojA0,6965
 mnamer/language.py,sha256=5pdZGmfw1Zv2DfZCK64LPFThOE1iIcmrhaJGIDVgByo,2707
 mnamer/metadata.py,sha256=Z3BhX-oKpwoStMkH62Zh9WCRcFTl7S3TJTPpsT-IQaw,5839
-mnamer/providers.py,sha256=XYIvMLAKIbAl19RmB19pkSabnkEpqZk5liz2Q4pYasI,19042
+mnamer/providers.py,sha256=VJYfDWf4iDYjSXs-eINfIJ6tZGhEpNSCl9wHmLi0pLE,19274
 mnamer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mnamer/setting_spec.py,sha256=37V7iT0_6XJdeqD6rItqQmYG-fQYQSglPX01KRls0KQ,1279
 mnamer/setting_store.py,sha256=BcnUuNn823RHpOLpWvr7gVlrHZJWfxDaNfDDNqYjcqI,15977
 mnamer/target.py,sha256=RzvtzDabkRjw2Ygzi94FwwKrjAW22RmcYJRkrPpT7c4,11091
 mnamer/tty.py,sha256=v66fiv_rq_NPayUt9QfsEx5mxPJWAF28RSKiHe6op_Q,4146
 mnamer/types.py,sha256=aYMfEcBmPhrkA9PNrtr8JrDuBXeUNN8dbmd4T5rvRjg,638
-mnamer/utils.py,sha256=dB_DOKlXlHwF0KGk9hF5dB9eGbyzXLajOSBc_YQevqY,15639
-mnamer-2.7.2.dev8.dist-info/licenses/LICENSE.txt,sha256=WxN2vPlY96aW3C_CRs4q0xOK4CxO5RTVTzf2W25hGmM,1071
-mnamer-2.7.2.dev8.dist-info/METADATA,sha256=4IUiAElfqQIHcR2UbU1Gh5gb21AbyDGw2M5Zlwo_1aY,8038
-mnamer-2.7.2.dev8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-mnamer-2.7.2.dev8.dist-info/entry_points.txt,sha256=STyNAl6d-ueccO1C_WdDfjq5GlYwi788H4AENG040fI,48
-mnamer-2.7.2.dev8.dist-info/top_level.txt,sha256=RER9MaloDml8ZAsXHlm6oKwvv2KgH_YWJLlOfKC1zAY,7
-mnamer-2.7.2.dev8.dist-info/RECORD,,
+mnamer/utils.py,sha256=eBOl_Q8GhnX7gJJfWLpuDY93jt0VKW_d0MwMyeyD5FQ,15654
+mnamer-2.7.3.dev3.dist-info/licenses/LICENSE.txt,sha256=WxN2vPlY96aW3C_CRs4q0xOK4CxO5RTVTzf2W25hGmM,1071
+mnamer-2.7.3.dev3.dist-info/METADATA,sha256=wLtMUyh2cRSZxg0Qxqb8-mtwfhH2QkGNY0tsxOQRwFc,8038
+mnamer-2.7.3.dev3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+mnamer-2.7.3.dev3.dist-info/entry_points.txt,sha256=STyNAl6d-ueccO1C_WdDfjq5GlYwi788H4AENG040fI,48
+mnamer-2.7.3.dev3.dist-info/top_level.txt,sha256=RER9MaloDml8ZAsXHlm6oKwvv2KgH_YWJLlOfKC1zAY,7
+mnamer-2.7.3.dev3.dist-info/RECORD,,