git.iko.soy/unity8
on xenial help sign in
Return fallback image on album fetching failure.
9e79b6ePawel Stolowski
plugins/Utils/albumartprovider.cpp+8−4
compare with xenial
unifiedsplit
@@ -36,6 +36,8 @@
36
36
37using namespace std;
37using namespace std;
38
38
39+const std::string AlbumArtProvider::DEFAULT_ALBUM_ART = "/usr/share/unity/icons/album_missing.png";
40+
39static void on_new_pad (GstElement * /*dec*/, GstPad * pad, GstElement * fakesink) {
41static void on_new_pad (GstElement * /*dec*/, GstPad * pad, GstElement * fakesink) {
40 GstPad *sinkpad;
42 GstPad *sinkpad;
41
43
@@ -65,7 +67,7 @@ static void process_one_tag (const GstTagList * list, const gchar * tag, gpointe
65 }
67 }
66}
68}
67
69
68−albuminfo AlbumArtProvider::get_album_info(const std::string &filename) throw (runtime_error)
70+albuminfo AlbumArtProvider::get_album_info(const std::string &filename) throw (runtime_error)
69{
71{
70 albuminfo ai;
72 albuminfo ai;
71 // FIXME: Need to do quoting. Files with %'s in their names seem to confuse gstreamer.
73 // FIXME: Need to do quoting. Files with %'s in their names seem to confuse gstreamer.
@@ -152,6 +154,8 @@ std::string AlbumArtProvider::get_lastfm_url(const albuminfo &ai) {
152 return "";
154 return "";
153 }
155 }
154
156
157+
158+
155 QXmlQuery query;
159 QXmlQuery query;
156 QBuffer tmp;
160 QBuffer tmp;
157 tmp.setData(reply->readAll());
161 tmp.setData(reply->readAll());
@@ -214,10 +218,10 @@ std::string AlbumArtProvider::get_image(const std::string &filename) {
214 info = get_album_info(filename);
218 info = get_album_info(filename);
215 } catch(std::exception &e) {
219 } catch(std::exception &e) {
216 qDebug() << "Could not determine album info: " << e.what();
220 qDebug() << "Could not determine album info: " << e.what();
217− return "";
221+ return DEFAULT_ALBUM_ART;
218 }
222 }
219 if(info.album.empty() || info.artist.empty()) {
223 if(info.album.empty() || info.artist.empty()) {
220− return "";
224+ return DEFAULT_ALBUM_ART;
221 }
225 }
222 if(cache.has_art(info.artist, info.album)) {
226 if(cache.has_art(info.artist, info.album)) {
223 // Image may have expired from cache between these two lines.
227 // Image may have expired from cache between these two lines.
@@ -226,7 +230,7 @@ std::string AlbumArtProvider::get_image(const std::string &filename) {
226 }
230 }
227 std::string image_url = get_lastfm_url(info);
231 std::string image_url = get_lastfm_url(info);
228 if(image_url.empty()) {
232 if(image_url.empty()) {
229− return "";
233+ return DEFAULT_ALBUM_ART;
230 }
234 }
231 char tmpname[] = "/tmp/path/to/some/file/somewhere/maybe.jpg";
235 char tmpname[] = "/tmp/path/to/some/file/somewhere/maybe.jpg";
232 tmpnam(tmpname);
236 tmpnam(tmpname);
plugins/Utils/albumartprovider.h+1
@@ -38,6 +38,7 @@ public:
38
38
39 std::string get_image(const std::string &filename);
39 std::string get_image(const std::string &filename);
40
40
41+ const static std::string DEFAULT_ALBUM_ART;
41private:
42private:
42 MediaArtCache cache;
43 MediaArtCache cache;
43
44