ytdl-sub 2026.1.16.post1__py3-none-any.whl → 2026.1.23.post1__py3-none-any.whl

ytdl_sub/__init__.py

@@ -1 +1 @@
-__pypi_version__ = "2026.01.16.post1";__local_version__ = "2026.01.16+97df4da"
+__pypi_version__ = "2026.01.23.post1";__local_version__ = "2026.01.23+264e458"

ytdl_sub/prebuilt_presets/music/soundcloud.yaml

@@ -8,7 +8,7 @@ presets:
       urls:
         # The first URL will be all the artist's tracks.
         # Treat these as singles - an album with a single track
-        - url: "{url}/tracks"
+        - url: "{url}"
           include_sibling_metadata: False
           variables:
             sc_track_album: "{title}"

ytdl_sub/script/script.py

@@ -1,5 +1,6 @@
 # pylint: disable=missing-raises-doc
 import copy
+from collections import defaultdict
 from typing import Dict
 from typing import List
 from typing import Optional
@@ -38,59 +39,71 @@ class Script:
         ``{ %custom_function: syntax }``
     """
 
-    def _ensure_no_cycle(
+    def _throw_cycle_error(
         self, name: str, dep: str, deps: List[str], definitions: Dict[str, SyntaxTree]
     ):
-        if dep not in definitions:
-            return  # does not exist, will throw downstream in parser
-
-        if name in deps + [dep]:
-            type_name, pre = (
-                ("custom functions", "%") if definitions is self._functions else ("variables", "")
-            )
-            cycle_deps = [name] + deps + [dep]
-            cycle_deps_str = " -> ".join([f"{pre}{name}" for name in cycle_deps])
+        type_name, pre = (
+            ("custom functions", "%") if definitions is self._functions else ("variables", "")
+        )
+        cycle_deps = [name] + deps + [dep]
+        cycle_deps_str = " -> ".join([f"{pre}{name}" for name in cycle_deps])
 
-            raise CycleDetected(f"Cycle detected within these {type_name}: {cycle_deps_str}")
+        raise CycleDetected(f"Cycle detected within these {type_name}: {cycle_deps_str}")
 
     def _traverse_variable_dependencies(
         self,
         variable_name: str,
         variable_dependency: SyntaxTree,
         deps: List[str],
+        ensured: Dict[str, Set[str]],
     ) -> None:
         for dep in variable_dependency.variables:
-            self._ensure_no_cycle(
-                name=variable_name, dep=dep.name, deps=deps, definitions=self._variables
-            )
+            if variable_name == dep.name:
+                self._throw_cycle_error(
+                    name=variable_name, dep=dep.name, deps=deps, definitions=self._variables
+                )
+
+            if dep.name in ensured[variable_name]:
+                continue
+
             self._traverse_variable_dependencies(
                 variable_name=variable_name,
                 variable_dependency=self._variables[dep.name],
                 deps=deps + [dep.name],
+                ensured=ensured,
             )
+            ensured[variable_name].add(dep.name)
 
         for custom_func in variable_dependency.custom_function_dependencies(
             custom_function_definitions=self._functions
         ):
             for dep in self._functions[custom_func.name].variables:
-                self._ensure_no_cycle(
-                    name=variable_name,
-                    dep=dep.name,
-                    deps=deps + [custom_func.definition_name()],
-                    definitions=self._variables,
-                )
+                if variable_name == dep.name:
+                    self._throw_cycle_error(
+                        name=variable_name,
+                        dep=dep.name,
+                        deps=deps + [custom_func.definition_name()],
+                        definitions=self._variables,
+                    )
+                if dep.name in ensured[variable_name]:
+                    continue
+
                 self._traverse_variable_dependencies(
                     variable_name=variable_name,
                     variable_dependency=self._variables[dep.name],
                     deps=deps + [custom_func.definition_name(), dep.name],
+                    ensured=ensured,
                 )
+                ensured[variable_name].add(dep.name)
 
     def _ensure_no_variable_cycles(self, variables: Dict[str, SyntaxTree]):
+        ensured: Dict[str, Set[str]] = defaultdict(set)
         for variable_name, variable_definition in variables.items():
             self._traverse_variable_dependencies(
                 variable_name=variable_name,
                 variable_dependency=variable_definition,
                 deps=[],
+                ensured=ensured,
             )
 
     def _traverse_custom_function_dependencies(
@@ -100,9 +113,10 @@ class Script:
         deps: List[str],
     ) -> None:
         for dep in custom_function_dependency.custom_functions:
-            self._ensure_no_cycle(
-                name=custom_function_name, dep=dep.name, deps=deps, definitions=self._functions
-            )
+            if custom_function_name == dep.name:
+                self._throw_cycle_error(
+                    name=custom_function_name, dep=dep.name, deps=deps, definitions=self._functions
+                )
             self._traverse_custom_function_dependencies(
                 custom_function_name=custom_function_name,
                 custom_function_dependency=self._functions[dep.name],

{ytdl_sub-2026.1.16.post1.dist-info → ytdl_sub-2026.1.23.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ytdl-sub
-Version: 2026.1.16.post1
+Version: 2026.1.23.post1
 Summary: Automate downloading metadata generation with YoutubeDL
 Author: Jesse Bannon
 License:                     GNU GENERAL PUBLIC LICENSE

{ytdl_sub-2026.1.16.post1.dist-info → ytdl_sub-2026.1.23.post1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ytdl_sub/__init__.py,sha256=2-KRZ1DEByYOGijD0n5BrJAPAcFYZ4mD4o-MVnboVCk,79
+ytdl_sub/__init__.py,sha256=X-mG0iHeHchpdmnmdqyZ5dExltrJMCVVKIKT2GLsAeI,79
 ytdl_sub/main.py,sha256=4Rf9wXxSKW7IPnWqG5YtTZ814PjP1n9WtoFDivaainE,1004
 ytdl_sub/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/cli/entrypoint.py,sha256=XXjUH4HiOP_BB2ZA_bNcyt5-o6YLAdZmj0EP3xtOtD8,9496
@@ -81,7 +81,7 @@ ytdl_sub/prebuilt_presets/music/__init__.py,sha256=SZkVAFSEt9gTKjyseaebh7l2uMsMl
 ytdl_sub/prebuilt_presets/music/albums_from_chapters.yaml,sha256=8I8vi4L5LEZV0ZZucnUOIGwC6DT9PvZUyFG9ugvbV2k,658
 ytdl_sub/prebuilt_presets/music/albums_from_playlists.yaml,sha256=AKMyOxD_4KMa40Cb5OZop8v_NXapuFV-LEbFGfjfouc,874
 ytdl_sub/prebuilt_presets/music/singles.yaml,sha256=mrTswAUr-Jgdv0_WuwMgG-kr8zpQU-A0jct25Drj5m0,1943
-ytdl_sub/prebuilt_presets/music/soundcloud.yaml,sha256=-V65VC902A3GbgvCJyBh4WjCcvPYx07yg8-jZkIVtLQ,1391
+ytdl_sub/prebuilt_presets/music/soundcloud.yaml,sha256=llbPQE5pvGZ1uWDhyMglz_Vxt0-ZM58FktvTyIyh9Jg,1384
 ytdl_sub/prebuilt_presets/music_videos/__init__.py,sha256=eX9FbPh4thWqpfnLtlY1J1OQdfTmiUZqSBnz1dJ44Ws,595
 ytdl_sub/prebuilt_presets/music_videos/music_video_base.yaml,sha256=BEv3SnPzI0UJTi3tOHN2HE2Tang2FwWCGHEEIjKiVZA,2016
 ytdl_sub/prebuilt_presets/music_videos/music_video_extras.yaml,sha256=1XImnNGcCH63E-GbJj_YKDHFXzW9hRokJsuO0zi1Pv8,1255
@@ -93,7 +93,7 @@ ytdl_sub/prebuilt_presets/tv_show/tv_show_by_date.yaml,sha256=0OgIOzxSPNVqwcZnL6
 ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml,sha256=MRAxKnh_MvQFJTisRYGsbsUlDmHNLMuV5tlK6iczmqs,49826
 ytdl_sub/script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/script/parser.py,sha256=LUvmUIxg346njE8-uDx06nOW6ZDX5QS6aUtp4lsgwpk,22115
-ytdl_sub/script/script.py,sha256=r5QJOt0Dw1GE9qy8hHr5-bjr2HWs1rv9g-dsHrSBZrc,29998
+ytdl_sub/script/script.py,sha256=frzZNxx42dIcpB6QGyAAb2uE2fI-pmywEBiYJQVXZG4,30526
 ytdl_sub/script/script_output.py,sha256=5SIamnI-1D3xMA0qQzjf9xrIy8j6BVhGCKrl_Q1d2M8,1381
 ytdl_sub/script/functions/__init__.py,sha256=rzl6O5G0IEqFYHQECIM9bRvcuQj-ytC_p-Xl2TTa6j0,2932
 ytdl_sub/script/functions/array_functions.py,sha256=yg9rcZP67-aVzhu4oZZzUu3-AHiHltbQDWEs8GW1DJ4,7193
@@ -158,9 +158,9 @@ ytdl_sub/validators/string_select_validator.py,sha256=KFXNKWX2J80WGt08m5gVYphPMH
 ytdl_sub/validators/validators.py,sha256=JC3-c9fSrozFADUY5jqZEhXpM2q3sfserlooQxT2DK8,9133
 ytdl_sub/ytdl_additions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/ytdl_additions/enhanced_download_archive.py,sha256=Lsc0wjHdx9d8dYJCskZYAUGDAQ_QzQ-_xbQlyrBSzfk,24884
-ytdl_sub-2026.1.16.post1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ytdl_sub-2026.1.16.post1.dist-info/METADATA,sha256=u3uun6tUQ6QcrljVD1vj4d1o16X0L1BN8Jf7tZ4i1RM,51426
-ytdl_sub-2026.1.16.post1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ytdl_sub-2026.1.16.post1.dist-info/entry_points.txt,sha256=K3T5235NlAI-WLmHCg5tzLZHqc33OLN5IY5fOGc9t10,48
-ytdl_sub-2026.1.16.post1.dist-info/top_level.txt,sha256=6z-JWazl6jXspC2DNyxOnGnEqYyGzVbgcBDoXfbkUhI,9
-ytdl_sub-2026.1.16.post1.dist-info/RECORD,,
+ytdl_sub-2026.1.23.post1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ytdl_sub-2026.1.23.post1.dist-info/METADATA,sha256=e3n2uBTGvriWWwqXTx9p7WR09foC58MqUMm_GhtxX0s,51426
+ytdl_sub-2026.1.23.post1.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+ytdl_sub-2026.1.23.post1.dist-info/entry_points.txt,sha256=K3T5235NlAI-WLmHCg5tzLZHqc33OLN5IY5fOGc9t10,48
+ytdl_sub-2026.1.23.post1.dist-info/top_level.txt,sha256=6z-JWazl6jXspC2DNyxOnGnEqYyGzVbgcBDoXfbkUhI,9
+ytdl_sub-2026.1.23.post1.dist-info/RECORD,,

{ytdl_sub-2026.1.16.post1.dist-info → ytdl_sub-2026.1.23.post1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any