Unify preview urls with the files app

This has two advantages: * Increase the probability of browser cache hits * With the imaginary pipeline PR, requesting a preview of 250x250 is faster since there is less intermediate steps Signed-off-by: Carl Schwan <carl@carlschwan.eu>
nextcloud · Feb 28, 2022 · d2a0a7f · d2a0a7f
1 parent 7c8b1bf
commit d2a0a7f
Show file tree

Hide file tree

Showing 16 changed files with 436 additions and 20 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...extcloud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js b/...extcloud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js
diff --git a/...loud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js.map b/...loud_moment_node_modules_moment_locale_sync_recursive_-src_patchedRequest_j-3cb869.js.map
diff --git a/js/photos-src_components_FolderTagPreview_vue.js b/js/photos-src_components_FolderTagPreview_vue.js
diff --git a/js/photos-src_components_FolderTagPreview_vue.js.map b/js/photos-src_components_FolderTagPreview_vue.js.map
diff --git a/...dConfig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js b/...dConfig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js
diff --git a/...fig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js.map b/...fig_js-src_utils_CancelableRequest_js-src_components_EmptyContent_vue-src_c-45f6cf.js.map
diff --git a/js/photos-src_patchedRequest_js-src_views_Tags_vue.js b/js/photos-src_patchedRequest_js-src_views_Tags_vue.js
diff --git a/js/photos-src_patchedRequest_js-src_views_Tags_vue.js.map b/js/photos-src_patchedRequest_js-src_views_Tags_vue.js.map
diff --git a/js/photos-src_views_Albums_vue.js b/js/photos-src_views_Albums_vue.js
diff --git a/js/photos-src_views_Albums_vue.js.map b/js/photos-src_views_Albums_vue.js.map
diff --git a/...endors-node_modules_webdav_dist_node_index_js-node_modules_webdav_dist_node_request_js.js b/...endors-node_modules_webdav_dist_node_index_js-node_modules_webdav_dist_node_request_js.js
diff --git a/...rs-node_modules_webdav_dist_node_index_js-node_modules_webdav_dist_node_request_js.js.map b/...rs-node_modules_webdav_dist_node_index_js-node_modules_webdav_dist_node_request_js.js.map
diff --git a/src/components/File.vue b/src/components/File.vue
@@ -94,7 +94,7 @@ export default {
 			return this.item.injected.mime.startsWith('image')
 		},
 		src() {
-			return generateUrl(`/core/preview?fileId=${this.item.injected.fileid}&x=${256}&y=${256}&a=${!this.croppedLayout}&v=${this.item.injected.etag}`)
+			return generateUrl(`/core/preview?fileId=${this.item.injected.fileid}&c=${this.item.injected.etag.replace('&quot;', '').replace('&quot;', '')}&x=${250}&y=${250}&forceIcon=0&a=${this.croppedLayout ? '0' : '1'}`)
 		},
 	},
 

diff --git a/src/components/FolderTagPreview.vue b/src/components/FolderTagPreview.vue
@@ -137,7 +137,7 @@ export default {
 	methods: {
 		generateImgSrc({ fileid, etag }) {
 			// use etag to force cache reload if file changed
-			return generateUrl(`/core/preview?fileId=${fileid}&x=${256}&y=${256}&a=true&v=${etag}`)
+			return generateUrl(`/core/preview?fileId=${fileid}&c=${etag}&x=${250}&y=${250}&forceIcon=0&a=0`)
 		},
 		onPreviewFail({ fileid }) {
 			this.failed.push(fileid)
-Original file line number
+Diff line change
@@ Expand Up / @@ -94,7 +94,7 @@ export default { @@
     			return this.item.injected.mime.startsWith('image')
     		},
     		src() {
-    			return generateUrl(`/core/preview?fileId=${this.item.injected.fileid}&x=${256}&y=${256}&a=${!this.croppedLayout}&v=${this.item.injected.etag}`)
+    			return generateUrl(`/core/preview?fileId=${this.item.injected.fileid}&c=${this.item.injected.etag.replace('&quot;', '').replace('&quot;', '')}&x=${250}&y=${250}&forceIcon=0&a=${this.croppedLayout ? '0' : '1'}`)
     		},
     	},
@@ Expand Down @@