From 3086318d9a2215d6f17b8d8e2df57bb9b443db40 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Wed, 6 Dec 2023 15:47:43 -0800 Subject: [PATCH] moar --- .../entries/script/variable_scripts.py | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/ytdl_sub/entries/script/variable_scripts.py b/src/ytdl_sub/entries/script/variable_scripts.py index 42b26b2a..8d3d77d0 100644 --- a/src/ytdl_sub/entries/script/variable_scripts.py +++ b/src/ytdl_sub/entries/script/variable_scripts.py @@ -4,7 +4,9 @@ from typing import Optional from ytdl_sub.entries.script.variable_definitions import KwargKey from ytdl_sub.entries.script.variable_definitions import Variables -ENTRY_MAP_VARIABLE = "entry" +ENTRY_MAP_VARIABLE = "entry_metadata" +PLAYLIST_MAP_VARIABLE = "playlist_metadata" +SOURCE_MAP_VARIABLE = "source_metadata" def _entry_get(key: KwargKey, default: Optional[KwargKey | str | int]) -> str: @@ -27,6 +29,10 @@ def entry_get_int(key: KwargKey, default: Optional[KwargKey] = None) -> str: return f"{{%int({_entry_get(key=key, default=default)}}}" +def pad_int(key: KwargKey, pad: int) -> str: + return f"{{%pad_zero({key.variable_name}, {pad})}}" + + def sanitized(key: KwargKey) -> str: return f"{{%sanitize({key.variable_name})}}" @@ -82,12 +88,12 @@ ENTRY_DERIVED_VARIABLES: Dict[KwargKey, str] = { } ENTRY_ARCHIVE_VARIABLES: Dict[KwargKey, str] = { - # download_index - # download_index_padded6 - # upload_date_index - # upload_date_index_padded - # upload_date_index_reversed - # upload_date_index_reversed_padded + v.download_index: entry_get_int(v.download_index), + v.download_index_padded6: pad_int(v.download_index, 6), + v.upload_date_index: entry_get_int(v.upload_date_index), + v.upload_date_index_padded: pad_int(v.upload_date_index, 2), + v.upload_date_index_reversed: f"{{%sub(100, {v.download_index})}}", + v.upload_date_index_reversed_padded: pad_int(v.upload_date_index_reversed, 2), } ENTRY_UPLOAD_DATE_VARIABLES: Dict[KwargKey, str] = {