spots-cli 0.2.1__tar.gz → 0.2.2__tar.gz

{spots_cli-0.2.1 → spots_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: spots_cli
-Version: 0.2.1
+Version: 0.2.2
 Summary: Spots is a modular music coordination library that unifies multiple providers (e.g. Deezer, Spotify, YouTube) into a single, consistent interface.
 Project-URL: Homepage, https://github.com/mdesignscode/spots_flask
 Project-URL: Issues, https://github.com/mdesignscode/spots_flask

{spots_cli-0.2.1 → spots_cli-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "spots_cli"
-version = "0.2.1"
+version = "0.2.2"
 authors = [
   { name="Marlon Baatjes", email="marlonbaatjes62@gmail.com" }
 ]

{spots_cli-0.2.1 → spots_cli-0.2.2}/src/spots_cli/app/domain_resolver.py

@@ -8,6 +8,7 @@ from spots_cli.models import Metadata, SongNotFound, Sentinel, YTVideoInfo
 
 if TYPE_CHECKING:
     from spots_cli.bootstrap.container import Core
+    from spots_cli.core import YouTubeExtractor
     from spots_cli.models import SearchProvider
     from spots_cli.services import YoutubeSearchService
 
@@ -27,8 +28,9 @@ class ResolvedDomainResult:
     youtube: YTVideoInfo
 
 
-def fallback_metadata(video: YTVideoInfo) -> Metadata:
-    """Builds a bare-bones Metadata object straight from a YouTube result.
+def fallback_metadata(video: YTVideoInfo, extractor: YouTubeExtractor) -> Metadata:
+    """Builds a bare-bones Metadata object straight from a YouTube result,
+    with the artist and title cleaned of video noise like "(Official Video)".
 
     Used when no provider (Spotify/Deezer) has metadata for a track, or the
     provider's result doesn't match. The provider is only used to prettify
@@ -36,9 +38,10 @@ def fallback_metadata(video: YTVideoInfo) -> Metadata:
     from YouTube, so a missing/mismatched provider entry should never cause
     a track to be dropped as long as it exists on YouTube.
     """
+    cleaned = extractor.clean_artist_and_title(video.uploader, video.title)
     return Metadata(
-        title=video.title,
-        artist=video.uploader,
+        title=cleaned.title or video.title,
+        artist=cleaned.artist or video.uploader,
         link=video.video_link,
         artist_id="",
         is_fallback=True,
@@ -97,7 +100,7 @@ class DomainResolver:
                         f"No provider metadata for '{video_title}', "
                         "falling back to YouTube-derived metadata"
                     )
-                    fallback = fallback_metadata(video)
+                    fallback = fallback_metadata(video, self.core.extractor)
                     self.core.storage.new(
                         query=video_title, result=fallback, query_type="metadata"
                     )
@@ -118,7 +121,7 @@ class DomainResolver:
                         f"Provider metadata for '{video_title}' didn't match, "
                         "falling back to YouTube-derived metadata"
                     )
-                    fallback = fallback_metadata(video)
+                    fallback = fallback_metadata(video, self.core.extractor)
                     self.core.storage.new(
                         query=video_title, result=fallback, query_type="metadata"
                     )

{spots_cli-0.2.1 → spots_cli-0.2.2}/src/spots_cli/app/media_resolver.py

@@ -211,7 +211,9 @@ class MediaResolver:
                         f"No matching provider metadata for '{yt_title}', "
                         "falling back to YouTube-derived metadata"
                     )
-                    metadata = fallback_metadata(video_info.result)
+                    metadata = fallback_metadata(
+                        video_info.result, self.core.extractor
+                    )
 
                 self.core.storage.new(
                     query=yt_title, result=metadata, query_type="metadata"

{spots_cli-0.2.1 → spots_cli-0.2.2}/src/spots_cli/core/youtube_extractor.py

@@ -166,15 +166,15 @@ class YouTubeExtractor:
             artist=youtube_artist.strip(), title=youtube_title.strip()
         )
 
-    def build_search_query(self, uploader: str, title: str) -> str:
-        """Cleans noisy YouTube uploader/title fields into a search-friendly
-        'Artist - Title' string for provider lookups (Deezer/Spotify).
+    def clean_artist_and_title(self, uploader: str, title: str) -> ArtistAndTitle:
+        """Cleans noisy YouTube uploader/title fields into an artist and a title.
 
-        Strips common suffixes like "(Official Video)" and de-duplicates the
-        uploader name when it's already repeated at the start of the title:
+        Strips common suffixes like "(Official Video)" and a trailing "VEVO",
+        and de-duplicates the uploader name when it's already repeated at the
+        start of the title:
 
             uploader="Tinashe", title="Tinashe - Needs (Official Video)"
-            -> "Tinashe - Needs"
+            -> artist="Tinashe", title="Needs"
         """
         uploader = self.remove_odd_keywords((uploader or "").strip())
         uploader = sub(r"vevo$", "", uploader, flags=IGNORECASE).strip()
@@ -192,4 +192,9 @@ class YouTubeExtractor:
             if deduped_title:
                 title = deduped_title
 
-        return f"{uploader} - {title}".strip(" -")
+        return ArtistAndTitle(artist=uploader, title=title)
+
+    def build_search_query(self, uploader: str, title: str) -> str:
+        """The cleaned 'Artist - Title' string for provider lookups (Deezer/Spotify)."""
+        cleaned = self.clean_artist_and_title(uploader, title)
+        return f"{cleaned.artist} - {cleaned.title}".strip(" -")

{spots_cli-0.2.1 → spots_cli-0.2.2}/tests/app/test_media_resolver.py

@@ -78,3 +78,18 @@ def test_spotify_link_needs_spotify_turned_on(upload):
 
     # not retried, and the Spotify id never reaches another provider
     resolver.domain.provider_metadata.get.assert_not_called()
+
+
+def test_fallback_tags_drop_the_repeated_artist_and_video_tags():
+    upload = YTVideoInfo(
+        id="kSBQZH3dkZ8",
+        title="Tyla - THAT GIRL (Biuro Version) (Official Video)",
+        uploader="TylaVEVO",
+        audio_ext="webm",
+        filesize=4,
+    )
+    resolver = build_resolver(upload, provider_error=SongNotFound("Tyla - THAT GIRL"))
+
+    metadata = resolver.resolve(url=LINK).metadata
+
+    assert (metadata.artist, metadata.title) == ("Tyla", "THAT GIRL (Biuro Version)")