Merge pull request #15 from jely2002/1.8.0

1.8.0 Merge additional fixes in 1.8.0
jely2002 · Sep 28, 2020 · 4b3d278 · 4b3d278
2 parents e24013b + 2313af3
commit 4b3d278
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/main.js b/main.js
@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain, nativeImage, dialog, Menu, globalShortcut} = require('electron')
+const { app, BrowserWindow, ipcMain, nativeImage, dialog, Menu, globalShortcut, shell} = require('electron')
 const { autoUpdater } = require("electron-updater")
 const fs = require('fs')
 const mkdirp = require('mkdirp')
@@ -223,6 +223,10 @@ ipcMain.handle('titlebarClick', (event, arg) => {
     }
 })
 
+ipcMain.handle('showItemInFolder', (event, arg) => {
+    shell.showItemInFolder(arg)
+})
+
 //Check if user has enabled auto-updating the app
 function isUpdateEnabled() {
     let settingsPath

diff --git a/modules/UI.js b/modules/UI.js
@@ -220,15 +220,15 @@ function openDownloadedFile() {
     } else {
         if(mediaMode === "audio") {
             if(process.platform === "darwin" || process.platform === "linux") {
-                shell.showItemInFolder(downloadPath + '/' + audioOutputName.replace(/[//?%*:|"<>]/g, '_'))
+                ipcRenderer.invoke('showItemInFolder',  + '/' + audioOutputName.replace(/[//?%*:|"<>]/g, '_'))
             } else {
-                shell.showItemInFolder(downloadPath + '\\' + audioOutputName.replace(/[/\\?%*:|"<>]/g, '_'))
+                ipcRenderer.invoke('showItemInFolder',  + '\\' + audioOutputName.replace(/[/\\?%*:|"<>]/g, '_'))
             }
         } else {
             if(process.platform === "darwin" || process.platform === "linux") {
-                shell.showItemInFolder(downloadPath + '/' + videoOutputName.replace(/[//?%*:|"<>]/g, '_'))
+                ipcRenderer.invoke('showItemInFolder', downloadPath + '/' + videoOutputName.replace(/[//?%*:|"<>]/g, '_'))
             } else {
-                shell.showItemInFolder(downloadPath + '\\' + videoOutputName.replace(/[/\\?%*:|"<>]/g, '_'))
+                ipcRenderer.invoke('showItemInFolder', downloadPath + '\\' + videoOutputName.replace(/[/\\?%*:|"<>]/g, '_'))
             }
         }
     }
@@ -237,6 +237,7 @@ function openDownloadedFile() {
 //Stop/hide the progress bar for single videos
 function stopSingleVideoStatus() {
     $('.completion.download').html("Video downloaded")
+    $('.progress-bar.download').css("width", "100%").attr("aria-valuenow", "100")
 }
 
 //Start the progress bar for single videos