yutipy 1.4.0__tar.gz → 1.4.2__tar.gz

{yutipy-1.4.0 → yutipy-1.4.2}/.github/workflows/release.yml

@@ -54,25 +54,12 @@ jobs:
         path: dist/
     - name: Publish distribution 📦 to PyPI
       uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
-  draft-release:
-    name: Draft Release Notes
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    needs:
-    - publish-to-pypi
-    steps:
-    - name: Draft Release Notes
-      uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
-      with:
-        config-name: .github/release-drafter.yml
   github-release:
     name: >-
       Sign the Python 🐍 distribution 📦 with Sigstore
       and upload them to GitHub Release
     needs:
     - publish-to-pypi
-    - draft-release
     runs-on: ubuntu-latest
 
     permissions:
@@ -98,7 +85,6 @@ jobs:
         gh release create
         "$GITHUB_REF_NAME"
         --repo "$GITHUB_REPOSITORY"
-        --notes-file .github/release-drafter.yml
         --generate-notes
     - name: Upload artifact signatures to GitHub Release
       env:

{yutipy-1.4.0 → yutipy-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 1.4.0
+Version: 1.4.2
 Summary: A simple package for retrieving music information from various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -33,7 +33,7 @@ Project-URL: Repository, https://github.com/CheapNightbot/yutipy.git
 Project-URL: Issues, https://github.com/CheapNightbot/yutipy/issues
 Project-URL: Changelog, https://github.com/CheapNightbot/yutipy/blob/master/CHANGELOG.md
 Project-URL: funding, https://ko-fi.com/cheapnightbot
-Keywords: music,API,Deezer,iTunes,Spotify,YouTube Music,search,retrieve,information,yutify
+Keywords: music,API,Deezer,iTunes,Spotify,YouTube Music,search,retrieve,information,yutify,KKBox
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries

{yutipy-1.4.0 → yutipy-1.4.2}/pyproject.toml

@@ -22,7 +22,7 @@ maintainers = [
 description = "A simple package for retrieving music information from various music platforms APIs."
 readme = "README.md"
 license = {file = "LICENSE"}
-keywords = ["music", "API", "Deezer", "iTunes", "Spotify", "YouTube Music", "search", "retrieve", "information", "yutify"]
+keywords = ["music", "API", "Deezer", "iTunes", "Spotify", "YouTube Music", "search", "retrieve", "information", "yutify", "KKBox"]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",

{yutipy-1.4.0 → yutipy-1.4.2}/requirements.txt

@@ -1,3 +1,4 @@
+pykakasi==2.3.0
 python-dotenv==1.0.1
 RapidFuzz==3.12.1
 requests==2.32.3

{yutipy-1.4.0 → yutipy-1.4.2}/yutipy/__init__.py

@@ -1,5 +1,6 @@
 from .deezer import Deezer
 from .itunes import Itunes
+from .kkbox import KKBox
 from .models import MusicInfo
 from .musicyt import MusicYT
 from .spotify import Spotify
@@ -8,6 +9,7 @@ from .yutipy_music import YutipyMusic
 __all__ = [
     "Deezer",
     "Itunes",
+    "KKBox",
     "MusicInfo",
     "MusicYT",
     "Spotify",

{yutipy-1.4.0 → yutipy-1.4.2}/yutipy/itunes.py

@@ -1,17 +1,21 @@
 from datetime import datetime
 from pprint import pprint
-from typing import Optional, Dict
+from typing import Dict, Optional
 
 import requests
 
 from yutipy.exceptions import (
     InvalidResponseException,
     InvalidValueException,
-    NetworkException,
     ItunesException,
+    NetworkException,
 )
 from yutipy.models import MusicInfo
-from yutipy.utils.cheap_utils import are_strings_similar, is_valid_string
+from yutipy.utils.cheap_utils import (
+    are_strings_similar,
+    guess_album_type,
+    is_valid_string,
+)
 
 
 class Itunes:
@@ -180,7 +184,13 @@ class Itunes:
             album_title, album_type = result["collectionName"].split("-")
             return album_title.strip(), album_type.strip()
         except ValueError:
-            return result["collectionName"], result["wrapperType"]
+            guess = guess_album_type(result.get("trackCount", 1))
+            guessed_right = are_strings_similar(
+                result.get("wrapperType", "x"), guess, use_translation=False
+            )
+            return result["collectionName"], (
+                result["wrapperType"] if guessed_right else guess
+            )
 
     def _format_release_date(self, release_date: str) -> str:
         """

{yutipy-1.4.0 → yutipy-1.4.2}/yutipy/spotify.py

@@ -17,6 +17,7 @@ from yutipy.exceptions import (
 from yutipy.models import MusicInfo
 from yutipy.utils.cheap_utils import (
     are_strings_similar,
+    guess_album_type,
     is_valid_string,
     separate_artists,
 )
@@ -175,6 +176,7 @@ class Spotify:
         self.normalize_non_english = normalize_non_english
 
         music_info = None
+        artist_ids = None
         queries = [
             f"?q=artist:{artist} track:{song}&type=track&limit={limit}",
             f"?q=artist:{artist} album:{song}&type=album&limit={limit}",
@@ -199,7 +201,7 @@ class Spotify:
             if response.status_code != 200:
                 raise SpotifyException(f"Failed to search for music: {response.json()}")
 
-            artist_ids = self._get_artists_ids(artist)
+            artist_ids = artist_ids if artist_ids else self._get_artists_ids(artist)
             music_info = self._find_music_info(
                 artist, song, response.json(), artist_ids
             )
@@ -449,10 +451,15 @@ class Spotify:
         ]
 
         if matching_artists:
+            guess = guess_album_type(album.get("total_tracks", 1))
+            guessed_right = are_strings_similar(
+                album.get("album_type", "x"), guess, use_translation=False
+            )
+
             return MusicInfo(
                 album_art=album["images"][0]["url"],
                 album_title=album["name"],
-                album_type=album["album_type"],
+                album_type=album.get("album_type") if guessed_right else guess,
                 artists=", ".join(artists_name),
                 genre=None,
                 id=album["id"],
@@ -461,7 +468,7 @@ class Spotify:
                 release_date=album["release_date"],
                 tempo=None,
                 title=album["name"],
-                type="album",
+                type=album.get("type"),
                 upc=None,
                 url=album["external_urls"]["spotify"],
             )

yutipy-1.4.2/yutipy/utils/__init__.py

@@ -0,0 +1,13 @@
+from .cheap_utils import (
+    guess_album_type,
+    are_strings_similar,
+    is_valid_string,
+    separate_artists,
+)
+
+__all__ = [
+    "guess_album_type",
+    "are_strings_similar",
+    "is_valid_string",
+    "separate_artists",
+]

{yutipy-1.4.0 → yutipy-1.4.2}/yutipy/utils/cheap_utils.py

@@ -1,7 +1,10 @@
+import pykakasi
 import requests
 from rapidfuzz import fuzz
 from rapidfuzz.utils import default_process
 
+kakasi = pykakasi.kakasi()
+
 
 def translate_text(
     text: str,
@@ -72,18 +75,29 @@ def are_strings_similar(
     Returns:
         bool: True if the strings are similar, otherwise False.
     """
+
     if use_translation:
-        str1 = (
+        translated_str1 = (
             translate_text(str1, session=translation_session)["destination-text"]
             if translation_session
             else translate_text(str1)["destination-text"]
         )
-        str2 = (
+        translated_str2 = (
             translate_text(str2, session=translation_session)["destination-text"]
             if translation_session
             else translate_text(str2)["destination-text"]
         )
 
+        similarity_score = fuzz.WRatio(
+            translated_str1, translated_str2, processor=default_process
+        )
+        if similarity_score > threshold:
+            return True
+
+    # Use transliterated strings for comparison
+    str1 = "".join(item["hepburn"] for item in kakasi.convert(str1)) or str1
+    str2 = "".join(item["hepburn"] for item in kakasi.convert(str2)) or str2
+
     similarity_score = fuzz.WRatio(str1, str2, processor=default_process)
     return similarity_score > threshold
 
@@ -117,5 +131,15 @@ def is_valid_string(string: str) -> bool:
     return bool(string and (string.isalnum() or not string.isspace()))
 
 
+def guess_album_type(total_tracks: int):
+    """Just guessing the album type (i.e. single, ep or album) by total track counts."""
+    if total_tracks == 1:
+        return "single"
+    if 3 <= total_tracks <= 5:
+        return "ep"
+    if total_tracks >= 7:
+        return "album"
+
+
 if __name__ == "__main__":
     separate_artists("Artist A ft. Artist B")

{yutipy-1.4.0 → yutipy-1.4.2}/yutipy/yutipy_music.py

@@ -98,6 +98,20 @@ class YutipyMusic:
 
         self.normalize_non_english = normalize_non_english
 
+        attributes = [
+            "album_title",
+            "album_type",
+            "artists",
+            "genre",
+            "isrc",
+            "lyrics",
+            "release_date",
+            "tempo",
+            "title",
+            "type",
+            "upc",
+        ]
+
         with ThreadPoolExecutor() as executor:
             futures = {
                 executor.submit(
@@ -113,14 +127,16 @@ class YutipyMusic:
             for future in as_completed(futures):
                 service_name = futures[future]
                 result = future.result()
-                self._combine_results(result, service_name)
+                self._combine_results(result, service_name, attributes)
 
         if len(self.music_info.url) == 0:
             return None
 
         return self.music_info
 
-    def _combine_results(self, result: Optional[MusicInfo], service_name: str) -> None:
+    def _combine_results(
+        self, result: Optional[MusicInfo], service_name: str, attributes: list
+    ) -> None:
         """
         Combines the results from different services.
 
@@ -134,25 +150,16 @@ class YutipyMusic:
         if not result:
             return
 
-        attributes = [
-            "album_title",
-            "album_type",
-            "artists",
-            "genre",
-            "isrc",
-            "lyrics",
-            "release_date",
-            "tempo",
-            "title",
-            "type",
-            "upc",
-        ]
-
         for attr in attributes:
             if getattr(result, attr) and (
-                not getattr(self.music_info, attr) or service_name == "spotify"
+                not getattr(self.music_info, attr)
+                or (attr in ["genre", "album_type"] and service_name == "itunes")
             ):
-                setattr(self.music_info, attr, getattr(result, attr))
+                setattr(
+                    self.music_info,
+                    attr,
+                    getattr(result, attributes.pop(attributes.index(attr))),
+                )
 
         if result.album_art:
             current_priority = self.album_art_priority.index(service_name)

{yutipy-1.4.0 → yutipy-1.4.2}/yutipy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 1.4.0
+Version: 1.4.2
 Summary: A simple package for retrieving music information from various music platforms APIs.
 Author: Cheap Nightbot
 Author-email: Cheap Nightbot <hi@cheapnightbot.slmail.me>
@@ -33,7 +33,7 @@ Project-URL: Repository, https://github.com/CheapNightbot/yutipy.git
 Project-URL: Issues, https://github.com/CheapNightbot/yutipy/issues
 Project-URL: Changelog, https://github.com/CheapNightbot/yutipy/blob/master/CHANGELOG.md
 Project-URL: funding, https://ko-fi.com/cheapnightbot
-Keywords: music,API,Deezer,iTunes,Spotify,YouTube Music,search,retrieve,information,yutify
+Keywords: music,API,Deezer,iTunes,Spotify,YouTube Music,search,retrieve,information,yutify,KKBox
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries

{yutipy-1.4.0 → yutipy-1.4.2}/yutipy.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ pyproject.toml
 requirements-dev.txt
 requirements.txt
 .github/FUNDING.yml
-.github/release-drafter.yml
 .github/ISSUE_TEMPLATE/bug_report.md
 .github/ISSUE_TEMPLATE/feature_request.md
 .github/workflows/pytest-unit-testing.yml

yutipy-1.4.0/.github/release-drafter.yml

@@ -1,16 +0,0 @@
-name-template: 'v$NEXT_PATCH_VERSION'
-tag-template: 'v$NEXT_PATCH_VERSION'
-categories:
-  - title: '🚀 New Features'
-    label: 'feature'
-  - title: '🐛 Bug Fixes'
-    label: 'bug'
-  - title: '🧰 Maintenance'
-    label: 'maintenance'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
-template: |
-  ## What's Changed
-
-  $CHANGES
-
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$NEW_TAG

yutipy-1.4.0/yutipy/utils/__init__.py

@@ -1,7 +0,0 @@
-from .cheap_utils import are_strings_similar, is_valid_string, separate_artists
-
-__all__ = [
-    "are_strings_similar",
-    "is_valid_string",
-    "separate_artists",
-]