@@ -67,13 +67,19 @@ pub struct CloudPull {
6767 pub favorites_order : Option < Vec < Uuid > > ,
6868}
6969
70+ struct ConnectionPlace {
71+ record_key : Option < ( i64 , String ) > ,
72+ order : u32 ,
73+ id : Uuid ,
74+ }
75+
7076// Unknown groups stay in the record cache for a newer reader to understand.
7177pub fn layout ( list : & ConnectionList , records : & CloudRecords , favorites_order : & [ Uuid ] ) -> ConnectionList {
7278 let groups = read_groups ( & records. groups ) ;
7379 let known: HashSet < Uuid > = groups. iter ( ) . map ( |group| group. id ) . collect ( ) ;
7480 let recorded = by_id ( & records. connections , |record| & record. connection_id ) ;
7581
76- let mut places: HashMap < Option < Uuid > , Vec < ( Option < ( i64 , String ) > , u32 , Uuid ) > > = HashMap :: new ( ) ;
82+ let mut places: HashMap < Option < Uuid > , Vec < ConnectionPlace > > = HashMap :: new ( ) ;
7783 let mut favorites: HashSet < Uuid > = HashSet :: new ( ) ;
7884 for saved in list. connections . iter ( ) {
7985 let record = recorded. get ( & saved. id ) ;
@@ -86,7 +92,11 @@ pub fn layout(list: &ConnectionList, records: &CloudRecords, favorites_order: &[
8692 let name = record. name . clone ( ) . unwrap_or_else ( || saved. name . clone ( ) ) ;
8793 ( sort_key ( record. sort_order ) , name)
8894 } ) ;
89- places. entry ( group) . or_default ( ) . push ( ( key, saved. order , saved. id ) ) ;
95+ places. entry ( group) . or_default ( ) . push ( ConnectionPlace {
96+ record_key : key,
97+ order : saved. order ,
98+ id : saved. id ,
99+ } ) ;
90100 let is_favorite = record. map_or_else ( || list. is_favorite ( saved. id ) , |record| favorite ( record. is_favorite ) ) ;
91101 if is_favorite {
92102 favorites. insert ( saved. id ) ;
@@ -95,14 +105,14 @@ pub fn layout(list: &ConnectionList, records: &CloudRecords, favorites_order: &[
95105
96106 let mut placed: HashMap < Uuid , ( Option < Uuid > , u32 ) > = HashMap :: new ( ) ;
97107 for ( group, mut members) in places {
98- members. sort_by ( |left, right| match ( & left. 0 , & right. 0 ) {
99- ( Some ( l) , Some ( r) ) => reads_before ( ( l. 0 , & l. 1 , left. 2 ) , ( r. 0 , & r. 1 , right. 2 ) ) ,
108+ members. sort_by ( |left, right| match ( & left. record_key , & right. record_key ) {
109+ ( Some ( l) , Some ( r) ) => reads_before ( ( l. 0 , & l. 1 , left. id ) , ( r. 0 , & r. 1 , right. id ) ) ,
100110 ( Some ( _) , None ) => std:: cmp:: Ordering :: Less ,
101111 ( None , Some ( _) ) => std:: cmp:: Ordering :: Greater ,
102- ( None , None ) => ( left. 1 , left. 2 ) . cmp ( & ( right. 1 , right. 2 ) ) ,
112+ ( None , None ) => ( left. order , left. id ) . cmp ( & ( right. order , right. id ) ) ,
103113 } ) ;
104- for ( ( _ , _ , id ) , rank) in members. into_iter ( ) . zip ( 0_u32 ..) {
105- placed. insert ( id, ( group, rank) ) ;
114+ for ( member , rank) in members. into_iter ( ) . zip ( 0_u32 ..) {
115+ placed. insert ( member . id , ( group, rank) ) ;
106116 }
107117 }
108118 let connections: Vec < SavedConnection > = list
@@ -160,7 +170,7 @@ fn changed<R: PartialEq>(base: &HashMap<Uuid, &R>, id: &str, record: &R) -> bool
160170 . is_none_or ( |held| * held != record)
161171}
162172
163- fn by_id < ' a , R > ( records : & ' a [ R ] , id : impl Fn ( & R ) -> & String ) -> HashMap < Uuid , & ' a R > {
173+ fn by_id < R > ( records : & [ R ] , id : impl Fn ( & R ) -> & String ) -> HashMap < Uuid , & R > {
164174 let mut found = HashMap :: with_capacity ( records. len ( ) ) ;
165175 for record in records {
166176 if let Some ( parsed) = record_id ( id ( record) ) {
0 commit comments