Merge pull request #1850 from nextcloud/backport/1835/stable27

Author: juliusknorr

js/viewer-main.js

@@ -28,7 +28,6 @@ import { genFileInfo } from '../utils/fileUtils.js'
  *
  * @param {string} path the path relative to the user root
  * @param {object} [options] optional options for axios
- * @return {Array} the file list
  */
 export default async function(path, options) {
 	// getDirectoryContents doesn't accept / for root

js/viewer-main.js.map

@@ -24,6 +24,18 @@ import Images from '../models/images.js'
 import Videos from '../models/videos.js'
 import Audios from '../models/audios.js'
 
+/**
+ * Handler type definition
+ *
+ * @typedef {object} Handler
+ * @property {string} id unique identifier for the handler
+ * @property {string[]} mimes list of mime types that are supported for opening
+ * @property {object} component Vue component to render the file
+ * @property {string} group group identifier to combine for navigating to the next/previous files
+ * @property {?string} theme viewer modal theme (one of 'dark', 'light', 'default')
+ * @property {boolean} canCompare Indicate support for comparing two files
+ */
+
 /**
  * File info type definition
  *
@@ -41,12 +53,15 @@ export default class Viewer {
 
 	_state
 	_mimetypes
+	_mimetypesCompare
 
 	constructor() {
 		this._mimetypes = []
+		this._mimetypesCompare = []
 		this._state = {}
 		this._state.file = ''
 		this._state.fileInfo = null
+		this._state.compareFileInfo = null
 		this._state.files = []
 		this._state.enableSidebar = true
 		this._state.el = null
@@ -71,6 +86,7 @@ export default class Viewer {
 	 *
 	 * @readonly
 	 * @memberof Viewer
+	 * @return {Handler[]}
 	 */
 	get availableHandlers() {
 		return this._state.handlers
@@ -80,11 +96,14 @@ export default class Viewer {
 	 * Register a new handler
 	 *
 	 * @memberof Viewer
-	 * @param {object} handler a new unregistered handler
+	 * @param {Handler} handler a new unregistered handler
 	 */
 	registerHandler(handler) {
 		this._state.handlers.push(handler)
 		this._mimetypes.push.apply(this._mimetypes, handler.mimes)
+		if (handler?.canCompare === true) {
+			this._mimetypesCompare.push.apply(this._mimetypesCompare, handler.mimes)
+		}
 	}
 
 	/**
@@ -107,6 +126,16 @@ export default class Viewer {
 		return this._state.fileInfo
 	}
 
+	/**
+	 * Get the current comparison view opened file fileInfo
+	 *
+	 * @memberof Viewer
+	 * @return {?Fileinfo} the currently opened file fileInfo
+	 */
+	get compareFileInfo() {
+		return this._state.compareFileInfo
+	}
+
 	/**
 	 * Get the current files list
 	 *
@@ -147,6 +176,16 @@ export default class Viewer {
 		return this._mimetypes
 	}
 
+	/**
+	 * Get the supported mimetypes that can be opened side by side for comparison
+	 *
+	 * @memberof Viewer
+	 * @return {Array} list of mimetype strings that the viewer can open side by side for comparison
+	 */
+	get mimetypesCompare() {
+		return this._mimetypesCompare
+	}
+
 	/**
 	 * Return the method provided to fetch more results
 	 *
@@ -291,6 +330,20 @@ export default class Viewer {
 		this.open(options)
 	}
 
+	/**
+	 * Open the viewer with two files side by side
+	 *
+	 * @memberof Viewer
+	 * @param {Fileinfo} fileInfo current file
+	 * @param {Fileinfo} compareFileInfo older file to compare
+	 */
+	compare(fileInfo, compareFileInfo) {
+		this.open({
+			fileInfo,
+		})
+		this._state.compareFileInfo = compareFileInfo
+	}
+
 	/**
 	 * Close the opened file
 	 *

src/services/FileList.js

@@ -111,7 +111,23 @@
 			</NcActionButton>
 		</template>
 
-		<div class="viewer__content" @click.self.exact="close">
+		<div class="viewer__content" :class="contentClass" @click.self.exact="close">
+			<!-- COMPARE FILE -->
+			<component :is="comparisonFile.modal"
+				v-if="comparisonFile && !comparisonFile.failed && showComparison"
+				:key="comparisonFile | uniqueKey"
+				ref="comparison-content"
+				v-bind="comparisonFile"
+				:active="true"
+				:can-swipe="false"
+				:can-zoom="false"
+				:editing="false"
+				:is-full-screen="isFullscreen"
+				:is-sidebar-shown="isSidebarShown"
+				:loaded.sync="comparisonFile.loaded"
+				class="viewer__file viewer__file--active"
+				@error="comparisonFailed" />
+
 			<!-- PREVIOUS -->
 			<component :is="previousFile.modal"
 				v-if="previousFile && !previousFile.failed"
@@ -231,6 +247,7 @@ export default {
 			currentIndex: 0,
 			previousFile: {},
 			currentFile: {},
+			comparisonFile: null,
 			nextFile: {},
 			fileList: [],
 
@@ -275,6 +292,9 @@ export default {
 		fileInfo() {
 			return this.Viewer.fileInfo
 		},
+		comparisonFileInfo() {
+			return this.Viewer.compareFileInfo
+		},
 		files() {
 			return this.Viewer.files
 		},
@@ -340,7 +360,7 @@ export default {
 		 * @return {boolean}
 		 */
 		canDownload() {
-			return canDownload()
+			return canDownload() && !this.comparisonFile
 		},
 
 		/**
@@ -354,6 +374,7 @@ export default {
 				&& canDownload()
 				&& this.currentFile?.permissions?.includes('W')
 				&& this.isImage
+				&& !this.comparisonFile
 		},
 
 		modalClass() {
@@ -366,6 +387,16 @@ export default {
 				'image--fullscreen': this.isImage && this.isFullscreenMode,
 			}
 		},
+
+		showComparison() {
+			return !this.isMobile
+		},
+
+		contentClass() {
+			return {
+				'viewer--split': this.comparisonFile,
+			}
+		},
 	},
 
 	watch: {
@@ -407,6 +438,16 @@ export default {
 			}
 		},
 
+		comparisonFileInfo(fileInfo) {
+			if (fileInfo) {
+				logger.info('Opening viewer for comparisonFileInfo ', { fileInfo })
+				this.compareFile(fileInfo)
+			} else {
+				// object is undefined, we're closing!
+				this.cleanup()
+			}
+		},
+
 		files(fileList) {
 			// the files list changed, let's update the current opened index
 			const currentIndex = fileList.findIndex(file => file.basename === this.currentFile.basename)
@@ -517,7 +558,7 @@ export default {
 			this.cancelRequestFile()
 
 			// do not open the same file again
-			if (path === this.currentFile.path) {
+			if (path === this.currentFile.path && !this.currentFile.source) {
 				return
 			}
 
@@ -568,7 +609,7 @@ export default {
 			this.cancelRequestFolder()
 
 			// do not open the same file info again
-			if (fileInfo.basename === this.currentFile.basename) {
+			if (fileInfo.basename === this.currentFile.basename && fileInfo.source !== this.currentFile.source) {
 				return
 			}
 
@@ -638,6 +679,7 @@ export default {
 
 			// show file
 			this.currentFile = new File(fileInfo, mime, handler.component)
+			this.comparisonFile = null
 			this.updatePreviousNext()
 
 			// if sidebar was opened before, let's update the file
@@ -657,6 +699,10 @@ export default {
 			this.updatePreviousNext()
 		},
 
+		async compareFile(fileInfo) {
+			this.comparisonFile = new File(fileInfo, fileInfo.mime, this.components[fileInfo.mime])
+		},
+
 		/**
 		 * Show sidebar if available and a file is already opened
 		 */
@@ -872,6 +918,7 @@ export default {
 		cleanup() {
 			// reset all properties
 			this.currentFile = {}
+			this.comparisonFile = null
 			this.currentModal = null
 			this.fileList = []
 			this.initiated = false
@@ -934,6 +981,10 @@ export default {
 		/**
 		 * Failures handlers
 		 */
+		comparisonFailed() {
+			this.comparisonFile.failed = true
+		},
+
 		previousFailed() {
 			this.previousFile.failed = true
 		},
@@ -1086,6 +1137,12 @@ export default {
 		cursor: pointer;
 	}
 
+	&--split {
+		.viewer__file--active {
+			width: 50%;
+		}
+	}
+
 	:deep(.modal-wrapper) {
 		.modal-container {
 			// Ensure some space at the bottom