changes

Build photosorcery on windows Change name file because doens't works on windows Fixed globalshortcut for windows
dawnlabs · May 25, 2017 · 66a831d · 66a831d
1 parent 8415914
commit 66a831d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/bin/photosorcery.exe b/bin/photosorcery.exe
diff --git a/src/api.js b/src/api.js
@@ -28,6 +28,10 @@ module.exports = {
   },
 
   init (appPath) {
-    binary = `${appPath}/bin/photosorcery`
+    if (process.platform === 'win32') {
+      binary = `${appPath}/bin/photosorcery.exe`
+    } else {
+      binary = `${appPath}/bin/photosorcery`
+    }
   }
 }
diff --git a/src/helpers/configure.js b/src/helpers/configure.js
@@ -1,7 +1,7 @@
 const { globalShortcut } = require('electron')
 
 module.exports = function(mb) {
-  globalShortcut.register('Command+Shift+8', () => {
+  globalShortcut.register('CommandOrControl+Shift+8', () => {
     if (mb.window && mb.window.isVisible()) mb.hideWindow()
     else mb.showWindow()
   })

diff --git a/src/helpers/util.js b/src/helpers/util.js
@@ -1,16 +1,15 @@
 const { pluck, compose, map } = require('./functional')
 const { fileTypes } = require('./constants')
+const pathNode = require('path')
 
 const replaceSpaceCharacters = str =>
   str.replace(/\s/g, '\\ ')
      .replace(/'/g, '\\\'')
 
 const concatFiles = files =>
   files.map(path => path.split('/').pop())
-       .map(file => file.split('.')[0])
-       .map(file => file.substr(0, 10))
+       .map(file => pathNode.basename(file, pathNode.extname(file)))
        .join('_')
-       .replace(/\s/g, '')
        .substr(0, 50)
 
 const filterImages = files => files.filter(file => file.type.includes('image'))