fix app vars (#271)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 84d4c11c6e9bfc70366c7471dffe9163bf460835..54e13e7b91d781adf3a1eece34e0cc4f3fbc41c6 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,7 +35,7 @@ repos:
     rev: 6.1.1
     hooks:
       - id: pydocstyle
-        exclude: ^examples/|^.venv/|^.vscode/
+        exclude: ^examples/|^.venv/|^.vscode/|app_vars.py
   - repo: local
     hooks:
       - id: pylint

diff --git a/music_assistant/helpers/app_vars.py b/music_assistant/helpers/app_vars.py
index b010396988890957b8d539b4e18ad2ba4dc87d35..1f325978eeae396eb81c336c293250204d35e479 100644 (file)
--- a/music_assistant/helpers/app_vars.py
+++ b/music_assistant/helpers/app_vars.py
@@ -1,33 +1,4 @@
-"""Some magic to store some appvars."""
 # pylint: skip-file
+# fmt: off
 # flake8: noqa
-(
-    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"OTQyODUyNTY3LDc2MTczMGQzZjk1ZTRhZjA5YWM2M2I5YTM3Y2NjOTZhLDJlYjk2ZjliMzc0OTRiZTE4MjQ5OTlkNTgwMjhhMzA1LFNTcnRNMnhlM2wwMDNnOEh4RmVUUUtub3BaNklCaUwzRTlPc1QxODFYMDA9"
-                )
-            ]
-        ][0]
-        for __g["base64"] in [(__import__("base64", __g, __g))]
-    ][0]
-)(globals())
+(lambda __g: [(lambda __mod: [[[None for __g['app_var'], app_var.__name__ in [(lambda index: (lambda __l: [[AV(aap(__l['var'].encode()).decode()) for __l['var'] in [(vars.split('acb2')[__l['index']][::(-1)])]][0] for __l['index'] in [(index)]][0])({}), 'app_var')]][0] for __g['vars'] in [('3YTNyUDOyQTOacb2=EmN5M2YjdzMhljYzYzYhlDMmFGNlVTOmNDZwMzNxYzNacb2=UDMzEGOyADO1QWO5kDNygTMlJGN5QzNzIWOmZTOiVmMacb2yMTNzITN')]][0] for __g['aap'] in [(__mod.b64decode)]][0])(__import__('base64', __g, __g, ('b64decode',), 0)) for __g['AV'] in [((lambda b, d: d.get('__metaclass__', getattr(b[0], '__class__', type(b[0])))('AV', b, d))((str,), (lambda __l: [__l for __l['__repr__'], __l['__repr__'].__name__ in [(lambda self: (lambda __l: [__name__ for __l['self'] in [(self)]][0])({}), '__repr__')]][0])({'__module__': __name__})))]][0])(globals())

diff --git a/music_assistant/providers/qobuz.py b/music_assistant/providers/qobuz.py
index b3da5f2aac6edfb94509de460e346973c00f9e3f..de3ad7485fe6fcb0fde19fee578f13fe4138454c 100644 (file)
--- a/music_assistant/providers/qobuz.py
+++ b/music_assistant/providers/qobuz.py
@@ -12,7 +12,7 @@ from asyncio_throttle import Throttler
 
 from music_assistant.constants import EventType, MassEvent
 from music_assistant.helpers.app_vars import (  # pylint: disable=no-name-in-module
-    get_app_var,
+    app_var,
 )
 from music_assistant.helpers.util import parse_title_and_version, try_parse_int
 from music_assistant.models.errors import LoginFailed
@@ -650,7 +650,7 @@ class QobuzProvider(MusicProvider):
         if not params:
             params = {}
         url = f"http://www.qobuz.com/api.json/0.2/{endpoint}"
-        headers = {"X-App-Id": get_app_var(0)}
+        headers = {"X-App-Id": app_var(0)}
         if endpoint != "user/login":
             auth_token = await self._auth_token()
             if not auth_token:
@@ -664,11 +664,11 @@ class QobuzProvider(MusicProvider):
             for key in keys:
                 signing_data += f"{key}{params[key]}"
             request_ts = str(time.time())
-            request_sig = signing_data + request_ts + get_app_var(1)
+            request_sig = signing_data + request_ts + 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"] = get_app_var(0)
+            params["app_id"] = app_var(0)
             params["user_auth_token"] = await self._auth_token()
         async with self._throttler:
             async with self.mass.http_session.get(
@@ -696,7 +696,7 @@ class QobuzProvider(MusicProvider):
         if not data:
             data = {}
         url = f"http://www.qobuz.com/api.json/0.2/{endpoint}"
-        params["app_id"] = get_app_var(0)
+        params["app_id"] = app_var(0)
         params["user_auth_token"] = await self._auth_token()
         async with self.mass.http_session.post(
             url, params=params, json=data, verify_ssl=False

diff --git a/music_assistant/providers/spotify/__init__.py b/music_assistant/providers/spotify/__init__.py
index 614a84e5f11ae66715721ab33511d432c59d5244..886e04bde07a62eb48b13b4d0e92a2560ca49d1d 100644 (file)
--- a/music_assistant/providers/spotify/__init__.py
+++ b/music_assistant/providers/spotify/__init__.py
@@ -14,7 +14,7 @@ import aiohttp
 from asyncio_throttle import Throttler
 
 from music_assistant.helpers.app_vars import (  # noqa # pylint: disable=no-name-in-module
-    get_app_var,
+    app_var,
 )
 from music_assistant.helpers.util import parse_title_and_version
 from music_assistant.models.errors import LoginFailed
@@ -478,7 +478,7 @@ class SpotifyProvider(MusicProvider):
             "-O",
             "-t",
             "--client-id",
-            get_app_var(2),
+            app_var(2),
             "--scope",
             scope,
             "-c",