ynison это что то с чем то :) #8 #6 #9 #4

Два дня экспериментов с сокетами, и потоками, а вся вина в одной строке.

Author: FozerG

getToken.py

@@ -3,47 +3,56 @@
 from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QIcon
 import sys
+import re
+
+URL_WITH_ACCESS_TOKEN_REGEX = r'https:\/\/music\.yandex\.(?:ru|com|by|kz|ua)\/#access_token=([^&]*)'
 
 
 class CustomWebEnginePage(QWebEnginePage):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.profile().setHttpUserAgent(
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.82 Safari/537.36"
+        )
+        
     def javaScriptConsoleMessage(self, level, message, lineNumber, sourceId):
         pass
 
 
 class TokenWindow(QMainWindow):
     def __init__(self, url, icon_path):
         super().__init__()
-        self.setWindowTitle("Авторизация")
+        self.setWindowTitle("Authorization")
         self.setGeometry(100, 100, 700, 800)
         self.setWindowIcon(QIcon(icon_path))
-
+        
         self.browser = QWebEngineView()
         self.browser.setPage(CustomWebEnginePage(self.browser))
         self.browser.page().profile().cookieStore().deleteAllCookies()
         self.browser.urlChanged.connect(self.on_url_changed)
 
         self.browser.setUrl(QUrl(url))
-
+        
         central_widget = QWidget()
         layout = QVBoxLayout()
         layout.addWidget(self.browser)
         central_widget.setLayout(layout)
         self.setCentralWidget(central_widget)
-
+        
         self.token = None
 
     def on_url_changed(self, url):
         url_str = url.toString()
-        if "#access_token" in url_str:
-            self.token = url_str.split("=")[1].split("&")[0]
+        match = re.search(URL_WITH_ACCESS_TOKEN_REGEX, url_str)
+        if match:
+            self.token = match.group(1) 
             self.close()
 
 
 def update_token(icon_path):
     app = QApplication(sys.argv)
-    # Official link to OAuth Yandex.Music
-    oauth_url = "https://oauth.yandex.ru/authorize?response_type=token&client_id=23cabbbdc6cd418abb4b39c32c41195d"
+    oauth_url = "https://oauth.yandex.ru/authorize?response_type=token&client_id=23cabbbdc6cd418abb4b39c32c41195d"  # Official link to OAuth Yandex.Music
     token_window = TokenWindow(oauth_url, icon_path)
     token_window.show()
     app.exec_()
-    return token_window.token
+    return token_window.token

main.py

@@ -40,7 +40,7 @@
 CLIENT_ID_RU_DECLINED = "1269826362399522849"  # Яндекс Музыку (склонение для активности "Слушает")
 
 # Версия (tag) скрипта для проверки на актуальность через Github Releases
-CURRENT_VERSION = "v0.2.3"
+CURRENT_VERSION = "v0.3"
 
 # Ссылка на репозиторий
 REPO_URL = "https://github.com/FozerG/YandexMusicRPC"
@@ -56,7 +56,8 @@
 
 # --------- Переменные ниже являются временными и не требуют изменения.
 # Переменная для хранения предыдущего трека и избежания дублирования обновлений.
-name_prev = str()
+playable_id_prev = None
+info_cache = dict()
 
 # Переменная для хранения полного пути к иконке
 icoPath = str()
@@ -106,15 +107,15 @@ def extract_device_name(data):
         return f"error: {e}"
 
 
-async def get_info():
+def get_info():
     global ya_token
 
     class Info:
         def __init__(self, token):
             self.token = token
 
         @staticmethod
-        async def get_track_by_id(track_id):
+        def get_track_by_id(track_id):
             try:
                 track = Presence.client.tracks([track_id])
                 if not track or not track[0]:
@@ -208,7 +209,7 @@ async def get_current_track() -> dict:
                             "app_name": "Chrome",
                         },
                         "volume_info": {"volume": 0},
-                        "is_shadow": True,
+                        "is_shadow": False,
                     },
                     "is_currently_active": False,
                 },
@@ -237,7 +238,6 @@ async def get_current_track() -> dict:
                 track = ynison["player_state"]["player_queue"]["playable_list"][track_index]
 
             await session.close()
-            track = await (await get_info()).get_track_by_id(track["playable_id"])
             return {
                 "device_name": extract_device_name(ynison),
                 "paused": ynison["player_state"]["status"]["paused"],
@@ -246,7 +246,7 @@ async def get_current_track() -> dict:
                 "entity_id": ynison["player_state"]["player_queue"]["entity_id"],
                 "repeat_mode": ynison["player_state"]["player_queue"]["options"]["repeat_mode"],
                 "entity_type": ynison["player_state"]["player_queue"]["entity_type"],
-                "track": track,
+                "playable_id": track["playable_id"],
                 "success": True,
             }
 
@@ -326,8 +326,8 @@ def need_restart() -> None:
     @staticmethod
     def restart() -> None:
         Presence.currentTrack = None
-        global name_prev
-        name_prev = None
+        global playable_id_prev
+        playable_id_prev = None
         if Presence.rpc:
             Presence.rpc.close()
             Presence.rpc = None
@@ -338,16 +338,16 @@ def restart() -> None:
     def discord_was_closed() -> None:
         log("Discord was closed. Waiting for restart...", LogType.Error)
         Presence.currentTrack = None
-        global name_prev
-        name_prev = None
+        global playable_id_prev
+        playable_id_prev = None
         Presence.discord_available()
 
     @staticmethod
     def FullClearRPC() -> None:
         log("Clear RPC due to error", LogType.Error)
         Presence.currentTrack = None
-        global name_prev
-        name_prev = None
+        global playable_id_prev
+        playable_id_prev = None
         Presence.rpc.clear()
 
     # Метод для запуска Rich Presence.
@@ -480,15 +480,30 @@ def update_presence(ongoing_track, current_time=0, paused=False):
     # Метод для получения информации о текущем треке.
     @staticmethod
     def getTrack() -> dict:
+        global playable_id_prev
+        global info_cache
         try:
             current_state = asyncio.run(get_current_track())
-            if not current_state["success"] or not current_state["track"]["success"]:
-                log("Not successfully get all the information about the track.", LogType.Error)
+            if not (current_state and isinstance(current_state, dict) and current_state.get('success') is True):
+                log("Failed to receive data from ynison.", LogType.Error)
                 return {"success": False}
-            track_info = current_state["track"]
+            
+            current_playable_id = current_state["playable_id"]
+            isNewTrack = playable_id_prev != current_playable_id
+
+            if isNewTrack:
+                track_info = get_info().get_track_by_id(current_state["playable_id"])
+            else:
+                track_info = info_cache
+                
+            if not (track_info and isinstance(track_info, dict) and track_info.get('success') is True):
+                log("Failed to get track information.", LogType.Error)
+                return {"success": False}
+            
+            playable_id_prev = current_playable_id
+            info_cache = track_info
             name_current = ", ".join(track_info["artists"]) + " - " + track_info["title"]
-            global name_prev
-            if str(name_current) != name_prev:
+            if isNewTrack:
                 log(f'Now listening to "{name_current}" on device "{current_state["device_name"]}"')
             # Если песня уже играет, просто вернем её с актуальным статусом паузы и позиции.
             elif Presence.currentTrack["success"]:
@@ -499,7 +514,6 @@ def getTrack() -> dict:
                 )
                 return currentTrack_copy
 
-            name_prev = str(name_current)
             trackId = track_info["track_id"].split(":")
             if track_info:
                 duration_ms = int(current_state["duration_ms"])