fix app vars

diff --git a/.gitignore b/.gitignore
index b76966b032c1100b975971edd4eaa119c2b90cb1..521495779ff0e589653ef473f6dfc2a9ac186e7b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ music_assistant/config.json
 music_assistant/testrun.sh
 build/
 dist/
-music_assistant/secrets.py

diff --git a/music_assistant/app_vars.py b/music_assistant/app_vars.py
new file mode 100644 (file)
index 0000000..0768264
--- /dev/null
+++ b/music_assistant/app_vars.py
@@ -0,0 +1 @@
+(lambda __g: [[[[None for __g['get_app_var'], get_app_var.__name__ in [(lambda index: (lambda __l: [APP_VARS[__l['index']] for __l['index'] in [(index)]][0])({}), 'get_app_var')]][0] for __g['APP_VARS'] in [(base64.b64decode(VARS_ENC).decode('utf-8').split(','))]][0] for __g['VARS_ENC'] in [(b'OTQyODUyNTY3LDc2MTczMGQzZjk1ZTRhZjA5YWM2M2I5YTM3Y2NjOTZhLDJlYjk2ZjliMzc0OTRiZTE4MjQ5OTlkNTgwMjhhMzA1')]][0] for __g['base64'] in [(__import__('base64', __g, __g))]][0])(globals())

diff --git a/music_assistant/modules/musicproviders/qobuz.py b/music_assistant/modules/musicproviders/qobuz.py
index a473eaa3809e705c4e65978537a2b3aad0f6aa0f..e262c964a82a64df48d00fb980bd969ce18aa610 100644 (file)
--- a/music_assistant/modules/musicproviders/qobuz.py
+++ b/music_assistant/modules/musicproviders/qobuz.py
@@ -5,7 +5,7 @@ import asyncio
 import os
 from typing import List
 from utils import run_periodic, LOGGER, parse_track_title
-from secrets import QOBUZ_APP_ID, QOBUZ_APP_SECRET
+from app_vars import get_app_var
 from models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
 from constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED
 import json
@@ -514,7 +514,7 @@ class QobuzProvider(MusicProvider):
     async def __get_data(self, endpoint, params={}, sign_request=False, ignore_cache=False, cache_checksum=None):
         ''' get data from api'''
         url = "http://www.qobuz.com/api.json/0.2/%s" % endpoint
-        headers = {"X-App-Id": QOBUZ_APP_ID}
+        headers = {"X-App-Id": get_app_var(0)}
         if endpoint != 'user/login':
             headers["X-User-Auth-Token"] = await self.__auth_token()
         if sign_request:
@@ -524,11 +524,11 @@ class QobuzProvider(MusicProvider):
             for key in keys:
                 signing_data += "%s%s" %(key, params[key])
             request_ts = str(time.time())
-            request_sig = signing_data + request_ts + QOBUZ_APP_SECRET
+            request_sig = signing_data + request_ts + get_app_var(1)
             request_sig = str(hashlib.md5(request_sig.encode()).hexdigest())
             params["request_ts"] = request_ts
             params["request_sig"] = request_sig
-            params["app_id"] = QOBUZ_APP_ID
+            params["app_id"] = get_app_var(0)
             params["user_auth_token"] = await self.__auth_token()
         try:
             async with self.throttler:

diff --git a/music_assistant/modules/musicproviders/spotify.py b/music_assistant/modules/musicproviders/spotify.py
index f732d43f196d93aa64621cd83f63eeb1b7dbcacf..37ab99e14ac951d43163a943e80c18064343ce9e 100644 (file)
--- a/music_assistant/modules/musicproviders/spotify.py
+++ b/music_assistant/modules/musicproviders/spotify.py
@@ -7,7 +7,7 @@ from typing import List
 import sys
 import time
 from utils import run_periodic, LOGGER, parse_track_title
-from secrets import SPOTIFY_CLIENT_ID
+from app_var import get_app_var
 from models import MusicProvider, MediaType, TrackQuality, AlbumType, Artist, Album, Track, Playlist
 from constants import CONF_USERNAME, CONF_PASSWORD, CONF_ENABLED
 from asyncio_throttle import Throttler
@@ -415,7 +415,7 @@ class SpotifyProvider(MusicProvider):
                 "user-read-birthdate",
                 "user-top-read"]
             scope = ",".join(scopes)
-            args = [self.get_spotty_binary(), "-t", "--client-id", SPOTIFY_CLIENT_ID, "--scope", scope, "-n", "temp-spotty", "-u", self._username, "-p", self._password, "--disable-discovery"]
+            args = [self.get_spotty_binary(), "-t", "--client-id", get_app_var(2), "--scope", scope, "-n", "temp-spotty", "-u", self._username, "-p", self._password, "--disable-discovery"]
             spotty = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             stdout, stderr = spotty.communicate()
             result = json.loads(stdout)

diff --git a/music_assistant/secrets.py b/music_assistant/secrets.py
deleted file mode 100755 (executable)
index 397f808..0000000
--- a/music_assistant/secrets.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
-
-QOBUZ_APP_ID = ""
-QOBUZ_APP_SECRET = ""
-SPOTIFY_CLIENT_ID = ""
\ No newline at end of file