starred/MediaManager-maxdorninger
1
0
Fork 0
mirror of https://github.com/maxdorninger/MediaManager.git synced 2026-04-17 15:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP: current progress

Browse Source
This commit is contained in:
aasmoe
2025-12-11 21:22:33 +00:00
parent 266d81688c
commit 1caff77412
7 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media_manager/metadataProvider/config.py
View File

@@ -3,7 +3,8 @@ from pydantic_settings import BaseSettings
class TmdbConfig(BaseSettings):
tmdb_relay_url: str = "https://metadata-relay.dorninger.co/tmdb"
primary_languages: list[str] = [] # ISO 639-1 language codes
default_language: str = "en" # ISO 639-1 language codes
class TvdbConfig(BaseSettings):
tvdb_relay_url: str = "https://metadata-relay.dorninger.co/tvdb"
@@ -12,6 +13,3 @@ class TvdbConfig(BaseSettings):
class MetadataProviderConfig(BaseSettings):
tvdb: TvdbConfig = TvdbConfig()
tmdb: TmdbConfig = TmdbConfig()
# ISO 639-1 language codes (e.g., ["en", "no", "sv"])
# When media's original language matches one of these, original title and metadata will be used
primary_languages: list[str] = ["en"]

77
media_manager/metadataProvider/tmdb.py
View File

@@ -24,21 +24,24 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
def __init__(self):
config = AllEncompassingConfig()
self.url = config.metadata.tmdb.tmdb_relay_url
self.primary_languages = config.metadata.primary_languages
self.primary_languages = config.metadata.tmdb.primary_languages
self.default_language = config.metadata.tmdb.default_language
def __get_language_param(self, original_language: str | None) -> str:
"""
Determine the language parameter to use for TMDB API calls.
Returns the original language if it's in primary_languages, otherwise returns English.
Returns the original language if it's in primary_languages, otherwise returns default_language.
:param original_language: The original language code (ISO 639-1) of the media
:return: Language parameter (ISO 639-1 format, e.g., 'en', 'no')
"""
if original_language and original_language in self.primary_languages:
return original_language
return "en"
return self.default_language
def __get_show_metadata(self, id: int, language: str = "en") -> dict:
def __get_show_metadata(self, id: int, language: str | None = None) -> dict:
if language is None:
language = self.default_language
try:
response = requests.get(
url=f"{self.url}/tv/shows/{id}",
@@ -55,7 +58,9 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
)
raise
def __get_season_metadata(self, show_id: int, season_number: int, language: str = "en") -> dict:
def __get_season_metadata(self, show_id: int, season_number: int, language: str | None = None) -> dict:
if language is None:
language = self.default_language
try:
response = requests.get(
url=f"{self.url}/tv/shows/{show_id}/{season_number}",
@@ -77,7 +82,7 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
def __search_tv(self, query: str, page: int) -> dict:
try:
response = requests.get(
url=f"{self.url}/tv/search", params={"query": query, "page": page}
url=f"{self.url}/tv/search", params={"query": query, "page": page, "language": self.default_language}
)
response.raise_for_status()
return response.json()
@@ -92,7 +97,7 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
def __get_trending_tv(self) -> dict:
try:
response = requests.get(url=f"{self.url}/tv/trending")
response = requests.get(url=f"{self.url}/tv/trending", params={"language": self.default_language})
response.raise_for_status()
return response.json()
except requests.RequestException as e:
@@ -104,7 +109,9 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
)
raise
def __get_movie_metadata(self, id: int, language: str = "en") -> dict:
def __get_movie_metadata(self, id: int, language: str | None = None) -> dict:
if language is None:
language = self.default_language
try:
response = requests.get(
url=f"{self.url}/movies/{id}",
@@ -124,7 +131,7 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
def __search_movie(self, query: str, page: int) -> dict:
try:
response = requests.get(
url=f"{self.url}/movies/search", params={"query": query, "page": page}
url=f"{self.url}/movies/search", params={"query": query, "page": page, "language": self.default_language}
)
response.raise_for_status()
return response.json()
@@ -139,7 +146,7 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
def __get_trending_movies(self) -> dict:
try:
response = requests.get(url=f"{self.url}/movies/trending")
response = requests.get(url=f"{self.url}/movies/trending", params={"language": self.default_language})
response.raise_for_status()
return response.json()
except requests.RequestException as e:
@@ -160,7 +167,7 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
language = self.__get_language_param(original_language)
# Fetch metadata in the appropriate language to get localized poster
if language != "en":
if language != self.default_language:
show_metadata = self.__get_show_metadata(show.external_id, language=language)
# downloading the poster
@@ -181,20 +188,23 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
return False
return True
def get_show_metadata(self, id: int = None) -> Show:
def get_show_metadata(self, id: int = None, language: str | None = None) -> Show:
"""
:param id: the external id of the show
:type id: int
:return: returns a ShowMetadata object
:rtype: ShowMetadata
:param language: optional language code (ISO 639-1) to fetch metadata in
:type language: str | None
:return: returns a Show object
:rtype: Show
"""
show_metadata = self.__get_show_metadata(id)
original_language = show_metadata.get("original_language")
# If language not provided, fetch once to determine original language
if language is None:
show_metadata = self.__get_show_metadata(id)
language = show_metadata.get("original_language")
# Determine which language to use for metadata
language = self.__get_language_param(original_language)
language = self.__get_language_param(language)
# Fetch show metadata in the appropriate language
show_metadata = self.__get_show_metadata(id, language=language)
@@ -278,14 +288,17 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
original_name = result.get("original_name")
display_name = result["name"]
# Use original name if language is in primary_languages
overview = result["overview"]
# Use original name if language is in primary_languages and skip overview
if original_language and original_language in self.primary_languages:
display_name = original_name
overview = None
formatted_results.append(
MetaDataProviderSearchResult(
poster_path=poster_url,
overview=result["overview"],
overview=overview,
name=display_name,
external_id=result["id"],
year=media_manager.metadataProvider.utils.get_year_from_date(
@@ -301,20 +314,24 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
log.warning(f"Error processing search result: {e}")
return formatted_results
def get_movie_metadata(self, id: int = None) -> Movie:
def get_movie_metadata(self, id: int = None, language: str | None = None) -> Movie:
"""
Get movie metadata with language-aware fetching.
:param id: the external id of the movie
:type id: int
:param language: optional language code (ISO 639-1) to fetch metadata in
:type language: str | None
:return: returns a Movie object
:rtype: Movie
"""
movie_metadata = self.__get_movie_metadata(id=id)
original_language = movie_metadata.get("original_language")
# If language not provided, fetch once to determine original language
if language is None:
movie_metadata = self.__get_movie_metadata(id=id)
language = movie_metadata.get("original_language")
# Determine which language to use for metadata
language = self.__get_language_param(original_language)
language = self.__get_language_param(language)
# Fetch movie metadata in the appropriate language
movie_metadata = self.__get_movie_metadata(id=id, language=language)
@@ -367,14 +384,16 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
original_title = result.get("original_title")
display_name = result["title"]
# Use original title if language is in primary_languages
if original_language and original_language in self.primary_languages and original_title:
overview = result["overview"]
# Use original name if language is in primary_languages and skip overview
if original_language and original_language in self.primary_languages:
display_name = original_title
overview = None
formatted_results.append(
MetaDataProviderSearchResult(
poster_path=poster_url,
overview=result["overview"],
overview=overview,
name=display_name,
external_id=result["id"],
year=media_manager.metadataProvider.utils.get_year_from_date(
@@ -399,7 +418,7 @@ class TmdbMetadataProvider(AbstractMetadataProvider):
language = self.__get_language_param(original_language)
# Fetch metadata in the appropriate language to get localized poster
if language != "en":
if language != self.default_language:
movie_metadata = self.__get_movie_metadata(id=movie.external_id, language=language)
# downloading the poster

2
media_manager/movies/router.py
View File

@@ -55,11 +55,13 @@ def add_a_movie(
movie_service: movie_service_dep,
metadata_provider: metadata_provider_dep,
movie_id: int,
language: str | None = None,
):
try:
movie = movie_service.add_movie(
external_id=movie_id,
metadata_provider=metadata_provider,
language=language,
)
except ValueError:
movie = movie_service.get_movie_by_external_id(

5
media_manager/movies/service.py
View File

@@ -60,15 +60,16 @@ class MovieService:
self.notification_service = notification_service
def add_movie(
self, external_id: int, metadata_provider: AbstractMetadataProvider
self, external_id: int, metadata_provider: AbstractMetadataProvider, language: str | None = None
) -> Movie | None:
"""
Add a new movie to the database.
:param external_id: The ID of the movie in the metadata provider's system.
:param metadata_provider: The name of the metadata provider.
:param language: Optional language code (ISO 639-1) to fetch metadata in.
"""
movie_with_metadata = metadata_provider.get_movie_metadata(id=external_id)
movie_with_metadata = metadata_provider.get_movie_metadata(id=external_id, language=language)
saved_movie = self.movie_repository.save_movie(movie=movie_with_metadata)
metadata_provider.download_movie_poster_image(movie=saved_movie)
return saved_movie

3
media_manager/tv/router.py
View File

@@ -59,12 +59,13 @@ router = APIRouter()
},
)
def add_a_show(
tv_service: tv_service_dep, metadata_provider: metadata_provider_dep, show_id: int
tv_service: tv_service_dep, metadata_provider: metadata_provider_dep, show_id: int, language: str | None = None
):
try:
show = tv_service.add_show(
external_id=show_id,
metadata_provider=metadata_provider,
language=language,
)
except MediaAlreadyExists:
show = tv_service.get_show_by_external_id(

7
media_manager/tv/service.py
View File

@@ -66,15 +66,16 @@ class TvService:
self.notification_service = notification_service
def add_show(
self, external_id: int, metadata_provider: AbstractMetadataProvider
self, external_id: int, metadata_provider: AbstractMetadataProvider, language: str | None = None
) -> Show | None:
"""
Add a new show to the database.
:param external_id: The ID of the show in the metadata provider\\\'s system.
:param external_id: The ID of the show in the metadata provider\'s system.
:param metadata_provider: The name of the metadata provider.
:param language: Optional language code (ISO 639-1) to fetch metadata in.
"""
show_with_metadata = metadata_provider.get_show_metadata(id=external_id)
show_with_metadata = metadata_provider.get_show_metadata(id=external_id, language=language)
saved_show = self.tv_repository.save_show(show=show_with_metadata)
metadata_provider.download_show_poster_image(show=saved_show)
return saved_show

16
metadata_relay/app/tmdb.py
View File

@@ -16,12 +16,12 @@ else:
tmdbsimple.API_KEY = tmdb_api_key
@router.get("/tv/trending")
async def get_tmdb_trending_tv():
return Trending(media_type="tv").info()
async def get_tmdb_trending_tv(language: str = "en"):
return Trending(media_type="tv").info(language=language)
@router.get("/tv/search")
async def search_tmdb_tv(query: str, page: int = 1):
return Search().tv(page=page, query=query, include_adult=True)
async def search_tmdb_tv(query: str, page: int = 1, language: str = "en"):
return Search().tv(page=page, query=query, include_adult=True, language=language)
@router.get("/tv/shows/{show_id}")
async def get_tmdb_show(show_id: int, language: str = "en"):
@@ -32,12 +32,12 @@ else:
return TV_Seasons(season_number=season_number, tv_id=show_id).info(language=language)
@router.get("/movies/trending")
async def get_tmdb_trending_movies():
return Trending(media_type="movie").info()
async def get_tmdb_trending_movies(language: str = "en"):
return Trending(media_type="movie").info(language=language)
@router.get("/movies/search")
async def search_tmdb_movies(query: str, page: int = 1):
return Search().movie(page=page, query=query, include_adult=True)
async def search_tmdb_movies(query: str, page: int = 1, language: str = "en"):
return Search().movie(page=page, query=query, include_adult=True, language=language)
@router.get("/movies/{movie_id}")
async def get_tmdb_movie(movie_id: int, language: str = "en"):