[gnome-music/wip/mschraal/coresong-thumbnail-prop: 167/179] cleanup a little
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/coresong-thumbnail-prop: 167/179] cleanup a little
- Date: Wed, 26 Feb 2020 23:34:16 +0000 (UTC)
commit f8ce52d87c1d4b63d85ea4388e4ef3c88b6da96f
Author: Marinus Schraal <mschraal gnome org>
Date: Thu Nov 28 17:48:54 2019 +0100
cleanup a little
gnomemusic/albumart.py | 83 ++------------------------------------------------
1 file changed, 2 insertions(+), 81 deletions(-)
---
diff --git a/gnomemusic/albumart.py b/gnomemusic/albumart.py
index ff809f9d..7f19fce1 100644
--- a/gnomemusic/albumart.py
+++ b/gnomemusic/albumart.py
@@ -139,8 +139,8 @@ class AlbumArt(GObject.GObject):
self._artist = corealbum.props.artist
self._title = corealbum.props.title
- # if self._in_cache():
- # return
+ if self._in_cache():
+ return
coremodel.props.grilo.get_album_art(corealbum)
@@ -157,85 +157,6 @@ class AlbumArt(GObject.GObject):
return True
- def _on_thumbnail_changed(self, coreartist, thumbnail):
- uri = coreartist.props.thumbnail
-
- if (uri is None
- or uri == ""):
- self._coreartist.props.cached_thumbnail_uri = ""
- return
-
- src = Gio.File.new_for_uri(uri)
- src.read_async(
- GLib.PRIORITY_LOW, None, self._read_callback, None)
-
- def _read_callback(self, src, result, data):
- try:
- istream = src.read_finish(result)
- except GLib.Error as error:
- logger.warning("Error: {}, {}".format(error.domain, error.message))
- self._coreartist.props.cached_thumbnail_uri = ""
- return
-
- try:
- [tmp_file, iostream] = Gio.File.new_tmp()
- except GLib.Error as error:
- logger.warning("Error: {}, {}".format(error.domain, error.message))
- self._coreartist.props.cached_thumbnail_uri = ""
- return
-
- ostream = iostream.get_output_stream()
- # FIXME: Passing the iostream here, otherwise it gets
- # closed. PyGI specific issue?
- ostream.splice_async(
- istream, Gio.OutputStreamSpliceFlags.CLOSE_SOURCE
- | Gio.OutputStreamSpliceFlags.CLOSE_TARGET, GLib.PRIORITY_LOW,
- None, self._splice_callback, [tmp_file, iostream])
-
- def _delete_callback(self, src, result, data):
- try:
- src.delete_finish(result)
- except GLib.Error as error:
- logger.warning("Error: {}, {}".format(error.domain, error.message))
-
- def _splice_callback(self, src, result, data):
- tmp_file, iostream = data
-
- iostream.close_async(
- GLib.PRIORITY_LOW, None, self._close_iostream_callback, None)
-
- try:
- src.splice_finish(result)
- except GLib.Error as error:
- logger.warning("Error: {}, {}".format(error.domain, error.message))
- self._coreartist.props.cached_thumbnail_uri = ""
- return
-
- success, cache_path = MediaArt.get_path(self._artist, None, "artist")
-
- if not success:
- self._coreartist.props.cached_thumbnail_uri = ""
- return
-
- try:
- # FIXME: I/O blocking
- MediaArt.file_to_jpeg(tmp_file.get_path(), cache_path)
- except GLib.Error as error:
- logger.warning("Error: {}, {}".format(error.domain, error.message))
- self._coreartist.props.cached_thumbnail_uri = ""
- return
-
- self._in_cache()
-
- tmp_file.delete_async(
- GLib.PRIORITY_LOW, None, self._delete_callback, None)
-
- def _close_iostream_callback(self, src, result, data):
- try:
- src.close_finish(result)
- except GLib.Error as error:
- logger.warning("Error: {}, {}".format(error.domain, error.message))
-
# class ArtistCache(GObject.GObject):
# """Handles retrieval of MediaArt cache art
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]