Fix duplications and extra search results on linux

mckennajones · Feb 2, 2017 · ecf81b0 · ecf81b0
1 parent f83f9d7
commit ecf81b0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/app/main/plugins/core/basic-apps/index.js b/app/main/plugins/core/basic-apps/index.js
@@ -4,19 +4,17 @@ import { search } from 'cerebro-tools'
 import uniq from 'lodash/uniq'
 import initializeAsync from './initializeAsync'
 
-const { openApp } = process.platform === 'win32'
+const { openApp, toString } = process.platform === 'win32'
   ? require('./windows')
   : require('./linux')
 
 let appsList = []
 
-const toString = (app) => `${app.name} ${app.filename}`
-
 const fn = ({ term, actions, display }) => {
   const result = search(appsList, term, toString).map(app => {
-    const { path, name, description } = app
+    const { id, path, name, description } = app
     return {
-      id: path,
+      id: id || path,
       title: name,
       term: name,
       subtitle: description || path,

diff --git a/app/main/plugins/core/basic-apps/linux.js b/app/main/plugins/core/basic-apps/linux.js
@@ -5,7 +5,12 @@ import uniq from 'lodash/uniq'
 import { shellCommand } from 'cerebro-tools'
 
 let appDirs = [
-  path.join(remote.app.getPath('home'), '.local', 'share')
+  path.join(remote.app.getPath('home'), '.local', 'share'),
+  path.join('usr', 'share'),
+  path.join('usr', 'share', 'ubuntu'),
+  path.join('usr', 'share', 'gnome'),
+  path.join('usr', 'local', 'share'),
+  path.join('var', 'lib', 'snapd', 'desktop')
 ]
 
 if (!!process.env.XDG_DATA_DIRS) {
@@ -42,6 +47,13 @@ const parseDesktopFile = (filePath, mapping) => {
   }, {})
 }
 
+const getId = (filePath) => {
+  const match = filePath.match(/\/applications\/(.+)$/)
+  return match ? match[1] : filePath
+}
+
+export const toString = (app) => app.name
+
 export const formatPath = (filePath) => {
   const parsedData = parseDesktopFile(filePath, {
     name: 'Name',
@@ -52,6 +64,7 @@ export const formatPath = (filePath) => {
   return {
     ...parsedData,
     filename,
+    id: getId(filePath),
     name: parsedData.name || filename.replace(/\.(desktop)/, ''),
     path: filePath
   }

diff --git a/app/main/plugins/core/basic-apps/windows.js b/app/main/plugins/core/basic-apps/windows.js
@@ -27,6 +27,8 @@ export const EXTENSIONS = ['lnk', 'exe']
 
 export const openApp = (appPath) => shell.openItem(appPath)
 
+export const toString = (app) => `${app.name} ${app.filename}`
+
 export const formatPath = (filePath) => ({
   ...parseFile(filePath),
   filename: path.basename(filePath),