macOS: Revealing files of an identity

Finder is accessed via AppleScript.

5 files changed, 60 insertions, 3 deletions

diff --git a/src/app.c b/src/app.c
index 78aae9a9..b8909306 100644
--- a/src/app.c
+++ b/src/app.c
@@ -812,3 +812,36 @@ void openInDefaultBrowser_App(const iString *url) {
     start_Process(proc);
     iRelease(proc);
 }
+
+void revealPath_App(const iString *path) {
+#if defined (iPlatformApple)
+    const char *scriptPath = concatPath_CStr(dataDir_App_, "revealfile.scpt");
+    iFile *f = newCStr_File(scriptPath);
+    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+        /* AppleScript to select a specific file. */
+        write_File(f, collect_Block(newCStr_Block("on run argv\n"
+                                                  "  tell application \"Finder\"\n"
+                                                  "    activate\n"
+                                                  "    reveal POSIX file (item 1 of argv) as text\n"
+                                                  "  end tell\n"
+                                                  "end run\n")));
+        close_File(f);
+        iProcess *proc = new_Process();
+        setArguments_Process(
+            proc,
+            iClob(newStringsCStr_StringList(
+                "/usr/bin/osascript", scriptPath, cstr_String(path), NULL)));
+        start_Process(proc);
+        iRelease(proc);
+    }
+    iRelease(f);
+#elif defined (iPlatformLinux)
+    {
+        String path = (fileOrFolder.isDirectory() ? fileOrFolder.toString()
+                                                  : fileOrFolder.fileNamePath().toString());
+        CommandLine({"/usr/bin/xdg-open", path}).execute();
+    }
+#else
+    iAssert(0 /* File revealing not implemented on this platform */);
+#endif
+}
diff --git a/src/app.h b/src/app.h
index 1a6b7fe5..09c60c0f 100644
--- a/src/app.h
+++ b/src/app.h
@@ -76,3 +76,4 @@ iLocalDef void postCommandString_App(const iString *command) {
 }
 
 void        openInDefaultBrowser_App    (const iString *url);
+void        revealPath_App              (const iString *path);
diff --git a/src/gmcerts.c b/src/gmcerts.c
index 3c10fff2..09728414 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -448,11 +448,18 @@ iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const
     return id;
 }
 
-void deleteIdentity_GmCerts(iGmCerts *d, iGmIdentity *identity) {
-    /* Only delete the files if we created them. */
+static const char *certPath_GmCerts_(const iGmCerts *d, const iGmIdentity *identity) {
     if (!(identity->flags & (temporary_GmIdentityFlag | imported_GmIdentityFlag))) {
         const char *finger   = cstrCollect_String(hexEncode_Block(&identity->fingerprint));
-        const char *filename = concatPath_CStr(cstr_String(&d->saveDir), format_CStr("idents/%s", finger));
+        return concatPath_CStr(cstr_String(&d->saveDir), format_CStr("idents/%s", finger));
+    }
+    return NULL;
+}
+
+void deleteIdentity_GmCerts(iGmCerts *d, iGmIdentity *identity) {
+    /* Only delete the files if we created them. */
+    const char *filename = certPath_GmCerts_(d, identity);
+    if (filename) {
         remove(format_CStr("%s.crt", filename));
         remove(format_CStr("%s.key", filename));
     }
@@ -460,6 +467,15 @@ void deleteIdentity_GmCerts(iGmCerts *d, iGmIdentity *identity) {
     collect_GmIdentity(identity);
 }
 
+const iString *certificatePath_GmCerts(const iGmCerts *d, const iGmIdentity *identity) {
+    const char *filename = certPath_GmCerts_(d, identity);
+    if (filename) {
+        return collectNewFormat_String("%s.crt", filename);
+    }
+    return NULL;
+}
+
 const iPtrArray *identities_GmCerts(const iGmCerts *d) {
     return &d->idents;
 }
+
diff --git a/src/gmcerts.h b/src/gmcerts.h
index 37419b9e..db1a6200 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -75,6 +75,8 @@ iGmIdentity *       newIdentity_GmCerts     (iGmCerts *, int flags, iDate validU
 
 void                deleteIdentity_GmCerts  (iGmCerts *, iGmIdentity *identity);
 
+const iString *     certificatePath_GmCerts (const iGmCerts *, const iGmIdentity *identity);
+
 iGmIdentity *       identity_GmCerts        (iGmCerts *, unsigned int id);
 const iGmIdentity * constIdentity_GmCerts   (const iGmCerts *, unsigned int id);
 const iGmIdentity * identityForUrl_GmCerts  (const iGmCerts *, const iString *url);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 19886964..25fa3f6a 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -635,6 +635,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             return iTrue;
         }
         else if (isCommand_Widget(w, ev, "ident.reveal")) {
+            const iString *crtPath =
+                certificatePath_GmCerts(certs_App(), constHoverIdentity_SidebarWidget_(d));
+            if (crtPath) {
+                revealPath_App(crtPath);
+            }
             return iTrue;
         }
         else if (equal_Command(cmd, "ident.delete")) {