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

ignore broken covers fetched via mpd

Browse Source
This commit is contained in:
Martin Wagner 2021-06-02 21:34:01 +02:00
parent 8c0c1fe59e
commit 66bf9c310a
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bin/mpdevil
View File

@ -38,6 +38,7 @@ else:
VERSION="1.2.1" # sync with setup.py VERSION="1.2.1" # sync with setup.py
COVER_REGEX=r"^\.?(album|cover|folder|front).*\.(gif|jpeg|jpg|png)$" COVER_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()
######### #########
@ -503,6 +504,7 @@ class ClientHelper():
def binary_to_pixbuf(binary, size): def binary_to_pixbuf(binary, size):
loader=GdkPixbuf.PixbufLoader.new() loader=GdkPixbuf.PixbufLoader.new()
try:
loader.write(binary) loader.write(binary)
loader.close() loader.close()
raw_pixbuf=loader.get_pixbuf() raw_pixbuf=loader.get_pixbuf()
@ -511,6 +513,15 @@ class ClientHelper():
pixbuf=raw_pixbuf.scale_simple(size,size/ratio,GdkPixbuf.InterpType.BILINEAR) pixbuf=raw_pixbuf.scale_simple(size,size/ratio,GdkPixbuf.InterpType.BILINEAR)
else: else:
pixbuf=raw_pixbuf.scale_simple(size*ratio,size,GdkPixbuf.InterpType.BILINEAR) pixbuf=raw_pixbuf.scale_simple(size*ratio,size,GdkPixbuf.InterpType.BILINEAR)
except gi.repository.GLib.Error: # load fallback if cover can't be loaded
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size)
return pixbuf
def file_to_pixbuf(file, size):
try:
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(file, size, size)
except gi.repository.GLib.Error: # load fallback if cover can't be loaded
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size)
return pixbuf return pixbuf
class EventEmitter(GObject.Object): class EventEmitter(GObject.Object):
@ -544,7 +555,6 @@ class Client(MPDClient):
self._last_status={} self._last_status={}
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.fallback_cover=Gtk.IconTheme.get_default().lookup_icon("media-optical", 128, Gtk.IconLookupFlags.FORCE_SVG).get_filename()
# connect # connect
self._settings.connect("changed::active-profile", self._on_active_profile_changed) self._settings.connect("changed::active-profile", self._on_active_profile_changed)
@ -730,14 +740,11 @@ class Client(MPDClient):
if cover_path is None: if cover_path is None:
cover_binary=self.get_cover_binary(song.get("file")) cover_binary=self.get_cover_binary(song.get("file"))
if cover_binary is None: if cover_binary is None:
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(self.fallback_cover, size, size) pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size)
else: else:
pixbuf=ClientHelper.binary_to_pixbuf(cover_binary, size) pixbuf=ClientHelper.binary_to_pixbuf(cover_binary, size)
else: else:
try: pixbuf=ClientHelper.file_to_pixbuf(cover_path, size)
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(cover_path, size, size)
except: # load fallback if cover can't be loaded (GLib: Couldn’t recognize the image file format for file...)
pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(self.fallback_cover, size, size)
return pixbuf return pixbuf
def get_metadata(self, uri): def get_metadata(self, uri):
@ -2369,15 +2376,12 @@ class AlbumWindow(FocusFrame):
if self._stop_flag: if self._stop_flag:
break break
if "cover_path" in album: if "cover_path" in album:
try: album["cover"]=ClientHelper.file_to_pixbuf(album["cover_path"], size)
album["cover"]=GdkPixbuf.Pixbuf.new_from_file_at_size(album["cover_path"], size, size)
except: # load fallback if cover can't be loaded
album["cover"]=GdkPixbuf.Pixbuf.new_from_file_at_size(self._client.fallback_cover, size, size)
else: else:
if "cover_binary" in album: if "cover_binary" in album:
album["cover"]=ClientHelper.binary_to_pixbuf(album["cover_binary"], size) album["cover"]=ClientHelper.binary_to_pixbuf(album["cover_binary"], size)
else: else:
album["cover"]=GdkPixbuf.Pixbuf.new_from_file_at_size(self._client.fallback_cover, size, size) album["cover"]=GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size)
GLib.idle_add(self._progress_bar.set_fraction, (i+1)/total_albums) GLib.idle_add(self._progress_bar.set_fraction, (i+1)/total_albums)
if self._stop_flag: if self._stop_flag:
GLib.idle_add(self._done_callback) GLib.idle_add(self._done_callback)
@ -2800,7 +2804,7 @@ class MainCover(Gtk.Image):
def _on_disconnected(self, *args): def _on_disconnected(self, *args):
size=self._settings.get_int("track-cover") size=self._settings.get_int("track-cover")
self.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_file_at_size(self._client.fallback_cover, size, size)) self.set_from_pixbuf(GdkPixbuf.Pixbuf.new_from_file_at_size(FALLBACK_COVER, size, size))
self.set_sensitive(False) self.set_sensitive(False)
def _on_reconnected(self, *args): def _on_reconnected(self, *args):