Merge pull request #1852 from nextcloud/backport/1851/stable27

nextcloud · Aug 10, 2023 · 14fe700 · 14fe700
2 parents ed1d947 + 82f5b84
commit 14fe700
Show file tree

Hide file tree

Showing 3 changed files with 27 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/views/Viewer.vue b/src/views/Viewer.vue
@@ -225,7 +225,7 @@ export default {
 
 	filters: {
 		uniqueKey(file) {
-			return file.fileid || file.source
+			return '' + file.fileid + file.source
 		},
 	},
 
@@ -397,6 +397,27 @@ export default {
 				'viewer--split': this.comparisonFile,
 			}
 		},
+
+		isSameFile() {
+			return (fileInfo = null, path = null) => {
+				if (
+					path && path === this.currentFile.path
+					&& !this.currentFile.source
+				) {
+					return true
+				}
+
+				if (
+					fileInfo && fileInfo.fileid === this.currentFile.fileid
+					&& fileInfo.mtime && fileInfo.mtime === this.currentFile.mtime
+					&& fileInfo.source && fileInfo.source === this.currentFile.source
+				) {
+					return true
+				}
+
+				return false
+			}
+		},
 	},
 
 	watch: {
@@ -558,7 +579,7 @@ export default {
 			this.cancelRequestFile()
 
 			// do not open the same file again
-			if (path === this.currentFile.path && !this.currentFile.source) {
+			if (this.isSameFile(null, path)) {
 				return
 			}
 
@@ -609,7 +630,7 @@ export default {
 			this.cancelRequestFolder()
 
 			// do not open the same file info again
-			if (fileInfo.basename === this.currentFile.basename && fileInfo.source !== this.currentFile.source) {
+			if (this.isSameFile(fileInfo)) {
 				return
 			}