Merge pull request #1525 from nextcloud/enh/app-specific-preview-url

nextcloud · Feb 1, 2023 · 8aa4b64 · 8aa4b64
2 parents 9169c09 + 4b6a2c2
commit 8aa4b64
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/src/components/Images.vue b/src/components/Images.vue
@@ -114,7 +114,7 @@ export default {
 
 			// If there is no preview and we have a direct source
 			// load it instead
-			if (this.source && !this.hasPreview) {
+			if (this.source && !this.hasPreview && !this.previewUrl) {
 				return this.source
 			}
 

diff --git a/src/mixins/Mime.js b/src/mixins/Mime.js
@@ -47,7 +47,12 @@ export default {
 			type: String,
 			default: undefined,
 		},
-		// file path relative to user folder
+		// URL the file preview
+		previewUrl: {
+			type: String,
+			default: undefined,
+		},
+		// should the standard core preview be used?
 		hasPreview: {
 			type: Boolean,
 			default: false,

diff --git a/src/mixins/PreviewUrl.js b/src/mixins/PreviewUrl.js
@@ -36,6 +36,7 @@ export default {
 			return this.getPreviewIfAny({
 				fileid: this.fileid,
 				filename: this.filename,
+				previewUrl: this.previewUrl,
 				hasPreview: this.hasPreview,
 				davPath: this.davPath,
 			})
@@ -60,12 +61,17 @@ export default {
 		 *
 		 * @param {object} data destructuring object
 		 * @param {string} data.fileid the file id
+		 * @param {string} [data.previewUrl] URL of the file preview
 		 * @param {boolean} data.hasPreview have the file an existing preview ?
 		 * @param {string} data.davPath the absolute dav path
 		 * @param {string} data.filename the file name
 		 * @return {string} the absolute url
 		 */
-		getPreviewIfAny({ fileid, filename, hasPreview, davPath }) {
+		getPreviewIfAny({ fileid, filename, previewUrl, hasPreview, davPath }) {
+			if (previewUrl) {
+				return previewUrl
+			}
+
 			const searchParams = `fileId=${fileid}`
 				+ `&x=${Math.floor(screen.width * devicePixelRatio)}`
 				+ `&y=${Math.floor(screen.height * devicePixelRatio)}`

diff --git a/src/services/Viewer.js b/src/services/Viewer.js
@@ -32,6 +32,7 @@ import Audios from '../models/audios.js'
  * @property {string} basename the full path of the file
  * @property {?string} source absolute path of a non-dav file, e.g. a static resource or provided by an app route
  * @property {string} mime file MIME type in the format type/sub-type
+ * @property {string} [previewUrl] URL of the file preview
  * @property {boolean} hasPreview is there a WebDAV preview of this file?
  * @property {number} fileid Nextcloud file ID
  */