Fix loading file as text in Firefox

slgobinath · slgobinath · commit 5a838b0d23d6 · 2017-08-27T16:34:25.000-04:00
diff --git a/extension/background.js b/extension/background.js
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// TODO: LocalStorage support for Firefox (how does this work here?)
 
 var interruptDownloads = true;
 var ugetWrapperNotFound = true;
@@ -59,7 +58,8 @@ try {
     current_browser.runtime.getBrowserInfo().then(
         function(info) {
             if (info.name === 'Firefox') {
-                firefoxVersion = info.version.replace(/[ab]\d+/, '');
+                // Convert version string to int
+                firefoxVersion = parseInt(info.version.replace(/[ab]\d+/, '').split('.')[0]);
             }
         }
     );
@@ -71,7 +71,7 @@ try {
 
 chromeVersion = parseInt(chromeVersion);
 sendMessageToHost({
-    version: "2.0.6"
+    version: "2.0.7"
 });
 
 // Read the local storage for excluded keywords
@@ -152,6 +152,10 @@ current_browser.downloads.onCreated.addListener(function(downloadItem) {
         return;
     }
 
+    if("in_progress" !== downloadItem['state'].toString().toLowerCase()) {
+        return;
+    }
+
     var fileSize = downloadItem['fileSize'];
 
     var url = '';
@@ -174,7 +178,7 @@ current_browser.downloads.onCreated.addListener(function(downloadItem) {
     });
 
     message.url = url;
-    message.filename = downloadItem['filename'];
+    message.filename = downloadItem['filename'].replace(/^.*[\\\/]/, '');
     message.filesize = fileSize;
     message.referrer = downloadItem['referrer'];
     current_browser.cookies.getAll({ 'url': extractRootURL(url) }, parseCookies);
diff --git a/extension/manifest.json b/extension/manifest.json
@@ -49,5 +49,5 @@
 		"storage",
 		"cookies"
 	],
-	"version": "2.0.6"
+	"version": "2.0.7"
 }
diff --git a/extension/popup.html b/extension/popup.html
@@ -28,7 +28,7 @@
 <body>
     <div id="parent-container">
         <div id="title-container">
-            <img id="img-icon" src="icon_32.png" /> <span>uGet Integration 2.0.6</span>
+            <img id="img-icon" src="icon_32.png" /> <span>uGet Integration 2.0.7</span>
         </div>
         <hr>
         <label id="info"></label><label id="error"></label><label id="warn"></label>

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@`
`49`	`49`	`"storage",`
`50`	`50`	`"cookies"`
`51`	`51`	`],`
`52`		`- "version": "2.0.6"`
	`52`	`+ "version": "2.0.7"`
`53`	`53`	`}`