Add option to prefer links over sources (#75)

gyng · Jul 14, 2018 · 886e835 · 886e835
1 parent 68aa37b
commit 886e835
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
-# 2.6.3
+# 2.7.0
 
+* Add option to prefer links over media (#75)
 * Use @Rob--W's Content-Disposition parser (#73)
   (source: Rob--W/open-in-browser)[https://github.com/Rob--W/open-in-browser/blob/master/extension/content-disposition.js]
 * Add localisation hooks to most things

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -322,6 +322,10 @@
     "message": "Enable saving of links. Prefers sources if available"
   },
 
+  "o_cPreferLinks": {
+    "message": "Prefer links over sources instead"
+  },
+
   "o_cSaveText": {
     "message":
       "Enable saving of selected text with a \".selection.txt\" extension"

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "default_locale": "en",
 
   "applications": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "save-in",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "license": "MIT",
   "scripts": {
     "build": "env -u WEB_EXT_API_KEY -u WEB_EXT_API_SECRET web-ext build --overwrite-dest -i test docs yarn.lock yarn-error.log",

diff --git a/src/index.js b/src/index.js
@@ -195,10 +195,17 @@ browser.contextMenus.onClicked.addListener(info => {
     let suggestedFilename = null;
     let downloadType = DOWNLOAD_TYPES.UNKNOWN;
 
+    const hasLink = options.links && info.linkUrl;
+
     if (MEDIA_TYPES.includes(info.mediaType)) {
       downloadType = DOWNLOAD_TYPES.MEDIA;
       url = info.srcUrl;
-    } else if (options.links && info.linkUrl) {
+
+      if (hasLink && options.preferLinks) {
+        downloadType = DOWNLOAD_TYPES.LINK;
+        url = info.linkUrl;
+      }
+    } else if (hasLink) {
       downloadType = DOWNLOAD_TYPES.LINK;
       url = info.linkUrl;
     } else if (options.selection && info.selectionText) {

diff --git a/src/option.js b/src/option.js
@@ -31,6 +31,7 @@ const OptionsManagement = {
     { name: "keyLastUsed", type: T.VALUE, default: "a" },
     { name: "keyRoot", type: T.VALUE, default: "a" },
     { name: "links", type: T.BOOL, default: true },
+    { name: "preferLinks", type: T.BOOL, default: false },
     { name: "notifyDuration", type: T.VALUE, default: 7000 },
     { name: "notifyOnFailure", type: T.BOOL, default: true },
     { name: "notifyOnRuleMatch", type: T.BOOL, default: true },

diff --git a/src/options/options.html b/src/options/options.html
@@ -129,6 +129,11 @@ <h3>__MSG_o_sBehavior__</h3>
 
     <label>
       <input type="checkbox" id="links" />__MSG_o_cSaveLinks__
+      <div class="caption caption-line">
+        <label>
+          <input type="checkbox" id="preferLinks" />__MSG_o_cPreferLinks__
+        </label>
+      </div>
     </label>
 
     <label>

diff --git a/test/mockserver/index.js b/test/mockserver/index.js
@@ -18,7 +18,7 @@ const routes = {
     ctx.body = `<html>
       <a href="cd">Content-Disposition</a>
       <br>
-      <img src="origami.jpg" />
+      <a href="cd"><img src="origami.jpg" /></a>
       <hr>
       Example tests
       <br>