youtube tests working?

This commit is contained in:
Jesse Bannon 2023-12-12 12:45:05 -08:00
parent 87303ac5be
commit 67a6972b0a
3 changed files with 5 additions and 7 deletions

View file

@ -509,9 +509,7 @@ class MultiUrlDownloader(SourcePlugin[MultiUrlValidator]):
v.sponsorblock_chapters.variable_name: download_entry.kwargs_get( v.sponsorblock_chapters.variable_name: download_entry.kwargs_get(
v.sponsorblock_chapters.metadata_key v.sponsorblock_chapters.metadata_key
), ),
v.comments.variable_name: download_entry.kwargs_get( v.comments.variable_name: download_entry.kwargs_get(v.comments.metadata_key),
v.sponsorblock_chapters.metadata_key
),
} }
) )

View file

@ -12,6 +12,7 @@ from typing import final
from ytdl_sub.entries.base_entry import BaseEntry from ytdl_sub.entries.base_entry import BaseEntry
from ytdl_sub.entries.script.variable_definitions import VARIABLES from ytdl_sub.entries.script.variable_definitions import VARIABLES
from ytdl_sub.entries.script.variable_definitions import Variable from ytdl_sub.entries.script.variable_definitions import Variable
from ytdl_sub.utils.script import ScriptUtils
from ytdl_sub.utils.scriptable import Scriptable from ytdl_sub.utils.scriptable import Scriptable
from ytdl_sub.validators.audo_codec_validator import AUDIO_CODEC_EXTS from ytdl_sub.validators.audo_codec_validator import AUDIO_CODEC_EXTS
from ytdl_sub.validators.audo_codec_validator import VIDEO_CODEC_EXTS from ytdl_sub.validators.audo_codec_validator import VIDEO_CODEC_EXTS
@ -33,10 +34,9 @@ class Entry(BaseEntry, Scriptable):
def _add_entry_kwargs_to_script(self) -> None: def _add_entry_kwargs_to_script(self) -> None:
# Add entry metadata, but avoid the `.add()` helper since it also adds sanitized # Add entry metadata, but avoid the `.add()` helper since it also adds sanitized
self.unresolvable.remove(VARIABLES.entry_metadata.variable_name) self.unresolvable.remove(VARIABLES.entry_metadata.variable_name)
entry_metadata_variable = ( self.script.add(
f"{{%from_json('''{json.dumps(self._kwargs, ensure_ascii=False)}''')}}" {VARIABLES.entry_metadata.variable_name: ScriptUtils.to_script(self._kwargs)}
) )
self.script.add({VARIABLES.entry_metadata.variable_name: entry_metadata_variable})
self.update_script() self.update_script()
def initialize_script(self, other: Optional[Scriptable] = None) -> "Entry": def initialize_script(self, other: Optional[Scriptable] = None) -> "Entry":

View file

@ -37,6 +37,6 @@ class ScriptUtils:
elif isinstance(value, bool): elif isinstance(value, bool):
out = f"{{%bool({value})}}" out = f"{{%bool({value})}}"
else: else:
out = json.dumps(value) out = f"{{%from_json('''{json.dumps(value, ensure_ascii=False)}''')}}"
return out return out