mcvsoftware/music-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented most of the code for Tidal updates. Only authorization is pending for now

Browse Source
This commit is contained in:
Manuel Cortez 2021-09-22 17:51:43 -05:00
parent 7d64515bff
commit b0f241b2b1
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app-configuration.defaults
View File

@ -6,8 +6,10 @@ output_device = string(default="Default")
[services] [services]
[[tidal]] [[tidal]]
enabled = boolean(default=True) enabled = boolean(default=True)
username = string(default="") session_id=String(default="")
password = string(default="") token_type=String(default="")
access_token=String(default="")
refresh_token=String(default="")
quality=string(default="high") quality=string(default="high")
avoid_transcoding = boolean(default=False) avoid_transcoding = boolean(default=False)
include_albums = boolean(default=True) include_albums = boolean(default=True)

37
src/services/tidal.py
View File

@ -19,7 +19,7 @@ class interface(base.baseInterface):
if config.app != None: # Workaround for cx_freeze 6.2 in python 3.7. if config.app != None: # Workaround for cx_freeze 6.2 in python 3.7.
enabled = config.app["services"]["tidal"].get("enabled") enabled = config.app["services"]["tidal"].get("enabled")
# This should not be enabled if credentials are not set in config. # This should not be enabled if credentials are not set in config.
if config.app["services"]["tidal"]["username"] == "" or config.app["services"]["tidal"]["password"] == "": if config.app["services"]["tidal"]["refresh_token"] == "" or config.app["services"]["tidal"]["access_token"] == "" or config.app["services"]["tidal"]["session_id"] == "" or config.app["services"]["tidal"]["token_type"] == "":
enabled = False enabled = False
else: else:
enabled = False enabled = False
@ -36,11 +36,13 @@ class interface(base.baseInterface):
quality = tidalapi.Quality.high quality = tidalapi.Quality.high
# We need to instantiate a config object to pass quality settings. # We need to instantiate a config object to pass quality settings.
_config = tidalapi.Config(quality=quality) _config = tidalapi.Config(quality=quality)
username = config.app["services"]["tidal"]["username"] session_id = config.app["services"]["tidal"]["session_id"]
password = config.app["services"]["tidal"]["password"] token_type = config.app["services"]["tidal"]["token_type"]
access_token = config.app["services"]["tidal"]["access_token"]
refresh_token = config.app["services"]["tidal"]["refresh_token"]
log.debug("Using quality: %s" % (quality,)) log.debug("Using quality: %s" % (quality,))
self.session = tidalapi.Session(config=_config) self.session = tidalapi.Session(config=_config)
self.session.login(username=username, password=password) self.session.load_oauth_session(session_id, token_type, access_token, refresh_token)
def get_file_format(self): def get_file_format(self):
""" Returns the file format (mp3 or flac) depending in quality set. """ """ Returns the file format (mp3 or flac) depending in quality set. """
@ -186,23 +188,16 @@ class settings(base.baseSettings):
self.avoid_transcoding = wx.CheckBox(self, wx.NewId(), _("Avoid transcoding when downloading")) self.avoid_transcoding = wx.CheckBox(self, wx.NewId(), _("Avoid transcoding when downloading"))
self.map.append(("avoid_transcoding", self.avoid_transcoding)) self.map.append(("avoid_transcoding", self.avoid_transcoding))
sizer.Add(self.avoid_transcoding, 0, wx.ALL, 5) sizer.Add(self.avoid_transcoding, 0, wx.ALL, 5)
username = wx.StaticText(self, wx.NewId(), _("Tidal username or email address")) if config.app["services"]["tidal"]["access_token"] != "" and config.app["services"]["tidal"]["refresh_token"] != "" and config.app["services"]["tidal"]["session_id"] != "" and config.app["services"]["tidal"]["token_type"] != "":
self.username = wx.TextCtrl(self, wx.NewId()) self.deauthorize_account = wx.Button(self, wx.ID_ANY, _("Deauthorize account"))
usernamebox = wx.BoxSizer(wx.HORIZONTAL) sizer.Add(self.deauthorize_account, 0, wx.ALL, 5)
usernamebox.Add(username, 0, wx.ALL, 5) # Connect here the authorization code function.
usernamebox.Add(self.username, 0, wx.ALL, 5) else:
sizer.Add(usernamebox, 0, wx.ALL, 5) self.authorize_account = wx.Button(self, wx.ID_ANY, _("Authorize account"))
self.map.append(("username", self.username)) sizer.Add(self.authorize_account, 0, wx.ALL, 5)
password = wx.StaticText(self, wx.NewId(), _("Password")) self.get_account = wx.Button(self, wx.NewId(), _("You can subscribe for a tidal account here"))
self.password = wx.TextCtrl(self, wx.NewId(), style=wx.TE_PASSWORD) self.get_account.Bind(wx.EVT_BUTTON, self.on_get_account)
passwordbox = wx.BoxSizer(wx.HORIZONTAL) sizer.Add(self.get_account, 0, wx.ALL, 5)
passwordbox.Add(password, 0, wx.ALL, 5)
passwordbox.Add(self.password, 0, wx.ALL, 5)
sizer.Add(passwordbox, 0, wx.ALL, 5)
self.map.append(("password", self.password))
self.get_account = wx.Button(self, wx.NewId(), _("You can subscribe for a tidal account here"))
self.get_account.Bind(wx.EVT_BUTTON, self.on_get_account)
sizer.Add(self.get_account, 0, wx.ALL, 5)
quality = wx.StaticText(self, wx.NewId(), _("Audio quality")) quality = wx.StaticText(self, wx.NewId(), _("Audio quality"))
self.quality = wx.ComboBox(self, wx.NewId(), choices=[i for i in self.get_quality_list().values()], value=_("High"), style=wx.CB_READONLY) self.quality = wx.ComboBox(self, wx.NewId(), choices=[i for i in self.get_quality_list().values()], value=_("High"), style=wx.CB_READONLY)
qualitybox = wx.BoxSizer(wx.HORIZONTAL) qualitybox = wx.BoxSizer(wx.HORIZONTAL)