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

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

@@ -21,6 +21,8 @@ class Deezer:
         self._session = requests.Session()
         self.api_url = "https://api.deezer.com"
         self._is_session_closed = False
+        self.normalize_non_english = True
+        self._translation_session = requests.Session()
 
     def __enter__(self) -> "Deezer":
         """Enters the runtime context related to this object."""
@@ -34,6 +36,7 @@ class Deezer:
         """Closes the current session."""
         if not self.is_session_closed:
             self._session.close()
+            self._translation_session.close()
             self._is_session_closed = True
 
     @property
@@ -41,7 +44,13 @@ class Deezer:
         """Checks if the session is closed."""
         return self._is_session_closed
 
-    def search(self, artist: str, song: str, limit: int = 10) -> Optional[MusicInfo]:
+    def search(
+        self,
+        artist: str,
+        song: str,
+        limit: int = 10,
+        normalize_non_english: bool = True,
+    ) -> Optional[MusicInfo]:
         """
         Searches for a song by artist and title.
 
@@ -52,8 +61,10 @@ class Deezer:
         song : str
             The title of the song.
         limit: int, optional
-            The number of items to retrieve from API.
-            ``limit >=1 and <= 50``. Default is ``10``.
+            The number of items to retrieve from API. ``limit >=1 and <= 50``. Default is ``10``.
+        normalize_non_english : bool, optional
+            Whether to normalize non-English characters for comparison. Default is ``True``.
+
 
         Returns
         -------
@@ -65,6 +76,8 @@ class Deezer:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
+        self.normalize_non_english = normalize_non_english
+
         search_types = ["track", "album"]
 
         for search_type in search_types:
@@ -208,8 +221,18 @@ class Deezer:
         """
         for result in results:
             if not (
-                are_strings_similar(result["title"], song)
-                and are_strings_similar(result["artist"]["name"], artist)
+                are_strings_similar(
+                    result["title"],
+                    song,
+                    use_translation=self.normalize_non_english,
+                    translation_session=self._translation_session,
+                )
+                and are_strings_similar(
+                    result["artist"]["name"],
+                    artist,
+                    use_translation=self.normalize_non_english,
+                    translation_session=self._translation_session,
+                )
             ):
                 continue
 

yutipy/itunes.py

@@ -22,6 +22,8 @@ class Itunes:
         self._session = requests.Session()
         self.api_url = "https://itunes.apple.com"
         self._is_session_closed = False
+        self.normalize_non_english = True
+        self._translation_session = requests.Session()
 
     def __enter__(self) -> "Itunes":
         """Enters the runtime context related to this object."""
@@ -35,6 +37,7 @@ class Itunes:
         """Closes the current session."""
         if not self.is_session_closed:
             self._session.close()
+            self._translation_session.close()
             self._is_session_closed = True
 
     @property
@@ -42,7 +45,13 @@ class Itunes:
         """Checks if the session is closed."""
         return self._is_session_closed
 
-    def search(self, artist: str, song: str, limit: int = 10) -> Optional[MusicInfo]:
+    def search(
+        self,
+        artist: str,
+        song: str,
+        limit: int = 10,
+        normalize_non_english: bool = True,
+    ) -> Optional[MusicInfo]:
         """
         Searches for a song by artist and title.
 
@@ -53,8 +62,9 @@ class Itunes:
         song : str
             The title of the song.
         limit: int, optional
-        The number of items to retrieve from API.
-        ``limit >=1 and <= 50``. Default is ``10``.
+            The number of items to retrieve from API. ``limit >=1 and <= 50``. Default is ``10``.
+        normalize_non_english : bool, optional
+            Whether to normalize non-English characters for comparison. Default is ``True``.
 
         Returns
         -------
@@ -66,6 +76,8 @@ class Itunes:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
+        self.normalize_non_english = normalize_non_english
+
         entities = ["song", "album"]
         for entity in entities:
             endpoint = f"{self.api_url}/search"
@@ -114,9 +126,17 @@ class Itunes:
         for result in results:
             if not (
                 are_strings_similar(
-                    result.get("trackName", result["collectionName"]), song
+                    result.get("trackName", result["collectionName"]),
+                    song,
+                    use_translation=self.normalize_non_english,
+                    translation_session=self._translation_session,
+                )
+                and are_strings_similar(
+                    result["artistName"],
+                    artist,
+                    use_translation=self.normalize_non_english,
+                    translation_session=self._translation_session,
                 )
-                and are_strings_similar(result["artistName"], artist)
             ):
                 continue
 

yutipy/kkbox.py

@@ -57,6 +57,8 @@ class KKBox:
         self.__start_time = time.time()
         self._is_session_closed = False
         self.valid_territories = ["HK", "JP", "MY", "SG", "TW"]
+        self.normalize_non_english = True
+        self._translation_session = requests.Session()
 
     def __enter__(self):
         """Enters the runtime context related to this object."""
@@ -70,6 +72,7 @@ class KKBox:
         """Closes the current session."""
         if not self.is_session_closed:
             self._session.close()
+            self._translation_session.close()
             self._is_session_closed = True
 
     @property
@@ -134,7 +137,12 @@ class KKBox:
             self.__start_time = time.time()
 
     def search(
-        self, artist: str, song: str, territory: str = "TW", limit: int = 10,
+        self,
+        artist: str,
+        song: str,
+        territory: str = "TW",
+        limit: int = 10,
+        normalize_non_english: bool = True,
     ) -> Optional[MusicInfo]:
         """
         Searches for a song by artist and title.
@@ -149,8 +157,9 @@ class KKBox:
             Two-letter country codes from ISO 3166-1 alpha-2.
             Allowed values: ``HK``, ``JP``, ``MY``, ``SG``, ``TW``.
         limit: int, optional
-            The number of items to retrieve from API.
-            ``limit >=1 and <= 50``. Default is ``10``.
+            The number of items to retrieve from API. ``limit >=1 and <= 50``. Default is ``10``.
+        normalize_non_english : bool, optional
+            Whether to normalize non-English characters for comparison. Default is ``True``.
 
         Returns
         -------
@@ -162,9 +171,13 @@ class KKBox:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
+        self.normalize_non_english = normalize_non_english
+
         self.__refresh_token_if_expired()
 
-        query = f"?q={artist} - {song}&type=track,album&territory={territory}&limit={limit}"
+        query = (
+            f"?q={artist} - {song}&type=track,album&territory={territory}&limit={limit}"
+        )
         query_url = f"{self.api_url}/search{query}"
 
         try:
@@ -288,12 +301,24 @@ class KKBox:
         Optional[MusicInfo]
             The music information if found, otherwise None.
         """
-        if not are_strings_similar(track["name"], song):
+        if not are_strings_similar(
+            track["name"],
+            song,
+            use_translation=self.normalize_non_english,
+            translation_session=self._translation_session,
+        ):
             return None
 
         artists_name = track["album"]["artist"]["name"]
         matching_artists = (
-            artists_name if are_strings_similar(artists_name, artist) else None
+            artists_name
+            if are_strings_similar(
+                artists_name,
+                artist,
+                use_translation=self.normalize_non_english,
+                translation_session=self._translation_session,
+            )
+            else None
         )
 
         if matching_artists:
@@ -336,12 +361,24 @@ class KKBox:
         Optional[MusicInfo]
             The music information if found, otherwise None.
         """
-        if not are_strings_similar(album["name"], song):
+        if not are_strings_similar(
+            album["name"],
+            song,
+            use_translation=self.normalize_non_english,
+            translation_session=self._translation_session,
+        ):
             return None
 
         artists_name = album["artist"]["name"]
         matching_artists = (
-            artists_name if are_strings_similar(artists_name, artist) else None
+            artists_name
+            if are_strings_similar(
+                artists_name,
+                artist,
+                use_translation=self.normalize_non_english,
+                translation_session=self._translation_session,
+            )
+            else None
         )
 
         if matching_artists:

yutipy/musicyt.py

@@ -2,6 +2,7 @@ import os
 from pprint import pprint
 from typing import Optional
 
+import requests
 from ytmusicapi import YTMusic, exceptions
 
 from yutipy.exceptions import (
@@ -19,8 +20,28 @@ class MusicYT:
     def __init__(self) -> None:
         """Initializes the YouTube Music class and sets up the session."""
         self.ytmusic = YTMusic()
-
-    def search(self, artist: str, song: str, limit: int = 10) -> Optional[MusicInfo]:
+        self._is_session_closed = False
+        self.normalize_non_english = True
+        self._translation_session = requests.Session()
+
+    def close_session(self) -> None:
+        """Closes the current session(s)."""
+        if not self.is_session_closed:
+            self._translation_session.close()
+            self._is_session_closed = True
+
+    @property
+    def is_session_closed(self) -> bool:
+        """Checks if the session is closed."""
+        return self._is_session_closed
+
+    def search(
+        self,
+        artist: str,
+        song: str,
+        limit: int = 10,
+        normalize_non_english: bool = True,
+    ) -> Optional[MusicInfo]:
         """
         Searches for a song by artist and title.
 
@@ -31,8 +52,9 @@ class MusicYT:
         song : str
             The title of the song.
         limit: int, optional
-            The number of items to retrieve from API.
-            ``limit >=1 and <= 50``. Default is ``10``.
+            The number of items to retrieve from API. ``limit >=1 and <= 50``. Default is ``10``.
+        normalize_non_english : bool, optional
+            Whether to normalize non-English characters for comparison. Default is ``True``.
 
         Returns
         -------
@@ -44,6 +66,8 @@ class MusicYT:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
+        self.normalize_non_english = normalize_non_english
+
         query = f"{artist} - {song}"
 
         try:
@@ -79,8 +103,18 @@ class MusicYT:
             return False
 
         return any(
-            are_strings_similar(result.get("title"), song)
-            and are_strings_similar(_artist.get("name"), artist)
+            are_strings_similar(
+                result.get("title"),
+                song,
+                use_translation=self.normalize_non_english,
+                translation_session=self._translation_session,
+            )
+            and are_strings_similar(
+                _artist.get("name"),
+                artist,
+                use_translation=self.normalize_non_english,
+                translation_session=self._translation_session,
+            )
             for _artist in result.get("artists", [])
         )
 

yutipy/spotify.py

@@ -16,6 +16,7 @@ from yutipy.exceptions import (
 )
 from yutipy.models import MusicInfo
 from yutipy.utils.cheap_utils import (
+    guess_album_type,
     are_strings_similar,
     is_valid_string,
     separate_artists,
@@ -62,6 +63,8 @@ class Spotify:
         self.__header, self.__expires_in = self.__authenticate()
         self.__start_time = time.time()
         self._is_session_closed = False
+        self.normalize_non_english = True
+        self._translation_session = requests.Session()
 
     def __enter__(self):
         """Enters the runtime context related to this object."""
@@ -72,9 +75,10 @@ class Spotify:
         self.close_session()
 
     def close_session(self) -> None:
-        """Closes the current session."""
+        """Closes the current session(s)."""
         if not self.is_session_closed:
             self._session.close()
+            self._translation_session.close()
             self._is_session_closed = True
 
     @property
@@ -138,7 +142,13 @@ class Spotify:
             self.__header, self.__expires_in = self.__authenticate()
             self.__start_time = time.time()
 
-    def search(self, artist: str, song: str, limit: int = 10) -> Optional[MusicInfo]:
+    def search(
+        self,
+        artist: str,
+        song: str,
+        limit: int = 10,
+        normalize_non_english: bool = True,
+    ) -> Optional[MusicInfo]:
         """
         Searches for a song by artist and title.
 
@@ -149,8 +159,9 @@ class Spotify:
         song : str
             The title of the song.
         limit: int, optional
-            The number of items to retrieve from API.
-            ``limit >=1 and <= 50``. Default is ``10``.
+            The number of items to retrieve from API. ``limit >=1 and <= 50``. Default is ``10``.
+        normalize_non_english : bool, optional
+            Whether to normalize non-English characters for comparison. Default is ``True``.
 
         Returns
         -------
@@ -162,7 +173,10 @@ class Spotify:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
+        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}",
@@ -187,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
             )
@@ -195,7 +209,13 @@ class Spotify:
         return music_info
 
     def search_advanced(
-        self, artist: str, song: str, isrc: str = None, upc: str = None
+        self,
+        artist: str,
+        song: str,
+        isrc: str = None,
+        upc: str = None,
+        limit: int = 1,
+        normalize_non_english: bool = True,
     ) -> Optional[MusicInfo]:
         """
         Searches for a song by artist, title, ISRC, or UPC.
@@ -210,6 +230,10 @@ class Spotify:
             The ISRC of the track.
         upc : str, optional
             The UPC of the album.
+        limit: int, optional
+            The number of items to retrieve from API. ``limit >=1 and <= 50``. Default is ``1``.
+        normalize_non_english : bool, optional
+            Whether to normalize non-English characters for comparison. Default is ``True``.
 
         Returns
         -------
@@ -221,12 +245,14 @@ class Spotify:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
+        self.normalize_non_english = normalize_non_english
+
         self.__refresh_token_if_expired()
 
         if isrc:
-            query = f"?q={artist} {song} isrc:{isrc}&type=track&limit=1"
+            query = f"?q={artist} {song} isrc:{isrc}&type=track&limit={limit}"
         elif upc:
-            query = f"?q={artist} {song} upc:{upc}&type=album&limit=1"
+            query = f"?q={artist} {song} upc:{upc}&type=album&limit={limit}"
         else:
             raise InvalidValueException("ISRC or UPC must be provided.")
 
@@ -340,14 +366,25 @@ class Spotify:
         Optional[MusicInfo]
             The music information if found, otherwise None.
         """
-        if not are_strings_similar(track["name"], song):
+        if not are_strings_similar(
+            track["name"],
+            song,
+            use_translation=self.normalize_non_english,
+            translation_session=self._translation_session,
+        ):
             return None
 
         artists_name = [x["name"] for x in track["artists"]]
         matching_artists = [
             x["name"]
             for x in track["artists"]
-            if are_strings_similar(x["name"], artist) or x["id"] in artist_ids
+            if are_strings_similar(
+                x["name"],
+                artist,
+                use_translation=self.normalize_non_english,
+                translation_session=self._translation_session,
+            )
+            or x["id"] in artist_ids
         ]
 
         if matching_artists:
@@ -392,21 +429,37 @@ class Spotify:
         Optional[MusicInfo]
             The music information if found, otherwise None.
         """
-        if not are_strings_similar(album["name"], song):
+        if not are_strings_similar(
+            album["name"],
+            song,
+            use_translation=self.normalize_non_english,
+            translation_session=self._translation_session,
+        ):
             return None
 
         artists_name = [x["name"] for x in album["artists"]]
         matching_artists = [
             x["name"]
             for x in album["artists"]
-            if are_strings_similar(x["name"], artist) or x["id"] in artist_ids
+            if are_strings_similar(
+                x["name"],
+                artist,
+                use_translation=self.normalize_non_english,
+                translation_session=self._translation_session,
+            )
+            or x["id"] in artist_ids
         ]
 
         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("alnum_type") if guessed_right else guess,
                 artists=", ".join(artists_name),
                 genre=None,
                 id=album["id"],
@@ -415,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/utils/__init__.py

@@ -1,6 +1,12 @@
-from .cheap_utils import are_strings_similar, is_valid_string, separate_artists
+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/utils/cheap_utils.py

@@ -7,6 +7,7 @@ def translate_text(
     text: str,
     sl: str = None,
     dl: str = "en",
+    session: requests.Session = None,
 ) -> dict:
     """
     Translate text from one language to another.
@@ -15,7 +16,8 @@ def translate_text(
         text (str): The text to be translated.
         sl (str, optional): The source language code (e.g., 'en' for English, 'es' for Spanish). If not provided, the API will attempt to detect the source language.
         dl (str, optional): The destination language code (default is 'en' for English).
-
+        session (requests.Session, optional): A `requests.Session` object to use for making the API request. If not provided, a new session will be created and closed within the function.
+            Providing your own session can improve performance by reusing the same session for multiple requests. Don't forget to close the session afterwards.
 
      Returns:
         dict: A dictionary containing the following keys:
@@ -24,12 +26,17 @@ def translate_text(
             - 'destination-text': The translated text.
             - 'destination-language': The destination language code.
     """
+    default_session = False
+    if session is None:
+        default_session = True
+        session = requests.Session()
+
     if sl:
         url = f"https://ftapi.pythonanywhere.com/translate?sl={sl}&dl={dl}&text={text}"
     else:
         url = f"https://ftapi.pythonanywhere.com/translate?dl={dl}&text={text}"
 
-    response = requests.get(url)
+    response = session.get(url)
     response_json = response.json()
     result = {
         "source-text": response_json["source-text"],
@@ -37,10 +44,20 @@ def translate_text(
         "destination-text": response_json["destination-text"],
         "destination-language": response_json["destination-language"],
     }
+
+    if default_session:
+        session.close()
+
     return result
 
 
-def are_strings_similar(str1: str, str2: str, threshold: int = 80) -> bool:
+def are_strings_similar(
+    str1: str,
+    str2: str,
+    threshold: int = 80,
+    use_translation: bool = True,
+    translation_session: requests.Session = None,
+) -> bool:
     """
     Determine if two strings are similar based on a given threshold.
 
@@ -48,12 +65,24 @@ def are_strings_similar(str1: str, str2: str, threshold: int = 80) -> bool:
         str1 (str): First string to compare.
         str2 (str): Second string to compare.
         threshold (int, optional): Similarity threshold. Defaults to 80.
+        use_translation (bool, optional): Use translations to compare strings. Defaults to ``True``
+        translation_session (requests.Session, optional): A `requests.Session` object to use for making the API request. If not provided, a new session will be created and closed within the function.
+            Providing your own session can improve performance by reusing the same session for multiple requests. Don't forget to close the session afterwards.
 
     Returns:
         bool: True if the strings are similar, otherwise False.
     """
-    str1 = translate_text(str1)["destination-text"]
-    str2 = translate_text(str2)["destination-text"]
+    if use_translation:
+        str1 = (
+            translate_text(str1, session=translation_session)["destination-text"]
+            if translation_session
+            else translate_text(str1)["destination-text"]
+        )
+        str2 = (
+            translate_text(str2, session=translation_session)["destination-text"]
+            if translation_session
+            else translate_text(str2)["destination-text"]
+        )
 
     similarity_score = fuzz.WRatio(str1, str2, processor=default_process)
     return similarity_score > threshold
@@ -88,5 +117,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/utils/logger.py

@@ -0,0 +1,4 @@
+import logging
+
+logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
+logger = logging.getLogger(__name__)

yutipy/yutipy_music.py

@@ -2,14 +2,17 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 from pprint import pprint
 from typing import Optional
 
+import requests
+
 from yutipy.deezer import Deezer
-from yutipy.exceptions import InvalidValueException
+from yutipy.exceptions import InvalidValueException, KKBoxException, SpotifyException
 from yutipy.itunes import Itunes
 from yutipy.kkbox import KKBox
 from yutipy.models import MusicInfo, MusicInfos
 from yutipy.musicyt import MusicYT
 from yutipy.spotify import Spotify
 from yutipy.utils.cheap_utils import is_valid_string
+from yutipy.utils.logger import logger
 
 
 class YutipyMusic:
@@ -22,22 +25,53 @@ class YutipyMusic:
     def __init__(self) -> None:
         """Initializes the YutipyMusic class."""
         self.music_info = MusicInfos()
-        self.album_art_priority = ["deezer", "kkbox", "spotify", "ytmusic", "itunes"]
+        self.album_art_priority = ["deezer", "ytmusic", "itunes"]
         self.services = {
             "deezer": Deezer(),
             "itunes": Itunes(),
-            "kkbox": KKBox(),
             "ytmusic": MusicYT(),
-            "spotify": Spotify(),
         }
 
+        try:
+            self.services["kkbox"] = KKBox()
+        except KKBoxException as e:
+            logger.warning(
+                f"{self.__class__.__name__}: Skipping KKBox due to KKBoxException: {e}"
+            )
+        else:
+            idx = self.album_art_priority.index("ytmusic")
+            self.album_art_priority.insert(idx, "kkbox")
+
+        try:
+            self.services["spotify"] = Spotify()
+        except SpotifyException as e:
+            logger.warning(
+                f"{self.__class__.__name__}: Skipping Spotify due to SpotifyException: {e}"
+            )
+        else:
+            idx = self.album_art_priority.index("ytmusic")
+            self.album_art_priority.insert(idx, "spotify")
+        self.normalize_non_english = True
+        self._translation_session = requests.Session()
+
+        # Assign the translation session to each service
+        for service in self.services.values():
+            if hasattr(service, "_translation_session"):
+                service._translation_session = self._translation_session
+
     def __enter__(self) -> "YutipyMusic":
         return self
 
     def __exit__(self, exc_type, exc_value, exc_traceback) -> None:
         self.close_sessions()
 
-    def search(self, artist: str, song: str, limit: int = 5) -> Optional[MusicInfos]:
+    def search(
+        self,
+        artist: str,
+        song: str,
+        limit: int = 5,
+        normalize_non_english: bool = True,
+    ) -> Optional[MusicInfos]:
         """
         Searches for a song by artist and title.
 
@@ -48,8 +82,9 @@ class YutipyMusic:
         song : str
             The title of the song.
         limit: int, optional
-            The number of items to retrieve from all APIs.
-            ``limit >=1 and <= 50``. Default is ``5``.
+            The number of items to retrieve from all APIs. ``limit >=1 and <= 50``. Default is ``5``.
+        normalize_non_english : bool, optional
+            Whether to normalize non-English characters for comparison. Default is ``True``.
 
         Returns
         -------
@@ -61,10 +96,30 @@ class YutipyMusic:
                 "Artist and song names must be valid strings and can't be empty."
             )
 
+        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(
-                    service.search, artist=artist, song=song, limit=limit
+                    service.search,
+                    artist=artist,
+                    song=song,
+                    limit=limit,
+                    normalize_non_english=self.normalize_non_english,
                 ): name
                 for name, service in self.services.items()
             }
@@ -72,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.
 
@@ -93,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.3.2.dist-info → yutipy-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yutipy
-Version: 1.3.2
+Version: 1.4.1
 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.1.dist-info/RECORD

@@ -0,0 +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/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/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/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.3.2.dist-info/RECORD

@@ -1,16 +0,0 @@
-yutipy/__init__.py,sha256=UIymi9iT8s1nGuqcQcFudZYNsJDR4RzXe6LUaN9V8l0,289
-yutipy/deezer.py,sha256=JNG9iy5xtjXwEjH-mlA0b75-MN0tswh0E3ytFskA5jI,8827
-yutipy/exceptions.py,sha256=4L0Oe1PwFP34LoFTy-Fruipk7uB-JkaackRmkjlaZJU,1138
-yutipy/itunes.py,sha256=cyddyZJscz7nD0mnJEimyBenZKlyjTOaMtcWKcW347w,5994
-yutipy/kkbox.py,sha256=8rW9jzfM_RIaf0I0cOUCP_w_We25jFntQeoDl0vvbeg,12347
-yutipy/models.py,sha256=si_qgaApAYDfSyE8cl_Yg4IfWOtxk1I5JCT8bZsmV4U,1931
-yutipy/musicyt.py,sha256=drlAKIp5yNfEIlhp7eRJj42cJX2YxLvNashliDkdSNc,7324
-yutipy/spotify.py,sha256=0B0SLWY1HRkC05zPMRTkSJ9bMogSRBsN9Wq7G0QW7lY,13774
-yutipy/yutipy_music.py,sha256=jRMMbjxrlBcTI7AN0TZytLKt01ezUwzApP_byiEo_Dw,4752
-yutipy/utils/__init__.py,sha256=7UFcFZ7fBtNXOTngjnRD3MeobT3x5UT2Gag94TXVgLk,169
-yutipy/utils/cheap_utils.py,sha256=Yl0ssVbyvrdVeSPF7PqpGJpwTYLVa4CMgLtr6uk67v0,3104
-yutipy-1.3.2.dist-info/licenses/LICENSE,sha256=_89JsS2QnBG8tAb5-VWbJDj_uJ002zPJAYBJJdh3DPY,1071
-yutipy-1.3.2.dist-info/METADATA,sha256=Hzj9UM3ExumUN-k2r2VGVymMhbdCTHXMub5ITeXXTUA,6489
-yutipy-1.3.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-yutipy-1.3.2.dist-info/top_level.txt,sha256=t2A5V2_mUcfnHkbCy6tAQlb3909jDYU5GQgXtA4756I,7
-yutipy-1.3.2.dist-info/RECORD,,