From 1bca3104bd24e90739bbb7e5b42de305d12910bb Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Fri, 15 Oct 2021 12:22:00 +0200 Subject: [PATCH] Normalize auto-generated collection titles --- server/entertainment_decider/extractors/collection/youtube.py | 2 +- server/entertainment_decider/extractors/media/base.py | 4 ++-- server/entertainment_decider/extractors/media/ytdl.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/entertainment_decider/extractors/collection/youtube.py b/server/entertainment_decider/extractors/collection/youtube.py index 3ffc7c7..a938dfb 100644 --- a/server/entertainment_decider/extractors/collection/youtube.py +++ b/server/entertainment_decider/extractors/collection/youtube.py @@ -84,7 +84,7 @@ class YouTubeCollectionExtractor(CollectionExtractor[Dict]): def _update_object_raw(self, object: MediaCollection, data: Dict): info = data["info"] is_channel = self.__is_channel_id(info["id"]) - object.title = f"Channel: {info['channel']['name']} (YouTube)" if is_channel else f"{info['title']} ({info['channel']['name']})" + object.title = f"[channel] [{self.name}] {info['channel']['name']}" if is_channel else f"{info['title']} ({info['channel']['name']})" object.add_uris((info["link"],)) video_list = data["videos"] if object.watch_in_order_auto: diff --git a/server/entertainment_decider/extractors/media/base.py b/server/entertainment_decider/extractors/media/base.py index 6142deb..c45b6ff 100644 --- a/server/entertainment_decider/extractors/media/base.py +++ b/server/entertainment_decider/extractors/media/base.py @@ -59,8 +59,8 @@ class MediaExtractor(GeneralExtractor[MediaElement, T]): collection = self.__lookup_author_collection(author_data) if collection is None: collection = self.__create_author_collection(author_data) - if not collection.title or collection.title.startswith(f"(author:{author_data.extractor_name}) "): - collection.title = f"(author:{author_data.extractor_name}) {author_data.author_name}" + if not collection.title or collection.title.startswith("[author] "): + collection.title = f"[author] [{author_data.extractor_name}] {author_data.author_name}" return collection def __add_to_author_collection(self, element: MediaElement, data: Dict): diff --git a/server/entertainment_decider/extractors/media/ytdl.py b/server/entertainment_decider/extractors/media/ytdl.py index 9b851ab..8fa910a 100644 --- a/server/entertainment_decider/extractors/media/ytdl.py +++ b/server/entertainment_decider/extractors/media/ytdl.py @@ -27,7 +27,7 @@ class YtdlMediaExtractor(MediaExtractor[Dict]): object_uri = data.get("channel_url") or data.get("uploader_url"), extractor_name = self.name, object_key = f"author:{video_extractor_key}:{author_key}" if author_key else None, - author_name = f"{video_extractor_key}: {author_name}" if author_name else None, + author_name = f"[{video_extractor_key.lower()}] {author_name}" if author_name else None, ) def _extract_online(self, uri: str) -> ExtractedData[Dict]: