refactor(upload): remove localization - this is pure API

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

lib/upload/errors/UploadCancelledError.ts

@@ -2,13 +2,12 @@
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { t } from '../utils/l10n.ts'
 
 export class UploadCancelledError extends Error {
 	__UPLOAD_CANCELLED__ = true
 
 	public constructor(cause?: unknown) {
-		super(t('Upload has been cancelled'), { cause })
+		super('Upload has been cancelled', { cause })
 	}
 
 	public static isCancelledError(error: unknown): error is UploadCancelledError {

lib/upload/index.ts

@@ -6,7 +6,7 @@
 export type { Eta, EtaEventsMap } from './uploader/index.ts'
 export type { Directory, IDirectory } from './utils/fileTree.ts'
 
-export { getUploader, upload } from './getUploader.ts'
+export { getUploader } from './getUploader.ts'
 export { Upload, UploadStatus } from './uploader/Upload.ts'
 export { EtaStatus, Uploader, UploaderStatus } from './uploader/index.ts'
 export { getConflicts, hasConflict } from './utils/conflicts.ts'

lib/upload/uploader/Eta.spec.ts

@@ -11,7 +11,6 @@ describe('ETA - status', () => {
 		const eta = new Eta()
 		expect(eta.progress).toBe(0)
 		expect(eta.time).toBe(Infinity)
-		expect(eta.timeReadable).toBe('estimating time left')
 		expect(eta.speed).toBe(-1)
 		expect(eta.status).toBe(EtaStatus.Idle)
 	})
@@ -21,7 +20,6 @@ describe('ETA - status', () => {
 		expect(eta.status).toBe(EtaStatus.Running)
 		expect(eta.progress).toBe(0)
 		expect(eta.time).toBe(Infinity)
-		expect(eta.timeReadable).toBe('estimating time left')
 		expect(eta.speed).toBe(-1)
 	})
 
@@ -82,12 +80,11 @@ describe('ETA - progress', () => {
 			eta.add(2.5 * 1024 * 1024)
 			expect(eta.progress).toBe(i * 2.5)
 			expect(eta.speed).toBe(-1)
-			expect(eta.speedReadable).toBe('')
 			expect(eta.time).toBe(Infinity)
 		}
 
 		// this is reached after (virtual) 3s with 6 * 2.5MiB (=15MiB) data of 100MiB total
-		expect(eta.timeReadable).toBe('estimating time left')
+		expect(eta.time).toBe(Infinity)
 
 		// Adding another 500ms with 5MiB/s will result in enough information for estimating
 		vi.advanceTimersByTime(500)
@@ -96,7 +93,6 @@ describe('ETA - progress', () => {
 		expect(eta.speed).toMatchInlineSnapshot('4826778')
 		expect(eta.speedReadable).toMatchInlineSnapshot('"4.6 MB∕s"')
 		expect(eta.time).toMatchInlineSnapshot('18')
-		expect(eta.timeReadable).toMatchInlineSnapshot('"18 seconds left"')
 
 		// Skip forward another 4.5seconds
 		for (let i = 0; i < 9; i++) {
@@ -109,7 +105,6 @@ describe('ETA - progress', () => {
 		expect(eta.speed).toMatchInlineSnapshot('5060836')
 		expect(eta.speedReadable).toMatchInlineSnapshot('"4.8 MB∕s"')
 		expect(eta.time).toMatchInlineSnapshot('12')
-		expect(eta.timeReadable).toMatchInlineSnapshot('"12 seconds left"')
 
 		// Having a spike of 10MiB/s will not result in halfing the eta
 		vi.advanceTimersByTime(500)
@@ -120,7 +115,6 @@ describe('ETA - progress', () => {
 		expect(eta.speedReadable).toMatchInlineSnapshot('"5 MB∕s"')
 		// And the time has not halved
 		expect(eta.time).toMatchInlineSnapshot('11')
-		expect(eta.timeReadable).toMatchInlineSnapshot('"11 seconds left"')
 
 		// Add another 3 seconds so we should see 'few seconds left'
 		for (let i = 0; i < 6; i++) {
@@ -130,7 +124,6 @@ describe('ETA - progress', () => {
 		expect(eta.progress).toBe(60)
 		expect(eta.speed).toMatchInlineSnapshot('5344192')
 		expect(eta.time).toMatchInlineSnapshot('8')
-		expect(eta.timeReadable).toMatchInlineSnapshot('"a few seconds left"')
 	})
 
 	test('long running progress', () => {
@@ -151,8 +144,6 @@ describe('ETA - progress', () => {
 		eta.add(512 * 1024)
 		expect(eta.progress).toBe(3.5)
 		expect(eta.time).toBe(105)
-		// time is over 1 minute so we see the formatted output
-		expect(eta.timeReadable).toMatchInlineSnapshot('"00:01:45 left"')
 
 		// Add another minute and we should see only seconds:
 		for (let i = 0; i < 120; i++) {
@@ -164,7 +155,6 @@ describe('ETA - progress', () => {
 		// Now we have uploaded 63.5 MiB - so 36.5 MiB missing by having 1MiB/s upload speed we expect 37 seconds left:
 		expect(eta.progress).toBe(63.5)
 		expect(eta.time).toBe(37)
-		expect(eta.timeReadable).toMatchInlineSnapshot('"37 seconds left"')
 	})
 
 	test('progress calculation for fast uploads', () => {
@@ -180,15 +170,13 @@ describe('ETA - progress', () => {
 		expect(eta.progress).toBe(20)
 		expect(eta.speed).toBe(-1)
 		expect(eta.time).toBe(Infinity)
-		expect(eta.timeReadable).toBe('estimating time left')
 
 		// Now we have some information but not enough for normal estimation
 		// yet we show some information as the upload is very fast (40% per second)
 		vi.advanceTimersByTime(500)
 		eta.add(20 * 1024 * 1024)
 		expect(eta.progress).toBe(40)
 		expect(eta.time).toBe(1.5)
-		expect(eta.timeReadable).toBe('a few seconds left')
 		// still no speed information
 		expect(eta.speed).toBe(-1)
 
@@ -198,7 +186,6 @@ describe('ETA - progress', () => {
 			eta.add(20 * 1024 * 1024)
 			expect(eta.progress).toBe(40 + i * 20)
 			expect(eta.time).toBe(1.5 - (i / 2))
-			expect(eta.timeReadable).toBe('a few seconds left')
 			// still no speed information
 			expect(eta.speed).toBe(-1)
 		}
@@ -210,7 +197,6 @@ describe('ETA - progress', () => {
 		expect(eta.status).toBe(EtaStatus.Running)
 		expect(eta.progress).toBe(0)
 		expect(eta.time).toBe(Infinity)
-		expect(eta.timeReadable).toBe('estimating time left')
 		expect(eta.speed).toBe(-1)
 	})
 

lib/upload/uploader/Eta.ts

@@ -5,7 +5,6 @@
 
 import { TypedEventTarget } from 'typescript-event-target'
 import { formatFileSize } from '../../utils/fileSize.ts'
-import { n, t } from '../utils/l10n.ts'
 
 export const EtaStatus = Object.freeze({
 	Idle: 0,
@@ -183,29 +182,12 @@ export class Eta extends TypedEventTarget<EtaEventsMap> {
 
 	/**
 	 * Estimated time in seconds.
+	 * If the time is not yet estimated, it will return `Infinity`.
 	 */
 	public get time(): number {
 		return this._eta
 	}
 
-	/**
-	 * Human readable version of the estimated time.
-	 */
-	public get timeReadable(): string {
-		if (this._eta === Infinity) {
-			return t('estimating time left')
-		} else if (this._eta < 10) {
-			return t('a few seconds left')
-		} else if (this._eta < 60) {
-			return n('{seconds} seconds left', '{seconds} seconds left', this._eta, { seconds: this._eta })
-		}
-
-		const hours = String(Math.floor(this._eta / 3600)).padStart(2, '0')
-		const minutes = String(Math.floor((this._eta % 3600) / 60)).padStart(2, '0')
-		const seconds = String(this._eta % 60).padStart(2, '0')
-		return t('{time} left', { time: `${hours}:${minutes}:${seconds}` }) // TRANSLATORS time has the format 00:00:00
-	}
-
 	/**
 	 * Transfer speed in bytes per second.
 	 * Returns `-1` if not yet estimated.

lib/upload/uploader/Uploader.ts

@@ -22,7 +22,6 @@ import { UploadCancelledError } from '../errors/UploadCancelledError.ts'
 import { getMaxChunksSize } from '../utils/config.ts'
 import { isFileSystemFileEntry } from '../utils/filesystem.ts'
 import { Directory } from '../utils/fileTree.ts'
-import { t } from '../utils/l10n.ts'
 import { getChunk, initChunkWorkspace, uploadData } from '../utils/upload.ts'
 import { Eta } from './Eta.ts'
 import { Upload, UploadStatus } from './Upload.ts'
@@ -630,7 +629,7 @@ export class Uploader {
 						throw new UploadCancelledError(error)
 					} else {
 						upload.status = UploadStatus.FAILED
-						throw new Error(t('Failed to assemble the chunks together'))
+						throw new Error('Failed to assemble the chunks together')
 					}
 				} finally {
 					// Notify listeners of the upload completion
@@ -689,7 +688,7 @@ export class Uploader {
 
 					upload.status = UploadStatus.FAILED
 					logger.error(`Failed uploading ${file.name}`, { error, file, upload })
-					throw new Error(t('Failed to upload the file'))
+					throw new Error('Failed to upload the file')
 				} finally {
 					// Notify listeners of the upload completion
 					this._notifyAll(upload)