Merge: origin's sync ordering and adoption work, its scan-complete trigger ported into library_ui/

ui/dr-ui/src/library_ui/open.rs

@@ -23,7 +23,7 @@ use crate::{AppWindow, Library, View};
 use super::controller::{stop, LibraryController};
 use super::offline::refresh_offline;
 use super::ratings_keywords::refresh_xmp_conflicts;
-use super::sync::start_sweep;
+use super::sync::{start_derived_sync, start_sweep};
 use super::timeline::{apply_place, note_place};
 use super::window::{load_window, window_start};
 
@@ -494,6 +494,15 @@ fn drain_scan(
                                     }
                                 }
                                 load_window(&w, ctl);
+                                // Take the server's shards and catalog *now*,
+                                // before the sweep: the rows they key on exist
+                                // from this moment, and on a fresh device
+                                // every thumbnail, face and collection a peer
+                                // has already made is on the server. Waiting
+                                // for the sweep — hours on a large library —
+                                // meant re-deriving all of it here first. In
+                                // steady state this is one listing.
+                                start_derived_sync(&w, ctl);
                                 // Everything the grid did not touch: the rest
                                 // of the library gets a thumbnail and a date,
                                 // so the timeline describes all of it rather