store version of local .desktop file

Co-Authored-By: binarynoise <[email protected]>

Author: Joshix-1

background.js

@@ -1,20 +1,43 @@
 "use strict";
 
-// noinspection ES6ConvertVarToLetConst; will set the variable undefined to undefined if already existing
+// change this when mpv-scheme-handler.desktop changes
+const desktopFileVersion = 2;
+let locallyInstalledVersion = null;
+
+// noinspection ES6ConvertVarToLetConst; will set the variable undefined to undefined if not already existing
 var browser, chrome;
 const isChrome = !browser;
 browser = browser || chrome;
 
 const menus = browser.menus || browser.contextMenus;
 
-function openInMpv(url) {
+async function openInMpv(url) {
     const mpvUrl = `mpv://watch#${url}`;
 
-    browser.tabs.update({ url: mpvUrl }).then(() => {
-        console.debug("navigating to:", mpvUrl);
-    }, (error) => {
-        console.debug("failed " + mpvUrl, error);
-    });
+    const alreadySavedDesktop = await localDesktopFileVersionIsCurrent();
+    if (alreadySavedDesktop) {
+        await browser.tabs.update({ url: mpvUrl }).then(() => {
+            console.debug("navigating to:", mpvUrl);
+        }, (error) => {
+            console.debug("failed " + mpvUrl, error);
+        });
+    } else {
+        await askToInstall();
+        await saveCurrentDesktopFileVersion();
+    }
+}
+
+async function localDesktopFileVersionIsCurrent() {
+    const key = Object.keys({ desktopFileVersion })[0];
+    const savedVersion = locallyInstalledVersion === null ? (await browser.storage.local.get(key))[key] : locallyInstalledVersion;
+    console.debug({ savedVersion, deskCache: locallyInstalledVersion, key });
+    locallyInstalledVersion = savedVersion;
+    return savedVersion === desktopFileVersion;
+}
+
+async function saveCurrentDesktopFileVersion() {
+    locallyInstalledVersion = desktopFileVersion;
+    return await browser.storage.local.set({ desktopFileVersion });
 }
 
 menus.create({
@@ -31,15 +54,19 @@ menus.onClicked.addListener((info, tab) => {
     switch (info.menuItemId) {
         case "openInMpv":
             const url = info.linkUrl || info.srcUrl || info.selectionText || info.frameUrl || info.pageUrl;
-            if (url) openInMpv(url); else console.debug({ info: info, tab: tab });
+            if (url) return openInMpv(url); else console.debug({ info: info, tab: tab });
             break;
     }
 });
 
 browser.action.onClicked.addListener((tab) => {
-    openInMpv(tab.url);
+    return openInMpv(tab.url);
 });
 
+function askToInstall() {
+    return browser.tabs.create({ url: "setup.sh" });
+}
+
 const filter = {
     url: [{
         schemes: ["mpv", "mpvx"],
@@ -60,7 +87,7 @@ if (!isChrome) {
             console.debug("onErrorOccurred");
             console.debug(details);
 
-            browser.tabs.create({ url: "setup.sh" });
+            askToInstall();
         }
     }, filter);
 }

manifest-chrome.json

@@ -26,6 +26,7 @@
     "permissions": [
         "contextMenus",
         "activeTab",
+        "storage",
         "webNavigation"
     ]
 }

manifest.json

@@ -28,6 +28,7 @@
     "permissions": [
         "menus",
         "activeTab",
+        "storage",
         "webNavigation"
     ],
     "browser_specific_settings": {

mpv-scheme-handler.desktop

@@ -11,3 +11,5 @@ Comment=Launch MPV
 Hidden=false
 
 # copy to ~/.local/share/applications/mpv-scheme-handler.desktop
+# Version 2
+# update this version in background.js and open-in-mpv.plugin.js

open-in-mpv.plugin.js

@@ -6,8 +6,14 @@
  */
 
 'use strict';
+const electron = require('electron');
 
-const settings = { showAgain: true };
+// change this when mpv-scheme-handler.desktop changes
+const desktopFileVersion = 2;
+
+const settings = {
+    locallyInstalledVersion: null
+};
 
 const MPVSchemePrefix = "mpv://watch#";
 
@@ -21,33 +27,30 @@ function contextMenuPatch(tree, context) {
         tree.props.children.push(BdApi.ContextMenu.buildItem({
             type: "text", label: "open in mpv", action: () => {
                 console.log("link is " + href);
-                const electron = require('electron');
-
-                electron.shell.openExternal(MPVSchemePrefix + href).then(() => {
-                    if (settings.showAgain !== false) {
-                        BdApi.UI.showConfirmationModal("Open in mpv",
-                            "Successfully opened " + href + " in mpv. Did nothing happen? Download and run setup.sh",
-                            {
-                                confirmText: "Download setup.sh", onConfirm: () => {
-                                    electron.shell.openExternal('https://raw.githubusercontent.com/binarynoise/open-in-mpv/main/setup.sh');
-                                },
-
-                                cancelText: "Ok, don't show again", onCancel: () => {
-                                    settings.showAgain = false;
-                                    BdApi.Data.save("open-in-mpv", "settings", settings);
-                                },
-                            })
-                    } else {
+
+                if (settings.locallyInstalledVersion && settings.locallyInstalledVersion >= desktopFileVersion) {
+
+                    electron.shell.openExternal(MPVSchemePrefix + href).then(() => {
                         BdApi.UI.showToast("" + href + " opened in mpv.", { type: "success" });
-                    }
-                    console.log("success");
-                }, (error) => {
-                    console.log(`failed to open ${MPVSchemePrefix}href`);
-                    console.log(error);
-                }).catch((error) => {
-                    console.log(`failed to open ${MPVSchemePrefix}href`);
-                    console.log(error);
-                })
+                        console.log("success");
+                    }, (error) => {
+                        console.log(`failed to open ${MPVSchemePrefix}href`);
+                        console.log(error);
+                    }).catch((error) => {
+                        console.log(`failed to open ${MPVSchemePrefix}href`);
+                        console.log(error);
+                    })
+                } else {
+                    BdApi.UI.showConfirmationModal("Open in mpv",
+                        "Open in mpv was updated or freshly installed. Please download and run setup.sh (again).",
+                        {
+                            confirmText: "Download setup.sh", onConfirm: () => {
+                                electron.shell.openExternal("https://raw.githubusercontent.com/binarynoise/open-in-mpv/main/setup.sh");
+                                settings.locallyInstalledVersion = desktopFileVersion;
+                                BdApi.Data.save("open-in-mpv", "settings", settings);
+                            },
+                        })
+                }
             },
         }))
     }
@@ -89,7 +92,7 @@ module.exports = () => ({
         BdApi.ContextMenu.patch("message", contextMenuPatch);
     }, stop() {
         BdApi.ContextMenu.unpatch("message", contextMenuPatch);
-    }, getSettingsPanel: () => React.createElement(SettingComponent),
+    }, //getSettingsPanel: () => React.createElement(SettingComponent),
 });
 
 function isEmpty(obj) {

setup.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
-# one last thing to do: to use the extension, run the following commands in your terminal:
+# When the addon is installed or updated, there is one last thing to do.
+# To use the extension, run the following commands in your terminal:
 
 set -e
 
@@ -10,3 +11,5 @@ else
 fi
 
 xdg-mime default mpv-scheme-handler.desktop x-scheme-handler/mpv
+
+set +e