Merge pull request #28 from rolandbernard/devel

v0.0.19
rolandbernard · Feb 25, 2021 · b583b5f · b583b5f
2 parents 6dab27c + 723239f
commit b583b5f
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 326 deletions.
diff --git a/README.md b/README.md
@@ -99,7 +99,8 @@ This module allows you to find open windows.
 ![screenshot](assets/linux_windows.png)
 
 #### Google Translate
-This module allows you to translate text by using Google Translate in a headless window.
+This module was removed with version 0.0.19 because google changed their website
+and the module no longer works. It might be added back in a future release.
 
 ![screenshot](assets/google_translate.png)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "marvin",
-    "version": "0.0.18",
+    "version": "0.0.19",
     "license": "MIT",
     "scripts": {
         "dev": "electron-webpack dev",

diff --git a/src/common/local/english.js b/src/common/local/english.js
@@ -113,6 +113,7 @@ const TRANSLATION_ENGLISH = {
     history: 'History',
     history_description: 'This module allows you to execute recent options again',
     searchable: 'Searchable',
+    sort_by_frequency: 'Sort by frequency',
 
     color: 'Color',
     color_description: 'This module allows you to convert colors between hex/rgb/hsl',

diff --git a/src/common/local/german.js b/src/common/local/german.js
@@ -110,6 +110,7 @@ const TRANSLATION_GERMAN = {
     history: 'Verlauf',
     history_description: 'Dieses Modul erlaub es Optionen erneut auszuführen',
     searchable: 'Durchsuchbar',
+    sort_by_frequency: 'Sortieren nach Häufigkeit',
 
     color: 'Farben',
     color_description: 'Mit diesem Modul ist es möglich Farben zwischen hex/rgb/hsl unzuwandeln',

diff --git a/src/common/local/italian.js b/src/common/local/italian.js
@@ -110,6 +110,7 @@ const TRANSLATION_ITALIAN = {
     history: 'Cronologia',
     history_description: 'Questo modulo consente di eseguire nuovamente le opzioni',
     searchable: 'Cercabile',
+    sort_by_frequency: 'Ordina per frequenza',
 
     color: 'Colori',
     color_description: 'Questo modulo ti consente di convertite colori tra hex/rgb/hsl',

diff --git a/src/main/config.js b/src/main/config.js
@@ -104,11 +104,6 @@ export const CONFIG_DEFAULT = {
             active: false,
             prefix: '',
         },
-        google_translate: {
-            active: false,
-            prefix: '',
-            quality: 1.0,
-        },
         duckduckgo: {
             active: false,
             prefix: '',
@@ -122,6 +117,7 @@ export const CONFIG_DEFAULT = {
             prefix: '',
             quality: 0.1,
             maximum_history: 1000,
+            sort_by_frequency: false,
         },
         color: {
             active: false,

diff --git a/src/main/executor.js b/src/main/executor.js
@@ -15,7 +15,6 @@ import ScriptsModule from "./modules/scripts";
 import ClipboardModule from "./modules/clipboard";
 import DeeplModule from "./modules/deepl";
 import LinuxWindowsModule from "./modules/linux-windows";
-import GoogleTranslateModule from "./modules/google-translate";
 import DuckduckgoModule from "./modules/duckduckgo";
 import HistoryModule from "./modules/history";
 import ColorModule from "./modules/color";
@@ -42,7 +41,6 @@ const MODULES = {
     clipboard: ClipboardModule,
     deepl: DeeplModule,
     linux_windows: LinuxWindowsModule,
-    google_translate: GoogleTranslateModule,
     duckduckgo: DuckduckgoModule,
     history: HistoryModule,
     color: ColorModule,

diff --git a/src/main/modules/google-translate.js b/src/main/modules/google-translate.js
diff --git a/src/main/modules/history.js b/src/main/modules/history.js
@@ -43,7 +43,7 @@ const HistoryModule = {
             return execute_history.map((option) => ({
                 ...option,
                 quality: config.modules.history.quality
-            })).sort((a, b) => b.history_frequency - a.history_frequency);
+            })).sort((a, b) => config.modules.history.sort_by_frequency ? b.history_frequency - a.history_frequency : 0);
         } else {
             return execute_history.map((option, i) => {
                 let quality = Math.max(
@@ -56,7 +56,7 @@ const HistoryModule = {
                     ...option,
                     quality: Math.min(1.0, quality + quality / (i + 1)),
                 };
-            }).sort((a, b) => b.history_frequency - a.history_frequency);
+            }).sort((a, b) => config.modules.history.sort_by_frequency ? b.history_frequency - a.history_frequency : 0);
         }
     },
     globalExecute: async (option) => {