feat: simplify destination handling

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

lib/components/UploadPicker.vue

@@ -4,7 +4,7 @@
 		class="upload-picker"
 		data-upload-picker>
 		<!-- New button -->
-		<NcButton v-if="newFileMenuEntries.length === 0"
+		<NcButton v-if="newFileMenuEntries && newFileMenuEntries.length === 0"
 			:disabled="disabled"
 			data-upload-picker-add
 			@click="onClick">
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import { getNewFileMenuEntries } from '@nextcloud/files'
+import { getNewFileMenuEntries, Folder } from '@nextcloud/files'
 import { getUploader } from '../index.js'
 import makeEta from 'simple-eta'
 
@@ -118,17 +118,9 @@ export default {
 			default: false,
 		},
 		destination: {
-			type: String,
+			type: Folder,
 			default: null,
 		},
-		root: {
-			type: String,
-			default: null,
-		},
-		context: {
-			type: Object,
-			default: undefined,
-		},
 	},
 
 	data() {
@@ -140,7 +132,7 @@ export default {
 			eta: null,
 			timeLeft: '',
 
-			newFileMenuEntries: getNewFileMenuEntries(this.context),
+			newFileMenuEntries: this.destination ? getNewFileMenuEntries(this.destination) : [],
 			uploadManager: getUploader(),
 		}
 	},
@@ -176,12 +168,12 @@ export default {
 
 	watch: {
 		/**
-		 * If the context change, we need to refresh the menu
+		 * If the destination change, we need to refresh the menu
 		 *
-		 * @param {FileInfo} context the current NewFileMenu context
+		 * @param {FileInfo} destination the current NewFileMenu destination
 		 */
-		context(context) {
-			this.setContext(context)
+		destination(destination) {
+			this.setDestination(destination)
 		},
 
 		totalQueueSize(size) {
@@ -194,14 +186,6 @@ export default {
 			this.updateStatus()
 		},
 
-		destination(destination) {
-			this.setDestination(destination)
-		},
-
-		root(path) {
-			this.setRoot(path)
-		},
-
 		queue(queue, oldQueue) {
 			if (queue.length < oldQueue.length) {
 				this.$emit('uploaded', oldQueue.filter(upload => !queue.includes(upload)))
@@ -225,9 +209,6 @@ export default {
 
 	beforeMount() {
 		this.setDestination(this.destination)
-		this.setRoot(this.root)
-
-		this.setContext(this.context)
 		logger.debug('UploadPicker initialised')
 	},
 
@@ -290,16 +271,6 @@ export default {
 			logger.debug(`Destination path set to ${destination}`)
 			this.uploadManager.destination = destination
 		},
-
-		setRoot(path) {
-			logger.debug(`Root path set to ${path}`)
-			this.uploadManager.root = path
-		},
-
-		setContext(context) {
-			logger.debug('Context changed to', context)
-			this.newFileMenuEntries = getNewFileMenuEntries(context)
-		},
 	},
 }
 </script>

lib/upload.ts

@@ -11,29 +11,33 @@ export enum Status {
 }
 export class Upload {
 
-	private _path: string
+	private _source: string
 	private _isChunked: boolean
 	private _chunks: number
 
 	private _size: number
-	private _uploaded: number = 0
-	private _startTime: number = 0
+	private _uploaded = 0
+	private _startTime = 0
 
 	private _status: Status = Status.INITIALIZED
 	private _controller: AbortController
 	private _response: AxiosResponse|null = null
 
-	constructor(path: string, chunked: boolean = false, size: number) {
+	constructor(source: string, chunked = false, size: number) {
 		const chunks = getMaxChunksSize() > 0 ? Math.ceil(size / getMaxChunksSize()) : 1
-		this._path = path
+		this._source = source
 		this._isChunked = chunked && getMaxChunksSize() > 0 && chunks > 1
 		this._chunks = this._isChunked ? chunks : 1
 		this._size = size
 		this._controller = new AbortController()
 	}
 
 	get path(): string {
-		return this._path
+		return this._source
+	}
+
+	get source(): string {
+		return this._source
 	}
 
 	get isChunked(): boolean {
@@ -48,10 +52,6 @@ export class Upload {
 		return this._size
 	}
 
-	get uploaded(): number {
-		return this._uploaded
-	}
-
 	get startTime(): number {
 		return this._startTime
 	}
@@ -60,11 +60,14 @@ export class Upload {
 		this._response = response
 	}
 
-
 	get response(): AxiosResponse|null {
 		return this._response
 	}
 
+	get uploaded(): number {
+		return this._uploaded
+	}
+
 	/**
 	 * Update the uploaded bytes of this upload
 	 */

lib/uploader.ts

@@ -1,6 +1,7 @@
 import { CanceledError } from 'axios'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
+import { Folder, Permission } from '@nextcloud/files'
 import axios from '@nextcloud/axios'
 import PCancelable from 'p-cancelable'
 import PQueue from 'p-queue'
@@ -19,9 +20,7 @@ export enum Status {
 export class Uploader {
 
 	// Initialized via setter in the constructor
-	private rootFolder!: string
-	private destinationFolder!: string
-
+	private _destinationFolder!: Folder
 	private _isPublic: boolean
 
 	// Global upload queue
@@ -35,16 +34,28 @@ export class Uploader {
 	 * Initialize uploader
 	 *
 	 * @param {boolean} isPublic are we in public mode ?
-	 * @param {string} rootFolder the operation root folder
-	 * @param {string} destinationFolder the context folder to operate, relative to the root folder
+	 * @param {Folder} destinationFolder the context folder to operate, relative to the root folder
 	 */
 	constructor(
 		isPublic = false,
-		rootFolder = `dav/files/${getCurrentUser()?.uid}`,
-		destinationFolder = '/'
+		destinationFolder?: Folder,
 	) {
 		this._isPublic = isPublic
-		this.root = rootFolder
+
+		if (!destinationFolder) {
+			const owner = getCurrentUser()?.uid
+			const source = generateRemoteUrl(`dav/files/${owner}`)
+			if (!owner) {
+				throw new Error('User is not logged in')
+			}
+			destinationFolder = new Folder({
+				id: 0,
+				owner,
+				permissions: Permission.ALL,
+				root: `/files/${owner}`,
+				source,
+			})
+		}
 		this.destination = destinationFolder
 
 		logger.debug('Upload workspace initialized', {
@@ -58,52 +69,25 @@ export class Uploader {
 	/**
 	 * Get the upload destination path relative to the root folder
 	 */
-	get destination() {
-		return this.destinationFolder
+	get destination(): Folder {
+		return this._destinationFolder
 	}
 
 	/**
 	 * Set the upload destination path relative to the root folder
 	 */
-	set destination(path: string) {
-		if (typeof path !== 'string' || path === '') {
-			this.destinationFolder = '/'
-			return
+	set destination(folder: Folder) {
+		if (!(folder instanceof Folder)) {
+			throw new Error('Invalid destination folder')
 		}
-
-		if (!path.startsWith('/')) {
-			path = `/${path}`
-		}
-		this.destinationFolder = path.replace(/\/$/, '')
+		this._destinationFolder = folder
 	}
 
 	/**
 	 * Get the root folder
 	 */
 	get root() {
-		return this.rootFolder
-	}
-
-	/**
-	 * Set the root folder
-	 *
-	 * @param {string} path should be the remoteUrl path.
-	 * This method uses the generateRemoteUrl method
-	 */
-	set root(path: string) {
-		if (typeof path !== 'string' || path === '') {
-			this.rootFolder = generateRemoteUrl(`dav/files/${getCurrentUser()?.uid}`)
-			return
-		}
-
-		if (path.startsWith('http')) {
-			throw new Error('The path should be a remote url string. E.g `dav/files/admin`.')
-		}
-
-		if (path.startsWith('/')) {
-			path = path.slice(1)
-		}
-		this.rootFolder = generateRemoteUrl(path)
+		return this._destinationFolder.source
 	}
 
 	/**
@@ -169,10 +153,11 @@ export class Uploader {
 
 	/**
 	 * Upload a file to the given path
+	 * @param {string} destinationPath the destination path relative to the root folder. e.g. /foo/bar.txt
+	 * @param {File} file the file to upload
 	 */
 	upload(destinationPath: string, file: File) {
-		const destinationFolder = this.destinationFolder === '/' ? '' : this.destinationFolder
-		const destinationFile = `${this.rootFolder}${destinationFolder}/${destinationPath.replace(/^\//, '')}`
+		const destinationFile = `${this.root}/${destinationPath.replace(/^\//, '')}`
 
 		logger.debug(`Uploading ${file.name} to ${destinationFile}`)