dev: Add onMappingFinished callback for macos.

cosmin42 · Jan 17, 2025 · 624d27c · 624d27c
1 parent fcebcaf
commit 624d27c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 2 deletions.
diff --git a/osx/PhotoBook/PhotoBook/DashboardView.swift b/osx/PhotoBook/PhotoBook/DashboardView.swift
@@ -146,4 +146,9 @@ struct DashboardView: View, PhotobookUIListener {
             navigationPath.append("Table")
         }
     }
+
+    func onMappingFinished(root: String)
+    {
+
+    }
 }
diff --git a/osx/PhotoBook/PhotoBook/PhotoBookApp.swift b/osx/PhotoBook/PhotoBook/PhotoBookApp.swift
@@ -19,6 +19,11 @@ private var photobookUIListener: [PhotobookUIListener] = [];
     {
         photobookUIListener.last?.onMetadataUpdated(focusedName:focusedName)
     }
+
+    func onMappingFinished(_ root: String)
+    {
+        photobookUIListener.last?.onMappingFinished(root: root)
+    }
 }
 
 @objc extension NoirListenerWrapperCLevel
@@ -84,6 +89,7 @@ struct PhotoBookApp: App, PhotobookUIListener, NoirUIListener {
     // TODO: We don't need PhotobookUIListener here
     func onProjectRead() {}
     func onMetadataUpdated(focusedName: String) {}
+    func onMappingFinished(root: String) {}
     func onNoirLutAdded() {}
     func onNoirError() {}
 

diff --git a/osx/PhotoBook/PhotoBook/Photobook.h b/osx/PhotoBook/PhotoBook/Photobook.h
@@ -15,6 +15,7 @@
 @interface PhotobookListenerWrapperCLevel: NSObject
 - (void)onProjectRead;
 - (void)onMetadataUpdated:(NSString*)focusedName;
+- (void)onMappingFinished:(NSString*)root;
 @end
 
 @interface NoirListenerWrapperCLevel: NSObject

diff --git a/osx/PhotoBook/PhotoBook/Photobook.mm b/osx/PhotoBook/PhotoBook/Photobook.mm
@@ -60,7 +60,10 @@ void onExportFinished() override {}
     void onError(PBDev::Error) override {}
     void onStagedImageRemoved(std::vector<unsigned> removedIndexes) override {}
     void onMappingStarted(Path path) override {}
-    void onMappingFinished(Path path) override {}
+    void onMappingFinished(Path path) override {
+        NSString* managedRoot = [NSString stringWithUTF8String:path.string().c_str()];
+        [&mManagedListener onMappingFinished:managedRoot];
+    }
     void onMappingAborted(Path path) override {}
     void onCollageThumbnailsCreated() override {}
     void onImageUpdated(Path root, int row, int index) override {}
@@ -174,7 +177,10 @@ - (ProjectManagementServiceWrapper*) projectManagementService
 
 - (void) addImportFolder:(NSString*)root
 {
-    std::string nativeRoot = [root UTF8String];
+    NSURL *url = [NSURL URLWithString:root];
+    NSString *filePath = [url path];
+
+    std::string nativeRoot = [filePath UTF8String];
     mPhotobook->addImportFolder(nativeRoot);
 }
 

diff --git a/osx/PhotoBook/PhotoBook/PhotobookUIListener.swift b/osx/PhotoBook/PhotoBook/PhotobookUIListener.swift
@@ -9,4 +9,5 @@ protocol PhotobookUIListener
 {
     func onProjectRead()
     func onMetadataUpdated(focusedName: String)
+    func onMappingFinished(root: String)
 }
diff --git a/osx/PhotoBook/PhotoBook/TableContentView.swift b/osx/PhotoBook/PhotoBook/TableContentView.swift
@@ -268,5 +268,9 @@ struct TableContentView: View, PhotobookUIListener {
 
     func onProjectRead(){}
     func onMetadataUpdated(focusedName: String){}
+
+    func onMappingFinished(root: String){
+
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,4 +146,9 @@ struct DashboardView: View, PhotobookUIListener { @@
                 navigationPath.append("Table")
             }
         }
+        func onMappingFinished(root: String)
+        {
+        }
     }