Scope canonical_rel_path and merge version-path annotations at link time (#194)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/database/mod.rs

@@ -323,10 +323,11 @@ impl FavoriteDao for SqliteFavoriteDao {
 
         let mut connection = self.connection.lock().expect("Unable to get FavoriteDao");
         // Favoriting a photo version favorites its original (#191).
-        let favorite_path = &version_dao::canonical_rel_path(connection.deref_mut(), favorite_path)
-            .ok()
-            .flatten()
-            .unwrap_or_else(|| favorite_path.to_string());
+        let favorite_path =
+            &version_dao::canonical_rel_path(connection.deref_mut(), None, favorite_path)
+                .ok()
+                .flatten()
+                .unwrap_or_else(|| favorite_path.to_string());
 
         if favorites
             .filter(userid.eq(user_id).and(rel_path.eq(&favorite_path)))
@@ -349,10 +350,11 @@ impl FavoriteDao for SqliteFavoriteDao {
         use schema::favorites::dsl::*;
 
         let mut connection = self.connection.lock().unwrap();
-        let favorite_path = version_dao::canonical_rel_path(connection.deref_mut(), &favorite_path)
-            .ok()
-            .flatten()
-            .unwrap_or(favorite_path);
+        let favorite_path =
+            version_dao::canonical_rel_path(connection.deref_mut(), None, &favorite_path)
+                .ok()
+                .flatten()
+                .unwrap_or(favorite_path);
         diesel::delete(favorites)
             .filter(userid.eq(user_id).and(rel_path.eq(favorite_path)))
             .execute(connection.deref_mut())