From: Marvin Schenkel <marvinschenkel@gmail.com>
Date: Sun, 14 Jul 2024 17:36:07 +0000 (+0200)
Subject: YTMusic: Rewrite YTM auth to ytdlp access token plugin (#1497)
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=15c4a1a4b387ea1a83caedcaa0ca36d6435e5767;p=music-assistant-server.git

YTMusic: Rewrite YTM auth to ytdlp access token plugin (#1497)

* Rewrite YTM auth to ytdlp access token plugin.

* Rewrite YTM auth to ytdlp access token plugin.
---

diff --git a/music_assistant/server/providers/ytmusic/__init__.py b/music_assistant/server/providers/ytmusic/__init__.py
index b5da3c5e..cb317fd9 100644
--- a/music_assistant/server/providers/ytmusic/__init__.py
+++ b/music_assistant/server/providers/ytmusic/__init__.py
@@ -205,8 +205,6 @@ class YoutubeMusicProvider(MusicProvider):
                 break
         else:
             self.language = "en"
-        # Make sure to write the ytdlp cache on startup
-        await self._update_ytdlp_oauth_token_cache()
         if not await self._user_has_ytm_premium():
             raise LoginFailed("User does not have Youtube Music Premium")
 
@@ -573,7 +571,6 @@ class YoutubeMusicProvider(MusicProvider):
             self.config.update({CONF_EXPIRY_TIME: time() + token["expires_in"]})
             self.config.update({CONF_TOKEN_TYPE: token["token_type"]})
             self._initialize_headers()
-            await self._update_ytdlp_oauth_token_cache()
 
     def _initialize_headers(self) -> dict[str, str]:
         """Return headers to include in the requests."""
@@ -778,12 +775,14 @@ class YoutubeMusicProvider(MusicProvider):
 
         def _extract_best_stream_url_format() -> dict[str, Any]:
             url = f"{YTM_DOMAIN}/watch?v={item_id}"
+            auth = (
+                f"{self.config.get_value(CONF_TOKEN_TYPE)} {self.config.get_value(CONF_AUTH_TOKEN)}"
+            )
             ydl_opts = {
                 "quiet": self.logger.level > logging.DEBUG,
-                # This enables the oauth2 plugin so we can grab the best
+                # This enables the access token plugin so we can grab the best
                 # available quality audio stream
-                "username": "oauth2",
-                "password": "",
+                "username": auth,
                 # This enforces a player client and skips unnecessary scraping to increase speed
                 "extractor_args": {
                     "youtube": {"skip": ["translated_subs", "dash"], "player_client": ["ios"]}
@@ -800,27 +799,6 @@ class YoutubeMusicProvider(MusicProvider):
 
         return await asyncio.to_thread(_extract_best_stream_url_format)
 
-    async def _update_ytdlp_oauth_token_cache(self) -> None:
-        """Update the ytdlp token so we can grab the best available quality audio stream."""
-
-        def _update_oauth_cache() -> None:
-            ydl_opts = {
-                "quiet": self.logger.level > logging.DEBUG,
-                "username": "oauth2",
-                "password": "",
-            }
-            with yt_dlp.YoutubeDL(ydl_opts) as ydl:
-                token_data = {
-                    "access_token": self.config.get_value(CONF_AUTH_TOKEN),
-                    "expires": self.config.get_value(CONF_EXPIRY_TIME),
-                    "token_type": self.config.get_value(CONF_TOKEN_TYPE),
-                    "refresh_token": self.config.get_value(CONF_REFRESH_TOKEN),
-                }
-                ydl.cache.store(YT_DLP_CACHE_SECTION, YT_DLP_CACHE_KEY, token_data)
-                self.logger.debug("Updated ytdlp oauth token cache with new OAuth token.")
-
-        await asyncio.to_thread(_update_oauth_cache)
-
     def _get_item_mapping(self, media_type: MediaType, key: str, name: str) -> ItemMapping:
         return ItemMapping(
             media_type=media_type,
diff --git a/music_assistant/server/providers/ytmusic/manifest.json b/music_assistant/server/providers/ytmusic/manifest.json
index 381e0d5b..0dcc9554 100644
--- a/music_assistant/server/providers/ytmusic/manifest.json
+++ b/music_assistant/server/providers/ytmusic/manifest.json
@@ -4,7 +4,7 @@
   "name": "YouTube Music",
   "description": "Support for the YouTube Music streaming provider in Music Assistant.",
   "codeowners": ["@MarvinSchenkel"],
-  "requirements": ["ytmusicapi==1.7.3", "git+https://github.com/coletdjnz/yt-dlp-youtube-oauth2.git", "yt-dlp==2024.7.7"],
+  "requirements": ["ytmusicapi==1.7.3", "git+https://github.com/MarvinSchenkel/yt-dlp-youtube-accesstoken.git", "yt-dlp==2024.7.7"],
   "documentation": "https://music-assistant.io/music-providers/youtube-music/",
   "multi_instance": true
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index b3bb949c..076bc4d7 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -18,7 +18,7 @@ deezer-python-async==0.3.0
 defusedxml==0.7.1
 eyeD3==0.9.7
 faust-cchardet>=2.1.18
-git+https://github.com/coletdjnz/yt-dlp-youtube-oauth2.git
+git+https://github.com/MarvinSchenkel/yt-dlp-youtube-accesstoken.git
 hass-client==1.2.0
 ifaddr==0.2.0
 mashumaro==3.13.1