fix: use filename to find current index

The viewer component is usually used with a folder and the basename unique.
However in photos, the fileList contains objects from multiple folders and the basename is not always unique.

How to reproduce:

- Create folder A and B
- Upload an image to folder A and name it "Test"
- Upload another image to folder B and also name it "Test"
- Open photos
- Click on the image from folder B
- The image from folder A is shown

To find the correct "currentIndex" we need filename (including the path).

Signed-off-by: Daniel Kesselberg <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>

src/services/Viewer.js

@@ -40,8 +40,8 @@ import Audios from '../models/audios.js'
  * File info type definition
  *
  * @typedef {object} Fileinfo
- * @property {string} filename the file name
- * @property {string} basename the full path of the file
+ * @property {string} filename File path of the remote item
+ * @property {string} basename Base filename of the remote item, no path
  * @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

src/views/Viewer.vue

@@ -484,7 +484,7 @@ export default {
 
 		files(fileList) {
 			// the files list changed, let's update the current opened index
-			const currentIndex = fileList.findIndex(file => file.basename === this.currentFile.basename)
+			const currentIndex = fileList.findIndex(file => file.filename === this.currentFile.filename)
 			if (currentIndex > -1) {
 				this.currentIndex = currentIndex
 				logger.debug('The files list changed, new current file index is ' + currentIndex)
@@ -684,7 +684,7 @@ export default {
 				this.fileList = this.files
 
 				// store current position
-				this.currentIndex = this.fileList.findIndex(file => file.basename === fileInfo.basename)
+				this.currentIndex = this.fileList.findIndex(file => file.filename === fileInfo.filename)
 			} else if (group && this.el === null) {
 				const mimes = this.mimeGroups[group]
 					? this.mimeGroups[group]
@@ -705,7 +705,7 @@ export default {
 				this.fileList = filteredFiles.sort((a, b) => sortCompare(a, b, this.sortingConfig.key, this.sortingConfig.asc))
 
 				// store current position
-				this.currentIndex = this.fileList.findIndex(file => file.basename === fileInfo.basename)
+				this.currentIndex = this.fileList.findIndex(file => file.filename === fileInfo.filename)
 			} else {
 				this.currentIndex = 0
 				this.fileList = [fileInfo]
@@ -1127,8 +1127,8 @@ export default {
 				await axios.delete(url)
 				emit('files:node:deleted', { fileid })
 
-				// fileid is not unique, basename is
-				const currentIndex = this.fileList.findIndex(file => file.basename === this.currentFile.basename)
+				// fileid is not unique, basename is not unqiue, filename is
+				const currentIndex = this.fileList.findIndex(file => file.filename === this.currentFile.filename)
 				if (this.hasPrevious || this.hasNext) {
 					// Checking the previous or next file
 					this.hasPrevious ? this.previous() : this.next()