fix: leaks (#70)

\+ remove temp files

- disconnect props signals manually
- inline some thief functions (still don't get why they leak, maybe we should move to temp objects? they run in another thread anyway)
- clear player when destroying window
- remove running timeout from marquee when destroying
- fix animation callback target preventing widgets from being destroyed by moving to dummy property based callbacks

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

Author: GeopJr

src/Mpris/Entry.vala

@@ -163,6 +163,7 @@ public class Turntable.Mpris.Entry : GLib.Object {
 		users -= 1;
 		if (users > 0) return;
 
+		this.props.properties_changed.disconnect (on_props_changed);
 		this.props = null;
 		this.player = null;
 	}

src/Utils/Thief.vala

@@ -130,7 +130,7 @@ public class Turntable.Utils.Thief : GLib.Object {
 		}
 	}
 
-	private static void make_histogram_and_vbox (Gdk.Pixbuf pixbuf, out int[] histogram, out VBox vbox) {
+	private static inline void make_histogram_and_vbox (Gdk.Pixbuf pixbuf, out int[] histogram, out VBox vbox) {
 		histogram = new int[HISTOGRAM_SIZE];
 
 		uint8 r_min = uint8.MAX;
@@ -253,7 +253,7 @@ public class Turntable.Utils.Thief : GLib.Object {
 		return cut (axis, ref vbox, histogram, partial_sum, look_ahead_sum, total, out vbox1, out vbox2);
 	}
 
-	private static bool cut (ColorChannel axis, ref VBox vbox, int[] histogram, int[] partial_sum, int[] look_ahead_sum, int total, out VBox? vbox1, out VBox? vbox2) {
+	private static inline bool cut (ColorChannel axis, ref VBox vbox, int[] histogram, int[] partial_sum, int[] look_ahead_sum, int total, out VBox? vbox1, out VBox? vbox2) {
 		vbox1 = null;
 		vbox2 = null;
 

src/Views/Window.vala

@@ -17,6 +17,7 @@ public class Turntable.Views.Window : Adw.ApplicationWindow {
 	public string uuid { get; private set; }
 
 	~Window () {
+		update_player (null);
 		debug ("Destroying: %s", uuid);
 	}
 

src/Widgets/ControlsOverlay.vala

@@ -3,7 +3,7 @@ public class Turntable.Widgets.ControlsOverlay : Adw.Bin {
 	public Mpris.Entry? last_player { get; set; default = null; }
 
 	~ControlsOverlay () {
-		debug ("[ControlsOverlay] Destroying");
+		debug ("Destroying");
 	}
 
 	private void update_style (Widgets.Cover.Style style, Gtk.Orientation orientation) {
@@ -314,7 +314,7 @@ public class Turntable.Widgets.ControlsOverlay : Adw.Bin {
 	}
 
 	private void selection_changed () {
-		debug ("[ControlsOverlay] Changed player");
+		debug ("Changed player");
 		bool was_null = this.last_player == null;
 
 		if (client_dropdown.selected == Gtk.INVALID_LIST_POSITION) {

src/Widgets/Cover.vala

@@ -244,6 +244,7 @@ public class Turntable.Widgets.Cover : Gtk.Widget {
 					};
 					var in_stream = session.send (new Soup.Message ("GET", this.file_path), cancellable);
 					pixbuf = new Gdk.Pixbuf.from_stream (in_stream, cancellable);
+					in_stream.close ();
 				} else {
 					pixbuf = new Gdk.Pixbuf.from_file (clean_path);
 				}
@@ -304,17 +305,19 @@ public class Turntable.Widgets.Cover : Gtk.Widget {
 				return;
 			}
 
-			File tmp;
+			File? tmp = null;
 			try {
 				FileIOStream ios;
 				tmp = File.new_tmp (null, out ios);
 				this.texture.save_to_png (tmp.get_path ());
 			} catch {
+				delete_tmp_file (tmp);
 				stop_it (false);
 				return;
 			}
 
 			if (cancellable.is_cancelled ()) {
+				delete_tmp_file (tmp);
 				stop_it (false);
 				return;
 			}
@@ -325,6 +328,17 @@ public class Turntable.Widgets.Cover : Gtk.Widget {
 			} catch (Error e) {
 				debug ("Couldn't get pixbuf from temp file: %s", e.message);
 				stop_it (false);
+			} finally {
+				delete_tmp_file (tmp);
+			}
+		}
+
+		private inline void delete_tmp_file (File? file) {
+			if (file == null) return;
+			try {
+				file.delete ();
+			} catch (Error e) {
+				warning (@"Couldn't delete temp file: $(e.code) $(e.message)");
 			}
 		}
 
@@ -448,17 +462,20 @@ public class Turntable.Widgets.Cover : Gtk.Widget {
 		set_accessible_role (Gtk.AccessibleRole.NONE); // it's probably better if it doesn't get announced
 	}
 
-	private void animation_target_cb (double value) {
-		this.queue_draw ();
+	// fix leak
+	// callback animation target seems to leak
+	public double animation_cb {
+		set {
+			this.queue_draw ();
+		}
 	}
 
 	construct {
 		update_record_rects ();
 		this.overflow = Gtk.Overflow.HIDDEN;
 		this.notify["scale-factor"].connect (on_scale_factor_changed);
 
-		var target = new Adw.CallbackAnimationTarget (animation_target_cb);
-		animation = new Adw.TimedAnimation (this, 0.0, 1.0, 5000, target) {
+		animation = new Adw.TimedAnimation (this, 0.0, 1.0, 5000, new Adw.PropertyAnimationTarget (this, "animation-cb")) {
 			easing = Adw.Easing.LINEAR,
 			repeat_count = 0,
 			follow_enable_animations_setting = false // it's slow and opt-in

src/Widgets/Marquee.vala

@@ -59,12 +59,15 @@ public class Turntable.Widgets.Marquee : Gtk.Widget {
 		set_accessible_role (Gtk.AccessibleRole.LABEL);
 	}
 
-	private void animation_target_cb (double value) {
-		this.rotation_progress = (float) value;
+	uint animation_end_id = 0;
+	private void on_animation_end () {
+		animation_end_id = GLib.Timeout.add_once (1500, start_animation_once);
 	}
 
-	private void on_animation_end () {
-		GLib.Timeout.add_once (1500, start_animation);
+	private void start_animation_once () {
+		if (animation_end_id == 0) return;
+		animation_end_id = 0;
+		start_animation ();
 	}
 
 	private void start_animation () {
@@ -92,8 +95,7 @@ public class Turntable.Widgets.Marquee : Gtk.Widget {
 		label = new Gtk.Label ("");
 		label.set_parent (this);
 
-		var target = new Adw.CallbackAnimationTarget (animation_target_cb);
-		animation = new Adw.TimedAnimation (this, 0.0, 1.0, ANIMATION_DURATION, target) {
+		animation = new Adw.TimedAnimation (this, 0.0, 1.0, ANIMATION_DURATION, new Adw.PropertyAnimationTarget (this, "rotation-progress")) {
 			easing = Adw.Easing.EASE_IN_OUT_CUBIC
 		};
 		animation.done.connect (on_animation_end);
@@ -102,6 +104,8 @@ public class Turntable.Widgets.Marquee : Gtk.Widget {
 	~Marquee () {
 		debug ("Destroying");
 		label.unparent ();
+		if (animation_end_id != 0) GLib.Source.remove (animation_end_id);
+		animation_end_id = 0;
 	}
 
 	public override void measure (

src/Widgets/ProgressBin.vala

@@ -197,8 +197,12 @@ public class Turntable.Widgets.ProgressBin : Adw.Bin {
 		update_color ();
 	}
 
-	private void animation_target_cb (double value) {
-		this.queue_draw ();
+	// fix leak
+	// callback animation target seems to leak
+	public double animation_cb {
+		set {
+			this.queue_draw ();
+		}
 	}
 
 	construct {
@@ -216,8 +220,7 @@ public class Turntable.Widgets.ProgressBin : Adw.Bin {
 			};
 		}
 
-		var target = new Adw.CallbackAnimationTarget (animation_target_cb);
-		animation = new Adw.TimedAnimation (this, 0.0, 1.0, PROGRESS_UPDATE_TIME, target) {
+		animation = new Adw.TimedAnimation (this, 0.0, 1.0, PROGRESS_UPDATE_TIME, new Adw.PropertyAnimationTarget (this, "animation-cb")) {
 			easing = Adw.Easing.LINEAR
 		};
 

src/Widgets/Tonearm.vala

@@ -22,8 +22,12 @@ public class Turntable.Widgets.Tonearm : Adw.Bin {
 		debug ("Destroying");
 	}
 
-	private void animation_target_cb (double value) {
-		this.queue_draw ();
+	// fix leak
+	// callback animation target seems to leak
+	public double animation_cb {
+		set {
+			this.queue_draw ();
+		}
 	}
 
 	private int arm_height = 150;
@@ -98,8 +102,7 @@ public class Turntable.Widgets.Tonearm : Adw.Bin {
 	construct {
 		this.size = Views.Window.Size.REGULAR;
 
-		var target = new Adw.CallbackAnimationTarget (animation_target_cb);
-		animation = new Adw.TimedAnimation (this, 0.0, 1.0, PROGRESS_UPDATE_TIME, target) {
+		animation = new Adw.TimedAnimation (this, 0.0, 1.0, PROGRESS_UPDATE_TIME, new Adw.PropertyAnimationTarget (this, "animation-cb")) {
 			easing = Adw.Easing.LINEAR
 		};