feat: sandbox assets finding and optimizations (#6)

- DesktopAppInfo refuses to get desktop files from flatpak - even though it has access to them and is pointed to them
- get_sandboxed_icon_for_id get the keyfile and icon name manually and caches it
- Application tests if some sandboxed folders exist / are accessible and sets them to be later used by keyfile
- IconTheme gets some more folders for access from flatpak

Reviewed-on: https://codeberg.org/GeopJr/Turntable/pulls/6

Author: GeopJr

build-aux/dev.geopjr.Turntable.json

@@ -28,7 +28,11 @@
 		"--filesystem=~/.var/app/ca.edestcroix.Recordbox/data/Recordbox/:ro",
 		"--filesystem=~/.var/app/org.gnome.Rhythmbox3/cache/rhythmbox/album-art/:ro",
 		"--filesystem=~/.var/app/org.gnome.Lollypop/cache/lollypop/:ro",
-		"--filesystem=~/.cache/:ro"
+		"--filesystem=~/.cache/:ro",
+		"--filesystem=xdg-data/applications",
+		"--filesystem=~/.local/share/xdg-desktop-portal:ro",
+		"--filesystem=/var/lib/snapd/:ro",
+		"--filesystem=xdg-data/flatpak:ro"
     ],
     "build-options" : {
         "append-path" : "/usr/lib/sdk/vala/bin",
@@ -52,7 +56,8 @@
             "builddir" : true,
             "buildsystem" : "meson",
             "config-opts": [
-                "-Ddevel=true"
+                "-Ddevel=true",
+                "-Dsandboxed=true"
             ],
             "build-options": {
                 "arch": {

meson.build

@@ -70,12 +70,16 @@ asresources = gnome.compile_resources(
     c_name: 'as',
 )
 
+if get_option('sandboxed')
+  add_project_arguments(['--define=SANDBOXED'], language: 'vala')
+endif
+
 scrobbling = false
 libsoup_dep = dependency('libsoup-3.0', required: false)
 json_glib_dep = dependency('json-glib-1.0', version: '>=1.4.4', required: false)
 libsecret_dep = dependency('libsecret-1', required: false)
 
-if  get_option('scrobbling') and libsoup_dep.found () and json_glib_dep.found () and libsecret_dep.found ()
+if get_option('scrobbling') and libsoup_dep.found () and json_glib_dep.found () and libsecret_dep.found ()
   scrobbling = true
   add_project_arguments(['--define=SCROBBLING'], language: 'vala')
 endif

meson_options.txt

@@ -1,5 +1,6 @@
 option('devel', type: 'boolean', value: false)
 option('scrobbling', type: 'boolean', value: true)
+option('sandboxed', type: 'boolean', value: false)
 
 # Distros need to fill these for last.fm to work.
 # You can get a key on https://www.last.fm/api/account/create

src/Application.vala

@@ -1,10 +1,12 @@
 namespace Turntable {
-	public static bool is_flatpak = false;
 	public static Mpris.Manager mpris_manager;
 	public const int PROGRESS_UPDATE_TIME = 1000; // it was 250ms, turns out it updates every second?
 	public static Application application;
 	public static bool debug_enabled = false;
 	public static bool is_rtl = false;
+	#if SANDBOXED
+		public static string[]? desktop_file_dirs = null;
+	#endif
 
 	//  public static Utils.Cache custom_color_cache;
 	public static Utils.Settings settings;
@@ -13,6 +15,7 @@ namespace Turntable {
 		public static Scrobbling.AccountManager account_manager;
 		public static bool cli_list_clients = false;
 		public static string cli_client_id_scrobble;
+		public static bool cli_mode = false;
 	#endif
 	public class Application : Adw.Application {
 		#if SCROBBLING
@@ -32,10 +35,14 @@ namespace Turntable {
 			{ "quit", quit }
 		};
 
-		string troubleshooting = "os: %s %s\nprefix: %s\nflatpak: %s\nversion: %s (%s)\ngtk: %u.%u.%u (%d.%d.%d)\nlibadwaita: %u.%u.%u (%d.%d.%d)\ndebug-logs: %s\nscrobbling: %s".printf (
+		string troubleshooting = "os: %s %s\nprefix: %s\nsandboxed: %s\nversion: %s (%s)\ngtk: %u.%u.%u (%d.%d.%d)\nlibadwaita: %u.%u.%u (%d.%d.%d)\ndebug-logs: %s\nscrobbling: %s".printf (
 			GLib.Environment.get_os_info ("NAME"), GLib.Environment.get_os_info ("VERSION"),
 			Build.PREFIX,
-			Turntable.is_flatpak.to_string (),
+			#if SANDBOXED
+				"true",
+			#else
+				"false",
+			#endif
 			Build.VERSION, Build.PROFILE,
 			Gtk.get_major_version (), Gtk.get_minor_version (), Gtk.get_micro_version (),
 			Gtk.MAJOR_VERSION, Gtk.MINOR_VERSION, Gtk.MICRO_VERSION,
@@ -48,7 +55,7 @@ namespace Turntable {
 					Soup.MAJOR_VERSION, Soup.MINOR_VERSION, Soup.MICRO_VERSION,
 					Json.MAJOR_VERSION, Json.MINOR_VERSION, Json.MICRO_VERSION,
 					Secret.MAJOR_VERSION, Secret.MINOR_VERSION, Secret.MICRO_VERSION,
-					@"$(cli_list_clients || cli_client_id_scrobble != null)"
+					cli_mode.to_string ()
 				)
 			#else
 				"false"
@@ -81,6 +88,18 @@ namespace Turntable {
 			this.add_action_entries (APP_ENTRIES, this);
 			this.set_accels_for_action ("app.quit", {"<primary>q"});
 			this.set_accels_for_action ("app.new-window", {"<primary>n"});
+
+			#if SANDBOXED
+				var display = Gdk.Display.get_default ();
+				if (display != null) {
+					string home = GLib.Environment.get_home_dir ();
+					var theme = Gtk.IconTheme.get_for_display (display);
+					theme.add_search_path (@"$home/.local/share/icons");
+					theme.add_search_path (@"$home/.local/share/flatpak/exports/share/icons");
+					theme.add_search_path ("/var/lib/snapd/desktop/icons");
+					theme.add_search_path ("/var/lib/flatpak/exports/share/icons");
+				}
+			#endif
 		}
 
 		public static int main (string[] args) {
@@ -102,15 +121,44 @@ namespace Turntable {
 			Intl.textdomain (Build.GETTEXT_PACKAGE);
 
 			debug_enabled = !GLib.Log.writer_default_would_drop (GLib.LogLevelFlags.LEVEL_DEBUG, "Turntable");
-			is_flatpak = GLib.Environment.get_variable ("FLATPAK_ID") != null || GLib.File.new_for_path ("/.flatpak-info").query_exists ();
 			GLib.Environment.unset_variable ("GTK_THEME");
+
+			#if SCROBBLING
+				cli_mode = cli_list_clients || cli_client_id_scrobble != null;
+			#endif
+
+			#if SANDBOXED
+				#if SCROBBLING
+					if (!cli_mode)
+				#endif
+				{
+					string[] temp_dirs = {};
+					string home = GLib.Environment.get_home_dir ();
+					string[] def_dirs = {
+						"/usr/share/applications",
+						@"$home/.local/share/applications",
+						"/var/lib/flatpak/exports/share/applications",
+						@"$home/.local/share/flatpak/exports/share/applications",
+						"/var/lib/snapd/desktop/applications"
+					};
+
+					foreach (string path in def_dirs) {
+						if (GLib.FileUtils.test (path, GLib.FileTest.IS_DIR)) {
+							temp_dirs += path;
+						}
+					}
+
+					desktop_file_dirs = temp_dirs;
+				}
+			#endif
+
 			mpris_manager = new Mpris.Manager ();
-			application = new Application ();
 
 			#if SCROBBLING
-				if (cli_list_clients || cli_client_id_scrobble != null) return (new Utils.CLI ()). run ();
+				if (cli_mode) return (new Utils.CLI ()).run ();
 			#endif
 
+			application = new Application ();
 			return application.run (args);
 		}
 

src/Mpris/Entry.vala

@@ -54,6 +54,25 @@ public class Turntable.Mpris.Entry : GLib.Object {
 		}
 	}
 
+	#if SANDBOXED
+		GLib.HashTable<string, string> cached_desktop_icons = new GLib.HashTable<string, string> (str_hash, str_equal);
+		private string get_sandboxed_icon_for_id (string id) {
+			if (cached_desktop_icons.contains (id)) return cached_desktop_icons.get (id);
+
+			string icon = "application-x-executable-symbolic";
+			try {
+				var key_file = new GLib.KeyFile ();
+				if (key_file.load_from_dirs (@"$id.desktop", desktop_file_dirs, null, GLib.KeyFileFlags.NONE)) {
+					var icon_key = key_file.get_string ("Desktop Entry", "Icon");
+					if (icon_key != null) icon = icon_key;
+				}
+			} catch {}
+
+			cached_desktop_icons.set (id, icon);
+			return icon;
+		}
+	#endif
+
 	public Entry (string name, DesktopBus.Mpris.MediaPlayer2 media_player) {
 		this.bus_namespace = name;
 		parent_bus_namespace = name;
@@ -62,12 +81,22 @@ public class Turntable.Mpris.Entry : GLib.Object {
 			parent_bus_namespace = @"org.mpris.MediaPlayer2.$(namespace_parts[0]).$(namespace_parts[1]).$(namespace_parts[2])";
 		}
 
-		var app_info = media_player.desktop_entry == null ? null : new GLib.DesktopAppInfo (@"$(media_player.desktop_entry).desktop");
 		string icon = "application-x-executable-symbolic";
-		if (app_info != null) {
-			var app_icon = app_info.get_icon ();
-			if (app_icon != null) icon = app_icon.to_string ();
-		}
+		#if SCROBBLING
+			if (!cli_mode) {
+		#endif
+			#if SANDBOXED
+				icon = get_sandboxed_icon_for_id (media_player.desktop_entry);
+			#else
+				var app_info = media_player.desktop_entry == null ? null : new GLib.DesktopAppInfo (@"$(media_player.desktop_entry).desktop");
+				if (app_info != null) {
+					var app_icon = app_info.get_icon ();
+					if (app_icon != null) icon = app_icon.to_string ();
+				}
+			#endif
+		#if SCROBBLING
+			}
+		#endif
 
 		this.client_info = {
 			media_player.identity,