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

changed "lib-path" to "music-directory"

Browse Source
This commit is contained in:
Martin Wagner 2022-11-06 11:52:41 +01:00
parent 270619b15c
commit 4fb0230c43
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/org.mpdevil.mpdevil.gschema.xml
View File

@ -58,9 +58,9 @@
<default>""</default> <default>""</default>
<summary>Password</summary> <summary>Password</summary>
</key> </key>
<key type="s" name="path"> <key type="s" name="music-directory">
<default>""</default> <default>""</default>
<summary>Music library path</summary> <summary>Music library directory</summary>
</key> </key>
<key type="s" name="regex"> <key type="s" name="regex">
<default>""</default> <default>""</default>

48
src/mpdevil.py
View File

@ -49,7 +49,7 @@ Gio.Resource._register(Gio.resource_load(os.path.join("@RESOURCES_DIR@", "mpdevi
FALLBACK_REGEX=r"^\.?(album|cover|folder|front).*\.(gif|jpeg|jpg|png)$" FALLBACK_REGEX=r"^\.?(album|cover|folder|front).*\.(gif|jpeg|jpg|png)$"
FALLBACK_COVER=Gtk.IconTheme.get_default().lookup_icon("media-optical", 128, Gtk.IconLookupFlags.FORCE_SVG).get_filename() FALLBACK_COVER=Gtk.IconTheme.get_default().lookup_icon("media-optical", 128, Gtk.IconLookupFlags.FORCE_SVG).get_filename()
FALLBACK_SOCKET=os.path.join(GLib.get_user_runtime_dir(), "mpd/socket") FALLBACK_SOCKET=os.path.join(GLib.get_user_runtime_dir(), "mpd/socket")
FALLBACK_LIB=GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC) FALLBACK_MUSIC_DIRECTORY=GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
############################ ############################
# decorators and functions # # decorators and functions #
@ -654,7 +654,7 @@ class Client(MPDClient):
self._refresh_interval=self._settings.get_int("refresh-interval") self._refresh_interval=self._settings.get_int("refresh-interval")
self._main_timeout_id=None self._main_timeout_id=None
self._start_idle_id=None self._start_idle_id=None
self.lib_path=None self.music_directory=None
self.current_cover=None self.current_cover=None
# connect # connect
@ -725,11 +725,11 @@ class Client(MPDClient):
# connect successful # connect successful
if self._settings.get_boolean("socket-connection"): if self._settings.get_boolean("socket-connection"):
if "config" in self.commands(): if "config" in self.commands():
self.lib_path=self.config() self.music_directory=self.config()
else: else:
print("No permission to get music directory.") print("No permission to get music directory.")
else: else:
self.lib_path=self._settings.get_lib_path() self.music_directory=self._settings.get_music_directory()
if "status" in self.commands(): if "status" in self.commands():
self._main_timeout_id=GLib.timeout_add(self._refresh_interval, self._main_loop) self._main_timeout_id=GLib.timeout_add(self._refresh_interval, self._main_loop)
self.emitter.emit("connected") self.emitter.emit("connected")
@ -823,7 +823,7 @@ class Client(MPDClient):
def get_cover_path(self, song): def get_cover_path(self, song):
path=None path=None
song_file=song["file"] song_file=song["file"]
if self.lib_path is not None: if self.music_directory is not None:
regex_str=self._settings.get_string("regex") regex_str=self._settings.get_string("regex")
if regex_str: if regex_str:
regex_str=regex_str.replace("%AlbumArtist%", re.escape(song["albumartist"][0])) regex_str=regex_str.replace("%AlbumArtist%", re.escape(song["albumartist"][0]))
@ -835,7 +835,7 @@ class Client(MPDClient):
return None return None
else: else:
regex=re.compile(FALLBACK_REGEX, flags=re.IGNORECASE) regex=re.compile(FALLBACK_REGEX, flags=re.IGNORECASE)
song_dir=os.path.join(self.lib_path, os.path.dirname(song_file)) song_dir=os.path.join(self.music_directory, os.path.dirname(song_file))
if song_dir.lower().endswith(".cue"): if song_dir.lower().endswith(".cue"):
song_dir=os.path.dirname(song_dir) # get actual directory of .cue file song_dir=os.path.dirname(song_dir) # get actual directory of .cue file
if os.path.isdir(song_dir): if os.path.isdir(song_dir):
@ -864,8 +864,8 @@ class Client(MPDClient):
return None return None
def get_absolute_path(self, uri): def get_absolute_path(self, uri):
if self.lib_path is not None: if self.music_directory is not None:
path=re.sub(r"(.*\.cue)\/track\d+$", r"\1", os.path.join(self.lib_path, uri), flags=re.IGNORECASE) path=re.sub(r"(.*\.cue)\/track\d+$", r"\1", os.path.join(self.music_directory, uri), flags=re.IGNORECASE)
if os.path.isfile(path): if os.path.isfile(path):
return path return path
else: else:
@ -957,7 +957,7 @@ class Client(MPDClient):
self.disconnect() self.disconnect()
self.emitter.emit("connection_error") self.emitter.emit("connection_error")
self._main_timeout_id=None self._main_timeout_id=None
self.lib_path=None self.music_directory=None
self.current_cover=None self.current_cover=None
return False return False
return True return True
@ -979,11 +979,11 @@ class Settings(Gio.Settings):
socket=FALLBACK_SOCKET socket=FALLBACK_SOCKET
return socket return socket
def get_lib_path(self): def get_music_directory(self):
lib_path=self.get_string("path") music_directory=self.get_string("music-directory")
if not lib_path: if not music_directory:
lib_path=FALLBACK_LIB music_directory=FALLBACK_MUSIC_DIRECTORY
return lib_path return music_directory
################### ###################
# settings dialog # # settings dialog #
@ -1091,9 +1091,9 @@ class PasswordEntry(Gtk.Entry):
self.set_visibility(False) self.set_visibility(False)
self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "view-conceal-symbolic") self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "view-conceal-symbolic")
class LibPathEntry(Gtk.Entry): class MusicDirectoryEntry(Gtk.Entry):
def __init__(self, parent, **kwargs): def __init__(self, parent, **kwargs):
super().__init__(placeholder_text=FALLBACK_LIB, **kwargs) super().__init__(placeholder_text=FALLBACK_MUSIC_DIRECTORY, **kwargs)
self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "folder-open-symbolic") self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "folder-open-symbolic")
self.connect("icon-release", self._on_icon_release, parent) self.connect("icon-release", self._on_icon_release, parent)
@ -1127,9 +1127,9 @@ class ConnectionSettings(Gtk.Grid):
settings.bind("socket-connection", port_entry, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET) settings.bind("socket-connection", port_entry, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
password_entry=PasswordEntry(hexpand=True) password_entry=PasswordEntry(hexpand=True)
settings.bind("password", password_entry, "text", Gio.SettingsBindFlags.DEFAULT) settings.bind("password", password_entry, "text", Gio.SettingsBindFlags.DEFAULT)
path_entry=LibPathEntry(parent, hexpand=True, no_show_all=True) music_directory_entry=MusicDirectoryEntry(parent, hexpand=True, no_show_all=True)
settings.bind("path", path_entry, "text", Gio.SettingsBindFlags.DEFAULT) settings.bind("music-directory", music_directory_entry, "text", Gio.SettingsBindFlags.DEFAULT)
settings.bind("socket-connection", path_entry, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET) settings.bind("socket-connection", music_directory_entry, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
regex_entry=Gtk.Entry(hexpand=True, placeholder_text=FALLBACK_REGEX) regex_entry=Gtk.Entry(hexpand=True, placeholder_text=FALLBACK_REGEX)
regex_entry.set_tooltip_text( regex_entry.set_tooltip_text(
_("The first image in the same directory as the song file "\ _("The first image in the same directory as the song file "\
@ -1142,8 +1142,8 @@ class ConnectionSettings(Gtk.Grid):
host_label=Gtk.Label(label=_("Host:"), xalign=1, margin_end=6, no_show_all=True) host_label=Gtk.Label(label=_("Host:"), xalign=1, margin_end=6, no_show_all=True)
settings.bind("socket-connection", host_label, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET) settings.bind("socket-connection", host_label, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
password_label=Gtk.Label(label=_("Password:"), xalign=1, margin_end=6) password_label=Gtk.Label(label=_("Password:"), xalign=1, margin_end=6)
path_label=Gtk.Label(label=_("Music lib:"), xalign=1, margin_end=6, no_show_all=True) music_directory_label=Gtk.Label(label=_("Music lib:"), xalign=1, margin_end=6, no_show_all=True)
settings.bind("socket-connection", path_label, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET) settings.bind("socket-connection", music_directory_label, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
regex_label=Gtk.Label(label=_("Cover regex:"), xalign=1, margin_end=6) regex_label=Gtk.Label(label=_("Cover regex:"), xalign=1, margin_end=6)
# connect button # connect button
@ -1156,13 +1156,13 @@ class ConnectionSettings(Gtk.Grid):
self.attach(socket_label, 0, 1, 1, 1) self.attach(socket_label, 0, 1, 1, 1)
self.attach_next_to(host_label, socket_label, Gtk.PositionType.BOTTOM, 1, 1) self.attach_next_to(host_label, socket_label, Gtk.PositionType.BOTTOM, 1, 1)
self.attach_next_to(password_label, host_label, Gtk.PositionType.BOTTOM, 1, 1) self.attach_next_to(password_label, host_label, Gtk.PositionType.BOTTOM, 1, 1)
self.attach_next_to(path_label, password_label, Gtk.PositionType.BOTTOM, 1, 1) self.attach_next_to(music_directory_label, password_label, Gtk.PositionType.BOTTOM, 1, 1)
self.attach_next_to(regex_label, path_label, Gtk.PositionType.BOTTOM, 1, 1) self.attach_next_to(regex_label, music_directory_label, Gtk.PositionType.BOTTOM, 1, 1)
self.attach_next_to(socket_entry, socket_label, Gtk.PositionType.RIGHT, 2, 1) self.attach_next_to(socket_entry, socket_label, Gtk.PositionType.RIGHT, 2, 1)
self.attach_next_to(host_entry, host_label, Gtk.PositionType.RIGHT, 1, 1) self.attach_next_to(host_entry, host_label, Gtk.PositionType.RIGHT, 1, 1)
self.attach_next_to(port_entry, host_entry, Gtk.PositionType.RIGHT, 1, 1) self.attach_next_to(port_entry, host_entry, Gtk.PositionType.RIGHT, 1, 1)
self.attach_next_to(password_entry, password_label, Gtk.PositionType.RIGHT, 2, 1) self.attach_next_to(password_entry, password_label, Gtk.PositionType.RIGHT, 2, 1)
self.attach_next_to(path_entry, path_label, Gtk.PositionType.RIGHT, 2, 1) self.attach_next_to(music_directory_entry, music_directory_label, Gtk.PositionType.RIGHT, 2, 1)
self.attach_next_to(regex_entry, regex_label, Gtk.PositionType.RIGHT, 2, 1) self.attach_next_to(regex_entry, regex_label, Gtk.PositionType.RIGHT, 2, 1)
self.attach(connect_button, 0, 6, 3, 1) self.attach(connect_button, 0, 6, 3, 1)