From 6754e9653f8d5c4e034af37a0546ffba7ca9d914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Wed, 29 Nov 2023 18:54:58 +0100
Subject: [PATCH] session-list: Make sure sessions are always listed in the
 same order

---
 src/session_list/mod.rs                   | 22 ++++++++++++++++++++--
 src/session_list/session_list_settings.rs |  7 ++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/session_list/mod.rs b/src/session_list/mod.rs
index ecc95f36..bee364af 100644
--- a/src/session_list/mod.rs
+++ b/src/session_list/mod.rs
@@ -1,3 +1,5 @@
+use std::cmp::Ordering;
+
 use gettextrs::gettext;
 use gtk::{gio, glib, glib::clone, prelude::*, subclass::prelude::*};
 use indexmap::map::IndexMap;
@@ -233,8 +235,24 @@ impl SessionList {
 
         let handle = spawn_tokio!(secret::restore_sessions());
         match handle.await.unwrap() {
-            Ok(sessions) => {
-                self.settings().load();
+            Ok(mut sessions) => {
+                let settings = self.settings();
+                settings.load();
+                let session_ids = settings.session_ids();
+
+                // Keep the order from the settings.
+                sessions.sort_by(|a, b| {
+                    let pos_a = session_ids.get_index_of(a.id());
+                    let pos_b = session_ids.get_index_of(b.id());
+
+                    match (pos_a, pos_b) {
+                        (Some(pos_a), Some(pos_b)) => pos_a.cmp(&pos_b),
+                        // Keep unknown sessions at the end.
+                        (Some(_), None) => Ordering::Greater,
+                        (None, Some(_)) => Ordering::Less,
+                        _ => Ordering::Equal,
+                    }
+                });
 
                 for stored_session in sessions {
                     info!(
diff --git a/src/session_list/session_list_settings.rs b/src/session_list/session_list_settings.rs
index e646c3a6..0268269d 100644
--- a/src/session_list/session_list_settings.rs
+++ b/src/session_list/session_list_settings.rs
@@ -1,5 +1,5 @@
 use gtk::{glib, prelude::*, subclass::prelude::*};
-use indexmap::IndexMap;
+use indexmap::{IndexMap, IndexSet};
 use tracing::error;
 
 use crate::{
@@ -105,6 +105,11 @@ impl SessionListSettings {
         self.imp().sessions.borrow_mut().remove(session_id);
         self.save();
     }
+
+    /// Get the list of session IDs stored in these settings.
+    pub fn session_ids(&self) -> IndexSet<String> {
+        self.imp().sessions.borrow().keys().cloned().collect()
+    }
 }
 
 impl Default for SessionListSettings {