[rhythmbox] webremote: try loading icons from resources first
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] webremote: try loading icons from resources first
- Date: Sat, 16 Apr 2022 08:21:36 +0000 (UTC)
commit e343c5f88888a3d0b53ba97017943d70d4fb3115
Author: Jonathan Matthew <jonathan d14n org>
Date: Sat Apr 16 18:16:19 2022 +1000
webremote: try loading icons from resources first
plugins/webremote/webremote.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/plugins/webremote/webremote.py b/plugins/webremote/webremote.py
index fcc231f03..2d6a4780d 100644
--- a/plugins/webremote/webremote.py
+++ b/plugins/webremote/webremote.py
@@ -467,7 +467,20 @@ class WebRemotePlugin(GObject.Object, Peas.Activatable):
msg.set_status(404)
return
- self.send_file_response(msg, icon.get_filename(), self.image_content_type)
+ iconfile = icon.get_filename()
+ try:
+ res = Gio.resources_lookup_data(iconfile, 0)
+ data = res.get_data()
+ content_type = self.image_content_type(data)
+ msg.set_response(content_type, Soup.MemoryUse.COPY, data)
+ msg.set_status(200)
+ except gi.repository.GLib.GError as ge:
+ # assume we couldn't find the resource, so try it as a filename
+ self.send_file_response(msg, icon.get_filename(), self.image_content_type)
+ except Exception as e:
+ sys.excepthook(*sys.exc_info())
+ msg.set_status(500)
+
def serve_static(self, msg, path, subdir, content_type):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]