From 887676ef5ee09653d633a6d61816f10cfc49bf63 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Thu, 7 Dec 2023 17:30:31 -0800 Subject: [PATCH] e2e working? --- src/ytdl_sub/entries/entry.py | 4 ++-- src/ytdl_sub/entries/script/function_scripts.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ytdl_sub/entries/entry.py b/src/ytdl_sub/entries/entry.py index 7fe44e32..9679e511 100644 --- a/src/ytdl_sub/entries/entry.py +++ b/src/ytdl_sub/entries/entry.py @@ -26,8 +26,8 @@ class Entry(BaseEntry, Scriptable): Scriptable.__init__(self) self.script.add({VARIABLES.entry_metadata.variable_name: f"{{{json.dumps(self._kwargs)}}}"}) - self.script.add(override_variables) - self.script.resolve(update=True) + self.add(override_variables) + self.update_script() def get(self, variable: Variable) -> str: return self.script.resolve(unresolvable=self.unresolvable).get_str(variable.variable_name) diff --git a/src/ytdl_sub/entries/script/function_scripts.py b/src/ytdl_sub/entries/script/function_scripts.py index 939b642d..4bf3a838 100644 --- a/src/ytdl_sub/entries/script/function_scripts.py +++ b/src/ytdl_sub/entries/script/function_scripts.py @@ -2,6 +2,7 @@ from yt_dlp.utils import sanitize_filename from ytdl_sub.script.functions import Functions from ytdl_sub.script.types.map import Map +from ytdl_sub.script.types.resolvable import AnyArgument from ytdl_sub.script.types.resolvable import Integer from ytdl_sub.script.types.resolvable import ReturnableArgument from ytdl_sub.script.types.resolvable import String @@ -23,8 +24,8 @@ class CustomFunctions: return value @staticmethod - def sanitize(string: String) -> String: - return String(sanitize_filename(string.value)) + def sanitize(value: AnyArgument) -> String: + return String(sanitize_filename(str(value))) @staticmethod def sanitize_plex_episode(string: String) -> String: