From 600adcf0a8d33d0cddace87f77f5db543af5064e Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Sat, 17 Sep 2022 00:17:50 -0700 Subject: [PATCH] add description --- src/ytdl_sub/entries/base_entry.py | 3 ++- src/ytdl_sub/entries/entry_parent.py | 21 ++++++++------------- src/ytdl_sub/entries/variables/kwargs.py | 1 + 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/ytdl_sub/entries/base_entry.py b/src/ytdl_sub/entries/base_entry.py index e94c0fc7..c79dc60f 100644 --- a/src/ytdl_sub/entries/base_entry.py +++ b/src/ytdl_sub/entries/base_entry.py @@ -10,6 +10,7 @@ from typing import final from yt_dlp.utils import sanitize_filename +from ytdl_sub.entries.variables.kwargs import DESCRIPTION from ytdl_sub.entries.variables.kwargs import TITLE from ytdl_sub.entries.variables.kwargs import WEBPAGE_URL @@ -93,7 +94,7 @@ class BaseEntryVariables: str The description if it exists. Otherwise, returns an emtpy string. """ - return self.kwargs_get("description", "") + return self.kwargs_get(DESCRIPTION, "") # pylint: enable=no-member diff --git a/src/ytdl_sub/entries/entry_parent.py b/src/ytdl_sub/entries/entry_parent.py index ecc9e4da..78ad5aad 100644 --- a/src/ytdl_sub/entries/entry_parent.py +++ b/src/ytdl_sub/entries/entry_parent.py @@ -68,20 +68,15 @@ class EntryParent(BaseEntry): } def _parent_variables(self, parent_type: str) -> Dict: - if parent_type == ParentType.SOURCE: - return { - SOURCE_ENTRY: self._kwargs, - SOURCE_TITLE: self.title, - SOURCE_WEBPAGE_URL: self.webpage_url, - SOURCE_UID: self.uid, - SOURCE_DESCRIPTION: self.description, - } + def _(source_key: str, playlist_key: str) -> str: + return playlist_key if parent_type == ParentType.SOURCE else source_key + return { - PLAYLIST_ENTRY: self._kwargs, - PLAYLIST_TITLE: self.title, - PLAYLIST_WEBPAGE_URL: self.webpage_url, - PLAYLIST_UID: self.uid, - PLAYLIST_DESCRIPTION: self.description, + _(SOURCE_ENTRY, PLAYLIST_ENTRY): self._kwargs, + _(SOURCE_TITLE, PLAYLIST_TITLE): self.title, + _(SOURCE_WEBPAGE_URL, PLAYLIST_WEBPAGE_URL): self.webpage_url, + _(SOURCE_UID, PLAYLIST_UID): self.uid, + _(SOURCE_DESCRIPTION, PLAYLIST_DESCRIPTION): self.description, } def _get_entry_children_variable_list(self, variable_name: str) -> List[str | int]: diff --git a/src/ytdl_sub/entries/variables/kwargs.py b/src/ytdl_sub/entries/variables/kwargs.py index 774c773e..b4fa836d 100644 --- a/src/ytdl_sub/entries/variables/kwargs.py +++ b/src/ytdl_sub/entries/variables/kwargs.py @@ -36,4 +36,5 @@ PLAYLIST_UID = _("playlist_uid") EXT = _("ext") TITLE = _("title") +DESCRIPTION = _("description") WEBPAGE_URL = _("webpage_url")