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

unified fallbacks

Browse Source
This commit is contained in:
Martin Wagner 2022-11-06 10:40:28 +01:00
parent d4ab26c8d2
commit 9216e7f517
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mpdevil.py
View File

@ -46,7 +46,7 @@ bindtextdomain("mpdevil", localedir="@LOCALE_DIR@")
textdomain("mpdevil") textdomain("mpdevil")
Gio.Resource._register(Gio.resource_load(os.path.join("@RESOURCES_DIR@", "mpdevil.gresource"))) Gio.Resource._register(Gio.resource_load(os.path.join("@RESOURCES_DIR@", "mpdevil.gresource")))
COVER_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_LIB=GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_MUSIC)
@ -708,10 +708,7 @@ class Client(MPDClient):
self.emitter.emit("connecting") self.emitter.emit("connecting")
def callback(): def callback():
if self._settings.get_boolean("socket-connection"): if self._settings.get_boolean("socket-connection"):
socket=self._settings.get_string("socket") args=(self._settings.get_socket(), None)
if not socket:
socket=FALLBACK_SOCKET
args=(socket, None)
else: else:
args=(self._settings.get_string("host"), self._settings.get_int("port")) args=(self._settings.get_string("host"), self._settings.get_int("port"))
try: try:
@ -729,9 +726,7 @@ class Client(MPDClient):
else: else:
print("No permission to get music directory.") print("No permission to get music directory.")
else: else:
self.lib_path=self._settings.get_string("path") self.lib_path=self._settings.get_lib()
if not self.lib_path:
self.lib_path=FALLBACK_LIB
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")
@ -836,7 +831,7 @@ class Client(MPDClient):
print("illegal regex:", regex_str) print("illegal regex:", regex_str)
return None return None
else: else:
regex=re.compile(COVER_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.lib_path, 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
@ -975,6 +970,18 @@ class Settings(Gio.Settings):
def __init__(self): def __init__(self):
super().__init__(schema=self.BASE_KEY) super().__init__(schema=self.BASE_KEY)
def get_socket(self):
socket=self.get_string("socket")
if not socket:
socket=FALLBACK_SOCKET
return socket
def get_lib(self):
lib_path=self.get_string("path")
if not lib_path:
lib_path=FALLBACK_LIB
return lib_path
################### ###################
# settings dialog # # settings dialog #
################### ###################
@ -1121,7 +1128,7 @@ class ConnectionSettings(Gtk.Box):
path_entry=LibPathEntry(parent, hexpand=True, no_show_all=True) path_entry=LibPathEntry(parent, hexpand=True, no_show_all=True)
settings.bind("path", path_entry, "text", Gio.SettingsBindFlags.DEFAULT) settings.bind("path", path_entry, "text", Gio.SettingsBindFlags.DEFAULT)
settings.bind("socket-connection", path_entry, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET) settings.bind("socket-connection", path_entry, "visible", Gio.SettingsBindFlags.INVERT_BOOLEAN|Gio.SettingsBindFlags.GET)
regex_entry=Gtk.Entry(hexpand=True, placeholder_text=COVER_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 "\
"matching this regex will be displayed. %AlbumArtist% and "\ "matching this regex will be displayed. %AlbumArtist% and "\
@ -3151,10 +3158,7 @@ class ConnectionNotify(Gtk.Revealer):
def _on_connection_error(self, *args): def _on_connection_error(self, *args):
if self._settings.get_boolean("socket-connection"): if self._settings.get_boolean("socket-connection"):
socket=self._settings.get_string("socket") text=_("Connection to “{socket}” failed").format(socket=self._settings.get_socket())
if not socket:
socket=FALLBACK_SOCKET
text=_("Connection to “{socket}” failed").format(socket=socket)
else: else:
text=_("Connection to “{host}:{port}” failed").format( text=_("Connection to “{host}:{port}” failed").format(
host=self._settings.get_string("host"), port=self._settings.get_int("port")) host=self._settings.get_string("host"), port=self._settings.get_int("port"))