Add action to open location after download

Signed-off-by: Seb Julliand <[email protected]>
codefori · Aug 23, 2024 · ad2b617 · ad2b617
1 parent f7acb72
commit ad2b617
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/src/locale/ids/de.json b/src/locale/ids/de.json
@@ -360,6 +360,7 @@
   "objectBrowser.uploadAndReplaceMemberAsFile.infoMessage": "Quelle wurde hochgeladen.",
   "offline": "Offline",
   "online": "Online",
+  "open":"Open",
   "open.service.configuration": "Konfiguration öffnen",
   "overview": "Überblick",
   "overwrite": "Überschreiben",

diff --git a/src/locale/ids/en.json b/src/locale/ids/en.json
@@ -360,6 +360,7 @@
   "objectBrowser.uploadAndReplaceMemberAsFile.infoMessage": "Member was uploaded.",
   "offline": "Offline",
   "online": "Online",
+  "open":"Open",
   "open.service.configuration": "Open configuration",
   "overview": "Overview",
   "overwrite": "Overwrite",

diff --git a/src/locale/ids/fr.json b/src/locale/ids/fr.json
@@ -359,7 +359,8 @@
   "objectBrowser.uploadAndReplaceMemberAsFile.errorMessage": "Erreur lors de l'upload du contenu du membre! {0}",
   "objectBrowser.uploadAndReplaceMemberAsFile.infoMessage": "Le membre a été uploadé.",
   "offline": "Hors ligne",
-  "online": "En ligne",
+  "online": "En ligne",  
+  "open":"Ouvrir",
   "open.service.configuration": "Ouvrir la configuration",
   "overview": "Aperçu",
   "overwrite": "Écraser",

diff --git a/src/locale/ids/no.json b/src/locale/ids/no.json
@@ -360,6 +360,7 @@
     "objectBrowser.uploadAndReplaceMemberAsFile.infoMessage": "Fil ble sendt til member.",
     "offline": "Offline",
     "online": "Online",
+    "open":"Open",
     "open.service.configuration": "Åpne konfigurasjon",
     "overview": "Oversikt",
     "overwrite": "Erstatt",

diff --git a/src/locale/ids/pl.json b/src/locale/ids/pl.json
@@ -360,6 +360,7 @@
     "objectBrowser.uploadAndReplaceMemberAsFile.infoMessage": "Podzbiór został wysłany.",
     "offline": "Nieaktywny",
     "online": "Online",
+    "open":"Open",
     "open.service.configuration": "Otwórz konfigurację",
     "overview": "Przeglądaj",
     "overwrite": "Nadpisz",

diff --git a/src/views/ifsBrowser.ts b/src/views/ifsBrowser.ts
@@ -805,7 +805,7 @@ export function initializeIFSBrowser(context: vscode.ExtensionContext) {
                 vscode.window.showInformationMessage(t(`clearedList`));
                 quickPick.show();
               } else {
-                quickPick.hide();                
+                quickPick.hide();
                 GlobalStorage.get().addPreviousFindTerm(findTerm);
                 await doFindStreamfiles(findTerm, findPath);
               }
@@ -825,24 +825,25 @@ export function initializeIFSBrowser(context: vscode.ExtensionContext) {
       if (ibmi) {
         const items = (nodes || [node]).filter(reduceIFSPath);
         const saveIntoDirectory = items.length > 1 || items[0].file.type === "directory";
-        let downloadLocation: string | undefined;
+        let downloadLocationURI: vscode.Uri | undefined;
         if (saveIntoDirectory) {
-          downloadLocation = (await vscode.window.showOpenDialog({
+          downloadLocationURI = (await vscode.window.showOpenDialog({
             canSelectMany: false,
             canSelectFiles: false,
             canSelectFolders: true,
             defaultUri: vscode.Uri.file(ibmi.getLastDownloadLocation())
-          }))?.[0]?.path;
+          }))?.[0];
         }
         else {
           const remoteFilepath = path.join(ibmi.getLastDownloadLocation(), path.basename(node.path));
-          downloadLocation = (await vscode.window.showSaveDialog({
+          downloadLocationURI = (await vscode.window.showSaveDialog({
             defaultUri: vscode.Uri.file(remoteFilepath),
             filters: { 'Streamfile': [extname(node.path).substring(1) || '*'] }
-          }))?.path;
+          }));
         }
 
-        if (downloadLocation) {
+        if (downloadLocationURI) {
+          const downloadLocation = downloadLocationURI.path;
           await ibmi.setLastDownloadLocation(saveIntoDirectory ? downloadLocation : dirname(downloadLocation));
           const increment = 100 / items.length;
           window.withProgress({ title: t('ifsBrowser.downloadStreamfile.downloading'), location: vscode.ProgressLocation.Notification }, async (task) => {
@@ -876,7 +877,8 @@ export function initializeIFSBrowser(context: vscode.ExtensionContext) {
                   await ibmi.downloadFile(downloadLocation!, targetPath);
                 }
               }
-              vscode.window.showInformationMessage(t(`ifsBrowser.downloadStreamfile.complete`));
+              vscode.window.showInformationMessage(t(`ifsBrowser.downloadStreamfile.complete`), t("open"))
+                .then(open => open ? vscode.commands.executeCommand('revealFileInOS', saveIntoDirectory ? vscode.Uri.joinPath(downloadLocationURI, path.basename(items[0].path)) : downloadLocationURI) : undefined);
             }
             catch (e) {
               vscode.window.showErrorMessage(t(`ifsBrowser.downloadStreamfile.errorMessage`, e));

diff --git a/src/views/objectBrowser.ts b/src/views/objectBrowser.ts
@@ -823,34 +823,34 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
       }
 
       const saveIntoDirectory = members.length > 1;
-      let downloadLocation: string | undefined;
+      let downloadLocationURI: vscode.Uri | undefined;
       if (saveIntoDirectory) {
-        downloadLocation = (await vscode.window.showOpenDialog({
+        downloadLocationURI = (await vscode.window.showOpenDialog({
           canSelectMany: false,
           canSelectFiles: false,
           canSelectFolders: true,
           defaultUri: vscode.Uri.file(connection.getLastDownloadLocation())
-        }))?.[0]?.path;
+        }))?.[0];
       }
       else {
-        downloadLocation = (await vscode.window.showSaveDialog({
+        downloadLocationURI = (await vscode.window.showSaveDialog({
           defaultUri: vscode.Uri.file(path.join(connection.getLastDownloadLocation(), members[0].name)),
           filters: { 'Source member': [members[0].extension || '*'] }
-        }))?.path;
+        }));
       }
 
-      if (downloadLocation) {
+      if (downloadLocationURI) {
         //Remove double entries and map to { path, copy } object
         const toBeDownloaded = members
           .filter((member, index, list) => list.findIndex(m => m.library === member.library && m.file === member.file && m.name === member.name) === index)
           .sort((m1, m2) => m1.name.localeCompare(m2.name))
           .map(member => ({ path: Tools.qualifyPath(member.library, member.file, member.name, member.asp), name: `${member.name}.${member.extension || "MBR"}`, copy: true }));
 
         if (!saveIntoDirectory) {
-          toBeDownloaded[0].name = basename(downloadLocation);
-          downloadLocation = dirname(downloadLocation);
+          toBeDownloaded[0].name = basename(downloadLocationURI.path);
         }
 
+        const downloadLocation = saveIntoDirectory ? downloadLocationURI.path : dirname(downloadLocationURI.path);
         await connection.setLastDownloadLocation(downloadLocation);
 
         //Ask what do to with existing files in the target directory
@@ -896,7 +896,8 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
 
               task.report({ message: t('objectBrowser.downloadMemberContent.download.streamfiles'), increment: 33 })
               await connection.downloadDirectory(downloadLocation!, directory);
-              vscode.window.showInformationMessage(t(`objectBrowser.downloadMemberContent.infoMessage`));
+              vscode.window.showInformationMessage(t(`objectBrowser.downloadMemberContent.infoMessage`), t("open"))
+                .then(open => open ? vscode.commands.executeCommand('revealFileInOS', saveIntoDirectory ? vscode.Uri.joinPath(downloadLocationURI, toBeDownloaded[0].name) : downloadLocationURI) : undefined);
             });
           } catch (e) {
             vscode.window.showErrorMessage(t(`objectBrowser.downloadMemberContent.errorMessage`, e));