Merge branch 'master' into patch-1

frontend/src/components/prompts/Share.vue

@@ -32,6 +32,16 @@
                 <i class="material-icons">content_paste</i>
               </button>
             </td>
+            <td class="small" v-if="hasDownloadLink()">
+              <button
+                class="action copy-clipboard"
+                :data-clipboard-text="buildDownloadLink(link)"
+                :aria-label="$t('buttons.copyDownloadLinkToClipboard')"
+                :title="$t('buttons.copyDownloadLinkToClipboard')"
+              >
+                <i class="material-icons">content_paste_go</i>
+              </button>
+            </td>
             <td class="small">
               <button
                 class="action"
@@ -117,7 +127,7 @@
 
 <script>
 import { mapState, mapGetters } from "vuex";
-import { share as api } from "@/api";
+import { share as api, pub as pub_api } from "@/api";
 import moment from "moment";
 import Clipboard from "clipboard";
 
@@ -215,6 +225,14 @@ export default {
     buildLink(share) {
       return api.getShareURL(share);
     },
+    hasDownloadLink() {
+      return (
+        this.selected.length === 1 && !this.req.items[this.selected[0]].isDir
+      );
+    },
+    buildDownloadLink(share) {
+      return pub_api.getDownloadURL(share);
+    },
     sort() {
       this.links = this.links.sort((a, b) => {
         if (a.expire === 0) return -1;

frontend/src/i18n/en.json

@@ -5,6 +5,7 @@
     "copy": "Copy",
     "copyFile": "Copy file",
     "copyToClipboard": "Copy to clipboard",
+    "copyDownloadLinkToClipboard": "Copy download link to clipboard",
     "create": "Create",
     "delete": "Delete",
     "download": "Download",

frontend/src/views/Share.vue

@@ -10,6 +10,15 @@
         @action="download"
         :counter="selectedCount"
       />
+      <button
+        v-if="isSingleFile()"
+        class="action copy-clipboard"
+        :data-clipboard-text="linkSelected()"
+        :aria-label="$t('buttons.copyDownloadLinkToClipboard')"
+        :title="$t('buttons.copyDownloadLinkToClipboard')"
+      >
+        <i class="material-icons">content_paste</i>
+      </button>
       <action
         icon="check_circle"
         :label="$t('buttons.selectMultiple')"
@@ -182,6 +191,7 @@ import Breadcrumbs from "@/components/Breadcrumbs";
 import Errors from "@/views/Errors";
 import QrcodeVue from "qrcode.vue";
 import Item from "@/components/files/ListingItem";
+import Clipboard from "clipboard";
 
 export default {
   name: "share",
@@ -200,6 +210,7 @@ export default {
     attemptedPasswordLogin: false,
     hash: null,
     token: null,
+    clip: null,
   }),
   watch: {
     $route: function () {
@@ -215,13 +226,18 @@ export default {
   },
   mounted() {
     window.addEventListener("keydown", this.keyEvent);
+    this.clip = new Clipboard(".copy-clipboard");
+    this.clip.on("success", () => {
+      this.$showSuccess(this.$t("success.linkCopied"));
+    });
   },
   beforeDestroy() {
     window.removeEventListener("keydown", this.keyEvent);
+    this.clip.destroy();
   },
   computed: {
     ...mapState(["req", "loading", "multiple", "selected"]),
-    ...mapGetters(["selectedCount", "selectedCount"]),
+    ...mapGetters(["selectedCount"]),
     icon: function () {
       if (this.req.isDir) return "folder";
       if (this.req.type === "image") return "insert_photo";
@@ -300,8 +316,13 @@ export default {
     toggleMultipleSelection() {
       this.$store.commit("multiple", !this.multiple);
     },
+    isSingleFile: function () {
+      return (
+        this.selectedCount === 1 && !this.req.items[this.selected[0]].isDir
+      );
+    },
     download() {
-      if (this.selectedCount === 1 && !this.req.items[this.selected[0]].isDir) {
+      if (this.isSingleFile()) {
         api.download(
           null,
           this.hash,
@@ -326,6 +347,14 @@ export default {
         },
       });
     },
+    linkSelected: function () {
+      return this.isSingleFile()
+        ? api.getDownloadURL({
+            hash: this.hash,
+            path: this.req.items[this.selected[0]].path,
+          })
+        : "";
+    },
   },
 };
 </script>

frontend/src/views/files/Preview.vue

@@ -167,7 +167,6 @@ export default {
       nextLink: "",
       listing: null,
       name: "",
-      subtitles: [],
       fullSize: false,
       showNav: true,
       navTimeout: null,
@@ -201,6 +200,12 @@ export default {
     isResizeEnabled() {
       return resizePreview;
     },
+    subtitles() {
+      if (this.req.subtitles) {
+        return api.getSubtitlesURL(this.req);
+      }
+      return [];
+    },
   },
   watch: {
     $route: function () {
@@ -266,10 +271,6 @@ export default {
         this.autoPlay = false;
       }
 
-      if (this.req.subtitles) {
-        this.subtitles = api.getSubtitlesURL(this.req);
-      }
-
       let dirs = this.$route.fullPath.split("/");
       this.name = decodeURIComponent(dirs[dirs.length - 1]);