Merge pull request #18 from torikulhabib/master

ff

Author: torikulhabib

background.js

@@ -47,7 +47,7 @@ async function RunScript (tabId, callback) {
     let existid = false;
     let scripts = await browser.scripting.getRegisteredContentScripts();
     for (let scrid of scripts.map((script) => script.id)) {
-        if (`${tabId}` === scrid) {
+        if (`${tabId}` == scrid) {
             existid = true;
         }
     }
@@ -61,21 +61,18 @@ async function StopScript (tabId) {
 browser.tabs.onUpdated.addListener((tabId, changeInfo, tab)=> {
     if (DownloadVideo) {
         if (changeInfo.status == 'loading') {
+            browser.webRequest.onResponseStarted.addListener (WebContent, {urls: ['<all_urls>']}, ['responseHeaders']);
             RunScript (tabId, function (existid) {
                 if (!existid) {
                     browser.scripting.registerContentScripts([{id: `${tabId}`, allFrames: false, matches: ['<all_urls>'], js: ['content-script.js'], css: ['content-script.css']}]);
                 }
             });
             browser.webRequest.onResponseStarted.removeListener (WebContent);
             browser.tabs.sendMessage(tabId, {message: 'gdmclean'}).then (function () {}).catch(function() {});
+            browser.webRequest.onResponseStarted.addListener (WebContent, {urls: ['<all_urls>']}, ['responseHeaders']);
         }
-        browser.webRequest.onResponseStarted.addListener (WebContent, {urls: ['<all_urls>']}, ['responseHeaders']);
     } else {
-        RunScript (tabId, function (existid) {
-            if (existid) {
-                StopScript (tabId);
-            }
-        });
+        StopScript (tabId);
     }
 });
 
@@ -219,12 +216,18 @@ browser.runtime.onMessage.addListener((request, sender, callback) => {
         load_conf ();
     } else if (request.extensionId == "gdmurl") {
         if (!InterruptDownloads || ResponGdm) {
+            downloadfirefox (request.message);
             return;
         }
         fetch (get_host (), { method: 'post', body: request.message }).then (function (r) { return r.text (); }).catch (function () {});
     }
 });
 
+async function downloadfirefox (urls) {
+    let url = urls.substring (5, urls.lastIndexOf(",filename:"));
+    await browser.downloads.download({url: url});
+}
+
 get_host = function () {
     if (CustomPort) {
         return `http://127.0.0.1:${PortSet}`;

manifest.json

@@ -3,7 +3,7 @@
   "description": "Integration for Gabut Download Manager.",
   "short_name": "GabutDM",
   "homepage_url": "https://github.com/gabutakut/gabutextentionsFF",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "manifest_version": 3,
   "icons": {
     "32": "icons/icon_32.png",

popup/popup.html

@@ -35,7 +35,7 @@
           <div id="Content0" class="tab-pane active">
             <div class="tittle">Gabut Download Manager</div>
             <img id="img-icon" src="../icons/icon_128.svg" /></h5>
-            <div class="tittle">Version 2.6.1</div>
+            <div class="tittle">Version 2.6.2</div>
           </div>
           <div id="Content1" class="tab-pane">
             <div class="tittle">Interrupt Download</div>