mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

fixed error when GLib.UserDirectory.DIRECTORY_MUSIC returns None

Browse Source
This commit is contained in:
Martin Wagner 2021-01-01 17:54:20 +01:00
parent f7ada87104
commit ac749a10dd
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/mpdevil
View File

@ -635,9 +635,13 @@ class Client(MPDClient):
return meta_base return meta_base
def get_absolute_path(self, uri): def get_absolute_path(self, uri):
path=os.path.join(self._settings.get_lib_path(), uri) lib_path=self._settings.get_lib_path()
if os.path.isfile(path): if lib_path is not None:
return path path=os.path.join(lib_path, uri)
if os.path.isfile(path):
return path
else:
return None
else: else:
return None return None
@ -769,9 +773,10 @@ class Settings(Gio.Settings):
else: else:
return ("artist") return ("artist")
def get_lib_path(self): def get_lib_path(self, profile=None):
active_profile=self.get_int("active-profile") if profile is None: # use current profile if none is given
lib_path=self.get_value("paths")[active_profile] profile=self.get_int("active-profile")
lib_path=self.get_value("paths")[profile]
if lib_path == "": if lib_path == "":
lib_path=GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC) lib_path=GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
return lib_path return lib_path
@ -1104,10 +1109,8 @@ class ProfileSettings(Gtk.Grid):
def _on_path_select_button_clicked(self, widget, parent): def _on_path_select_button_clicked(self, widget, parent):
dialog=Gtk.FileChooserNative(title=_("Choose directory"), transient_for=parent, action=Gtk.FileChooserAction.SELECT_FOLDER) dialog=Gtk.FileChooserNative(title=_("Choose directory"), transient_for=parent, action=Gtk.FileChooserAction.SELECT_FOLDER)
folder=self._settings.get_value("paths")[self._profiles_combo.get_active()] folder=self._settings.get_lib_path(self._profiles_combo.get_active())
if folder == "": if folder is not None:
dialog.set_current_folder(GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC))
else:
dialog.set_current_folder(folder) dialog.set_current_folder(folder)
response=dialog.run() response=dialog.run()
if response == Gtk.ResponseType.ACCEPT: if response == Gtk.ResponseType.ACCEPT: