yutipy 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

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/spotify.py

@@ -16,8 +16,8 @@ from yutipy.exceptions import (
 )
 from yutipy.models import MusicInfo
 from yutipy.utils.cheap_utils import (
-    guess_album_type,
     are_strings_similar,
+    guess_album_type,
     is_valid_string,
     separate_artists,
 )
@@ -459,7 +459,7 @@ class Spotify:
             return MusicInfo(
                 album_art=album["images"][0]["url"],
                 album_title=album["name"],
-                album_type=album.get("alnum_type") if guessed_right else guess,
+                album_type=album.get("album_type") if guessed_right else guess,
                 artists=", ".join(artists_name),
                 genre=None,
                 id=album["id"],

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
 

{yutipy-1.4.1.dist-info → yutipy-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 1.4.1
+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>

{yutipy-1.4.1.dist-info → yutipy-1.4.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 yutipy/__init__.py,sha256=ucXbhRgNpLo-G0TeDGCaKyCK9Ftc13hUqB8POWdUY1c,327
 yutipy/deezer.py,sha256=cTQpnOgS81mUw_EJ0b2Z1r9CG9ircHCxl9vL-oAJ9Lg,9622
 yutipy/exceptions.py,sha256=4L0Oe1PwFP34LoFTy-Fruipk7uB-JkaackRmkjlaZJU,1138
-yutipy/itunes.py,sha256=9VOcIfjezj8WAVpsne9bbBPoIUbn0GO0UWrCrXzbrE4,6758
+yutipy/itunes.py,sha256=SZOCShlIyutIWQ2KI9WLqxc4gN4Cu2gilqxYwuXugUU,7059
 yutipy/kkbox.py,sha256=V-A7nFa1oNrTBOEu7DFzMHAHFZ5cPz55GInEuYfTSfg,13466
 yutipy/models.py,sha256=si_qgaApAYDfSyE8cl_Yg4IfWOtxk1I5JCT8bZsmV4U,1931
 yutipy/musicyt.py,sha256=igqz99bJYGtUGyZAmEJoQbdGIF-1YFmeaV5HmlhwqkA,8441
-yutipy/spotify.py,sha256=462mHo2GCurRNb0RKxu2ZlbmX9ZggPg_ZHN7fb0p9t4,15620
+yutipy/spotify.py,sha256=P-MCOny1ZXK75_jdQKRI_jgUrK7B9xbBFOvRu6NOjxk,15620
 yutipy/yutipy_music.py,sha256=I4581MvcTTclSwVtAfMEsOujxmhZzqKyG7eX8zuEsEY,6424
 yutipy/utils/__init__.py,sha256=o6lk01FHwhFmNHV0HjGG0qe2azTaQT_eviiLgNV5fHw,232
-yutipy/utils/cheap_utils.py,sha256=MChJ29x-yj_LrdJfWu7qQT3-gSHDdPyPEGo5ITfbJSI,4824
+yutipy/utils/cheap_utils.py,sha256=ttNu566ybTQ3BzQ2trBgpvpNthB6Da-KnkBbFiK3pw4,5282
 yutipy/utils/logger.py,sha256=2_b2FlDwUVpdPdqiwweR8Xr2tZOq0qGUGcekC5lXq2M,130
-yutipy-1.4.1.dist-info/licenses/LICENSE,sha256=_89JsS2QnBG8tAb5-VWbJDj_uJ002zPJAYBJJdh3DPY,1071
-yutipy-1.4.1.dist-info/METADATA,sha256=-DlkGS8lGIpG7lSewxaOR6hxikj3VdfT1avz23o2YKM,6495
-yutipy-1.4.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-yutipy-1.4.1.dist-info/top_level.txt,sha256=t2A5V2_mUcfnHkbCy6tAQlb3909jDYU5GQgXtA4756I,7
-yutipy-1.4.1.dist-info/RECORD,,
+yutipy-1.4.2.dist-info/licenses/LICENSE,sha256=_89JsS2QnBG8tAb5-VWbJDj_uJ002zPJAYBJJdh3DPY,1071
+yutipy-1.4.2.dist-info/METADATA,sha256=nxBwtRJFWpM7gsgH9-RZIP239hna-PirfWJ2WIBxXB4,6495
+yutipy-1.4.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+yutipy-1.4.2.dist-info/top_level.txt,sha256=t2A5V2_mUcfnHkbCy6tAQlb3909jDYU5GQgXtA4756I,7
+yutipy-1.4.2.dist-info/RECORD,,