build(deps): bump github.com/go-viper/mapstructure/v2 in /tools

Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/go-viper/mapstructure/releases)
- [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md)
- [Commits](https://github.com/go-viper/mapstructure/compare/v2.3.0...v2.4.0)

---
updated-dependencies:
- dependency-name: github.com/go-viper/mapstructure/v2
  dependency-version: 2.4.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/main.yaml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.23.0
+          go-version: '1.24'
       - run: make lint-backend
   lint:
     runs-on: ubuntu-latest
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.23.0
+          go-version: '1.24'
       - run: make test-backend
   test:
     runs-on: ubuntu-latest
@@ -76,7 +76,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.23.0
+          go-version: '1.23'
       - uses: pnpm/action-setup@v4
         with:
           package_json_file: "frontend/package.json"

CHANGELOG.md

@@ -2,6 +2,78 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.42.5](https://github.com/filebrowser/filebrowser/compare/v2.42.4...v2.42.5) (2025-08-16)
+
+
+### Bug Fixes
+
+* "new folder" button not working in the move and copy popup ([#5368](https://github.com/filebrowser/filebrowser/issues/5368)) ([3107ae4](https://github.com/filebrowser/filebrowser/commit/3107ae41475ae9383c3af414d25a133e549f8087))
+
+### [2.42.4](https://github.com/filebrowser/filebrowser/compare/v2.42.3...v2.42.4) (2025-08-16)
+
+
+### Bug Fixes
+
+* add libcap to Dockerfile.s6 ([342b239](https://github.com/filebrowser/filebrowser/commit/342b239ac6f4af2453d5f7aa27f7f0093024dd72))
+
+### [2.42.3](https://github.com/filebrowser/filebrowser/compare/v2.42.2...v2.42.3) (2025-08-09)
+
+
+### Bug Fixes
+
+* add missing CLI flags for user management ([#5351](https://github.com/filebrowser/filebrowser/issues/5351)) ([cd51a59](https://github.com/filebrowser/filebrowser/commit/cd51a59e72c72560fce7bcc9b12aaf02646b699c))
+
+### [2.42.2](https://github.com/filebrowser/filebrowser/compare/v2.42.1...v2.42.2) (2025-08-06)
+
+
+### Bug Fixes
+
+* show file upload errors ([06e8713](https://github.com/filebrowser/filebrowser/commit/06e8713fa55065d38f02499d3e8d39fc86926cab))
+
+
+### Refactorings
+
+* upload progress calculation ([#5350](https://github.com/filebrowser/filebrowser/issues/5350)) ([c14cf86](https://github.com/filebrowser/filebrowser/commit/c14cf86f8304e01d804e01a7eef5ea093627ef37))
+
+### [2.42.1](https://github.com/filebrowser/filebrowser/compare/v2.42.0...v2.42.1) (2025-07-31)
+
+
+### Features
+
+* Translate frontend/src/i18n/en.json in sk  ([14ee054](https://github.com/filebrowser/filebrowser/commit/14ee0543599f2ec73b7f5d2dbd8415f47fe592aa))
+* Translate frontend/src/i18n/en.json in vi ([75baf7c](https://github.com/filebrowser/filebrowser/commit/75baf7ce337671a1045f897ba4a19967a31b1aec))
+
+
+### Bug Fixes
+
+* directory mode on config init ([4ff6347](https://github.com/filebrowser/filebrowser/commit/4ff634715543b65878943273dff70f340167900b))
+
+## [2.42.0](https://github.com/filebrowser/filebrowser/compare/v2.41.0...v2.42.0) (2025-07-27)
+
+
+### Features
+
+* add Norwegian support ([#5332](https://github.com/filebrowser/filebrowser/issues/5332)) ([25e47c3](https://github.com/filebrowser/filebrowser/commit/25e47c3ce8b35b820b5370a4b8bfdf682bd5ae0b))
+* select item on file list after navigating back ([#5329](https://github.com/filebrowser/filebrowser/issues/5329)) ([cbeec6d](https://github.com/filebrowser/filebrowser/commit/cbeec6d225691723c4750d7f84122ebb14d662bf))
+* Translate frontend/src/i18n/en.json in no ([5eb3bf4](https://github.com/filebrowser/filebrowser/commit/5eb3bf40586c2ffc32f4834b5dd59f0eb719c1f7))
+* Translate frontend/src/i18n/en.json in sk ([07dfdce](https://github.com/filebrowser/filebrowser/commit/07dfdce8e4c371f4ca7480f3cef0bd66ff5c9abb))
+
+
+### Bug Fixes
+
+* norsk loading ([619f683](https://github.com/filebrowser/filebrowser/commit/619f6837b0d1ec6c654d30f4ecedd6696874721f))
+
+
+### Reverts
+
+* Revert "chore(release): 2.42.0" ([d778c19](https://github.com/filebrowser/filebrowser/commit/d778c192ae02c5e73781f7632e3b7276c5811e17))
+
+
+### Build
+
+* bump go version to 1.23.11 ([c7a5c7e](https://github.com/filebrowser/filebrowser/commit/c7a5c7efee2b2bede89ec90bafd1af61c39519ff))
+* bump to go 1.24 ([c1b0207](https://github.com/filebrowser/filebrowser/commit/c1b0207800b4bb52c8dd459c1d69ce0f785473b6))
+
 ## [2.41.0](https://github.com/filebrowser/filebrowser/compare/v2.40.2...v2.41.0) (2025-07-22)
 
 

Dockerfile.s6

@@ -1,7 +1,7 @@
 FROM ghcr.io/linuxserver/baseimage-alpine:3.22
 
 RUN apk update && \
-  apk --no-cache add ca-certificates mailcap jq
+  apk --no-cache add ca-certificates mailcap jq libcap
 
 # Make user and create necessary directories
 RUN mkdir -p /config /database /srv && \
@@ -12,7 +12,8 @@ COPY filebrowser /bin/filebrowser
 COPY docker/common/ /
 COPY docker/s6/ /
 
-RUN chown -R abc:abc /bin/filebrowser /defaults healthcheck.sh
+RUN chown -R abc:abc /bin/filebrowser /defaults healthcheck.sh && \
+  setcap 'cap_net_bind_service=+ep' /bin/filebrowser
 
 # Define healthcheck script
 HEALTHCHECK --start-period=2s --interval=5s --timeout=3s CMD /healthcheck.sh

cmd/config_init.go

@@ -103,7 +103,7 @@ override the options.`,
 			return err
 		}
 
-		s.DirMode, err = getMode(flags, "file-mode")
+		s.DirMode, err = getMode(flags, "dir-mode")
 		if err != nil {
 			return err
 		}

cmd/users.go

@@ -77,6 +77,8 @@ func addUserFlags(flags *pflag.FlagSet) {
 	flags.String("locale", "en", "locale for users")
 	flags.String("viewMode", string(users.ListViewMode), "view mode for users")
 	flags.Bool("singleClick", false, "use single clicks only")
+	flags.Bool("dateFormat", false, "use date format (true for absolute time, false for relative)")
+	flags.Bool("hideDotfiles", false, "hide dotfiles")
 }
 
 func getViewMode(flags *pflag.FlagSet) (users.ViewMode, error) {

cmd/users_add.go

@@ -36,10 +36,22 @@ var usersAddCmd = &cobra.Command{
 			return err
 		}
 
+		dateFormat, err := getBool(cmd.Flags(), "dateFormat")
+		if err != nil {
+			return err
+		}
+
+		hideDotfiles, err := getBool(cmd.Flags(), "hideDotfiles")
+		if err != nil {
+			return err
+		}
+
 		user := &users.User{
 			Username:     args[0],
 			Password:     password,
 			LockPassword: lockPassword,
+			DateFormat:   dateFormat,
+			HideDotfiles: hideDotfiles,
 		}
 
 		s.Defaults.Apply(user)

cmd/users_update.go

@@ -76,6 +76,14 @@ options you want to change.`,
 		if err != nil {
 			return err
 		}
+		user.DateFormat, err = getBool(flags, "dateFormat")
+		if err != nil {
+			return err
+		}
+		user.HideDotfiles, err = getBool(flags, "hideDotfiles")
+		if err != nil {
+			return err
+		}
 
 		if newUsername != "" {
 			user.Username = newUsername

frontend/src/api/search.ts

@@ -13,7 +13,7 @@ export default async function search(base: string, query: string) {
 
   let data = await res.json();
 
-  data = data.map((item: UploadItem) => {
+  data = data.map((item: ResourceItem & { dir: boolean }) => {
     item.url = `/files${base}` + url.encodePath(item.path);
 
     if (item.dir) {

frontend/src/api/tus.ts

@@ -1,17 +1,11 @@
 import * as tus from "tus-js-client";
 import { baseURL, tusEndpoint, tusSettings, origin } from "@/utils/constants";
 import { useAuthStore } from "@/stores/auth";
-import { useUploadStore } from "@/stores/upload";
 import { removePrefix } from "@/api/utils";
 
 const RETRY_BASE_DELAY = 1000;
 const RETRY_MAX_DELAY = 20000;
-const SPEED_UPDATE_INTERVAL = 1000;
+const CURRENT_UPLOAD_LIST: { [key: string]: tus.Upload } = {};
-const ALPHA = 0.2;
-const ONE_MINUS_ALPHA = 1 - ALPHA;
-const RECENT_SPEEDS_LIMIT = 5;
-const MB_DIVISOR = 1024 * 1024;
-const CURRENT_UPLOAD_LIST: CurrentUploadList = {};
 
 export async function upload(
   filePath: string,
@@ -55,48 +49,35 @@ export async function upload(
 
         return true;
       },
-      onError: function (error) {
+      onError: function (error: Error | tus.DetailedError) {
-        if (CURRENT_UPLOAD_LIST[filePath].interval) {
-          clearInterval(CURRENT_UPLOAD_LIST[filePath].interval);
-        }
         delete CURRENT_UPLOAD_LIST[filePath];
-        reject(new Error(`Upload failed: ${error.message}`));
+
+        if (error.message === "Upload aborted") {
+          return reject(error);
+        }
+
+        const message =
+          error instanceof tus.DetailedError
+            ? error.originalResponse === null
+              ? "000 No connection"
+              : error.originalResponse.getBody()
+            : "Upload failed";
+
+        console.error(error);
+
+        reject(new Error(message));
       },
       onProgress: function (bytesUploaded) {
-        const fileData = CURRENT_UPLOAD_LIST[filePath];
-        fileData.currentBytesUploaded = bytesUploaded;
-
-        if (!fileData.hasStarted) {
-          fileData.hasStarted = true;
-          fileData.lastProgressTimestamp = Date.now();
-
-          fileData.interval = window.setInterval(() => {
-            calcProgress(filePath);
-          }, SPEED_UPDATE_INTERVAL);
-        }
         if (typeof onupload === "function") {
           onupload({ loaded: bytesUploaded });
         }
       },
       onSuccess: function () {
-        if (CURRENT_UPLOAD_LIST[filePath].interval) {
-          clearInterval(CURRENT_UPLOAD_LIST[filePath].interval);
-        }
         delete CURRENT_UPLOAD_LIST[filePath];
         resolve();
       },
     });
-    CURRENT_UPLOAD_LIST[filePath] = {
+    CURRENT_UPLOAD_LIST[filePath] = upload;
-      upload: upload,
-      recentSpeeds: [],
-      initialBytesUploaded: 0,
-      currentBytesUploaded: 0,
-      currentAverageSpeed: 0,
-      lastProgressTimestamp: null,
-      sumOfRecentSpeeds: 0,
-      hasStarted: false,
-      interval: undefined,
-    };
     upload.start();
   });
 }
@@ -128,76 +109,11 @@ function isTusSupported() {
   return tus.isSupported === true;
 }
 
-function computeETA(speed?: number) {
-  const state = useUploadStore();
-  if (state.speedMbyte === 0) {
-    return Infinity;
-  }
-  const totalSize = state.sizes.reduce(
-    (acc: number, size: number) => acc + size,
-    0
-  );
-  const uploadedSize = state.progress.reduce((a, b) => a + b, 0);
-  const remainingSize = totalSize - uploadedSize;
-  const speedBytesPerSecond = (speed ?? state.speedMbyte) * 1024 * 1024;
-  return remainingSize / speedBytesPerSecond;
-}
-
-function computeGlobalSpeedAndETA() {
-  let totalSpeed = 0;
-  let totalCount = 0;
-
-  for (const filePath in CURRENT_UPLOAD_LIST) {
-    totalSpeed += CURRENT_UPLOAD_LIST[filePath].currentAverageSpeed;
-    totalCount++;
-  }
-
-  if (totalCount === 0) return { speed: 0, eta: Infinity };
-
-  const averageSpeed = totalSpeed / totalCount;
-  const averageETA = computeETA(averageSpeed);
-
-  return { speed: averageSpeed, eta: averageETA };
-}
-
-function calcProgress(filePath: string) {
-  const uploadStore = useUploadStore();
-  const fileData = CURRENT_UPLOAD_LIST[filePath];
-
-  const elapsedTime =
-    (Date.now() - (fileData.lastProgressTimestamp ?? 0)) / 1000;
-  const bytesSinceLastUpdate =
-    fileData.currentBytesUploaded - fileData.initialBytesUploaded;
-  const currentSpeed = bytesSinceLastUpdate / MB_DIVISOR / elapsedTime;
-
-  if (fileData.recentSpeeds.length >= RECENT_SPEEDS_LIMIT) {
-    fileData.sumOfRecentSpeeds -= fileData.recentSpeeds.shift() ?? 0;
-  }
-
-  fileData.recentSpeeds.push(currentSpeed);
-  fileData.sumOfRecentSpeeds += currentSpeed;
-
-  const avgRecentSpeed =
-    fileData.sumOfRecentSpeeds / fileData.recentSpeeds.length;
-  fileData.currentAverageSpeed =
-    ALPHA * avgRecentSpeed + ONE_MINUS_ALPHA * fileData.currentAverageSpeed;
-
-  const { speed, eta } = computeGlobalSpeedAndETA();
-  uploadStore.setUploadSpeed(speed);
-  uploadStore.setETA(eta);
-
-  fileData.initialBytesUploaded = fileData.currentBytesUploaded;
-  fileData.lastProgressTimestamp = Date.now();
-}
-
 export function abortAllUploads() {
   for (const filePath in CURRENT_UPLOAD_LIST) {
-    if (CURRENT_UPLOAD_LIST[filePath].interval) {
+    if (CURRENT_UPLOAD_LIST[filePath]) {
-      clearInterval(CURRENT_UPLOAD_LIST[filePath].interval);
+      CURRENT_UPLOAD_LIST[filePath].abort(true);
-    }
+      CURRENT_UPLOAD_LIST[filePath].options!.onError!(
-    if (CURRENT_UPLOAD_LIST[filePath].upload) {
-      CURRENT_UPLOAD_LIST[filePath].upload.abort(true);
-      CURRENT_UPLOAD_LIST[filePath].upload.options!.onError!(
         new Error("Upload aborted")
       );
     }

frontend/src/components/Sidebar.vue

@@ -132,7 +132,6 @@ import {
 import { files as api } from "@/api";
 import ProgressBar from "@/components/ProgressBar.vue";
 import prettyBytes from "pretty-bytes";
-import { StatusError } from "@/api/utils.js";
 
 const USAGE_DEFAULT = { used: "0 B", total: "0 B", usedPercentage: 0 };
 
@@ -181,13 +180,9 @@ export default {
           total: prettyBytes(usage.total, { binary: true }),
           usedPercentage: Math.round((usage.used / usage.total) * 100),
         };
-      } catch (error) {
+      } finally {
-        if (error instanceof StatusError && error.is_canceled) {
-          return;
-        }
-        this.$showError(error);
-      }
         return Object.assign(this.usage, usageStats);
+      }
     },
     toRoot() {
       this.$router.push({ path: "/files" });

frontend/src/components/prompts/Copy.vue

@@ -62,6 +62,7 @@ import FileList from "./FileList.vue";
 import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import * as upload from "@/utils/upload";
+import { removePrefix } from "@/api/utils";
 
 export default {
   name: "copy",
@@ -76,7 +77,7 @@ export default {
   computed: {
     ...mapState(useFileStore, ["req", "selected"]),
     ...mapState(useAuthStore, ["user"]),
-    ...mapWritableState(useFileStore, ["reload"]),
+    ...mapWritableState(useFileStore, ["reload", "preselect"]),
   },
   methods: {
     ...mapActions(useLayoutStore, ["showHover", "closeHovers"]),
@@ -100,6 +101,7 @@ export default {
           .copy(items, overwrite, rename)
           .then(() => {
             buttons.success("copy");
+            this.preselect = removePrefix(items[0].to);
 
             if (this.$route.path === this.dest) {
               this.reload = true;

frontend/src/components/prompts/Delete.vue

@@ -48,16 +48,15 @@ export default {
       "selectedCount",
       "req",
       "selected",
-      "currentPrompt",
     ]),
-    ...mapWritableState(useFileStore, ["reload"]),
+    ...mapState(useLayoutStore, ["currentPrompt"]),
+    ...mapWritableState(useFileStore, ["reload", "preselect"]),
   },
   methods: {
     ...mapActions(useLayoutStore, ["closeHovers"]),
     submit: async function () {
       buttons.loading("delete");
 
-      window.sessionStorage.setItem("modified", "true");
       try {
         if (!this.isListing) {
           await api.remove(this.$route.path);
@@ -81,6 +80,12 @@ export default {
 
         await Promise.all(promises);
         buttons.success("delete");
+
+        const nearbyItem =
+          this.req.items[Math.max(0, Math.min(this.selected) - 1)];
+
+        this.preselect = nearbyItem?.path;
+
         this.reload = true;
       } catch (e) {
         buttons.done("delete");

frontend/src/components/prompts/DiscardEditorChanges.vue

@@ -17,7 +17,7 @@
       </button>
       <button
         id="focus-prompt"
-        @click="submit"
+        @click="currentPrompt.confirm"
         class="button button--flat button--red"
         :aria-label="$t('buttons.discardChanges')"
         :title="$t('buttons.discardChanges')"
@@ -30,22 +30,16 @@
 </template>
 
 <script>
-import { mapActions } from "pinia";
+import { mapState, mapActions } from "pinia";
-import url from "@/utils/url";
 import { useLayoutStore } from "@/stores/layout";
-import { useFileStore } from "@/stores/file";
 
 export default {
   name: "discardEditorChanges",
+  computed: {
+    ...mapState(useLayoutStore, ["currentPrompt"]),
+  },
   methods: {
     ...mapActions(useLayoutStore, ["closeHovers"]),
-    ...mapActions(useFileStore, ["updateRequest"]),
-    submit: async function () {
-      this.updateRequest(null);
-
-      const uri = url.removeLastDir(this.$route.path) + "/";
-      this.$router.push({ path: uri });
-    },
   },
 };
 </script>

frontend/src/components/prompts/FileList.vue

@@ -25,9 +25,10 @@
 </template>
 
 <script>
-import { mapState } from "pinia";
+import { mapState, mapActions } from "pinia";
 import { useAuthStore } from "@/stores/auth";
 import { useFileStore } from "@/stores/file";
+import { useLayoutStore } from "@/stores/layout";
 
 import url from "@/utils/url";
 import { files } from "@/api";
@@ -68,6 +69,7 @@ export default {
     this.abortOngoingNext();
   },
   methods: {
+    ...mapActions(useLayoutStore, ["showHover"]),
     abortOngoingNext() {
       this.nextAbortController.abort();
     },
@@ -163,7 +165,7 @@ export default {
       this.$emit("update:selected", this.selected);
     },
     createDir: async function () {
-      this.$store.commit("showHover", {
+      this.showHover({
         prompt: "newDir",
         action: null,
         confirm: null,

frontend/src/components/prompts/Move.vue

@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { mapActions, mapState } from "pinia";
+import { mapActions, mapState, mapWritableState } from "pinia";
 import { useFileStore } from "@/stores/file";
 import { useLayoutStore } from "@/stores/layout";
 import { useAuthStore } from "@/stores/auth";
@@ -63,6 +63,7 @@ import FileList from "./FileList.vue";
 import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import * as upload from "@/utils/upload";
+import { removePrefix } from "@/api/utils";
 
 export default {
   name: "move",
@@ -77,6 +78,7 @@ export default {
   computed: {
     ...mapState(useFileStore, ["req", "selected"]),
     ...mapState(useAuthStore, ["user"]),
+    ...mapWritableState(useFileStore, ["preselect"]),
     excludedFolders() {
       return this.selected
         .filter((idx) => this.req.items[idx].isDir)
@@ -104,6 +106,7 @@ export default {
           .move(items, overwrite, rename)
           .then(() => {
             buttons.success("move");
+            this.preselect = removePrefix(items[0].to);
             this.$router.push({ path: this.dest });
           })
           .catch((e) => {

frontend/src/components/prompts/Rename.vue

@@ -46,6 +46,7 @@ import { useFileStore } from "@/stores/file";
 import { useLayoutStore } from "@/stores/layout";
 import url from "@/utils/url";
 import { files as api } from "@/api";
+import { removePrefix } from "@/api/utils";
 
 export default {
   name: "rename",
@@ -65,7 +66,7 @@ export default {
       "selectedCount",
       "isListing",
     ]),
-    ...mapWritableState(useFileStore, ["reload"]),
+    ...mapWritableState(useFileStore, ["reload", "preselect"]),
   },
   methods: {
     ...mapActions(useLayoutStore, ["closeHovers"]),
@@ -97,7 +98,6 @@ export default {
       newLink =
         url.removeLastDir(oldLink) + "/" + encodeURIComponent(this.name);
 
-      window.sessionStorage.setItem("modified", "true");
       try {
         await api.move([{ from: oldLink, to: newLink }]);
         if (!this.isListing) {
@@ -105,6 +105,8 @@ export default {
           return;
         }
 
+        this.preselect = removePrefix(newLink);
+
         this.reload = true;
       } catch (e) {
         this.$showError(e);

frontend/src/components/prompts/UploadFiles.vue

@@ -1,20 +1,25 @@
 <template>
   <div
-    v-if="filesInUploadCount > 0"
+    v-if="uploadStore.activeUploads.size > 0"
     class="upload-files"
     v-bind:class="{ closed: !open }"
   >
     <div class="card floating">
       <div class="card-title">
-        <h2>{{ $t("prompts.uploadFiles", { files: filesInUploadCount }) }}</h2>
+        <h2>
+          {{
+            $t("prompts.uploadFiles", {
+              files: uploadStore.pendingUploadCount,
+            })
+          }}
+        </h2>
         <div class="upload-info">
-          <div class="upload-speed">{{ uploadSpeed.toFixed(2) }} MB/s</div>
+          <div class="upload-speed">{{ speedMbytes }}/s</div>
           <div class="upload-eta">{{ formattedETA }} remaining</div>
-          <div class="upload-percentage">
+          <div class="upload-percentage">{{ sentPercent }}% Completed</div>
-            {{ getProgressDecimal }}% Completed
-          </div>
           <div class="upload-fraction">
-            {{ getTotalProgressBytes }} / {{ getTotalSize }}
+            {{ sentMbytes }} /
+            {{ totalMbytes }}
           </div>
         </div>
         <button
@@ -40,17 +45,21 @@
       <div class="card-content file-icons">
         <div
           class="file"
-          v-for="file in filesInUpload"
+          v-for="upload in uploadStore.activeUploads"
-          :key="file.id"
+          :key="upload.path"
-          :data-dir="file.isDir"
+          :data-dir="upload.type === 'dir'"
-          :data-type="file.type"
+          :data-type="upload.type"
-          :aria-label="file.name"
+          :aria-label="upload.name"
         >
           <div class="file-name">
-            <i class="material-icons"></i> {{ file.name }}
+            <i class="material-icons"></i> {{ upload.name }}
           </div>
           <div class="file-progress">
-            <div v-bind:style="{ width: file.progress + '%' }"></div>
+            <div
+              v-bind:style="{
+                width: (upload.sentBytes / upload.totalBytes) * 100 + '%',
+              }"
+            ></div>
           </div>
         </div>
       </div>
@@ -58,38 +67,105 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
-import { mapState, mapWritableState, mapActions } from "pinia";
-import { useUploadStore } from "@/stores/upload";
 import { useFileStore } from "@/stores/file";
-import { abortAllUploads } from "@/api/tus";
+import { useUploadStore } from "@/stores/upload";
+import { storeToRefs } from "pinia";
+import { computed, ref, watch } from "vue";
 import buttons from "@/utils/buttons";
+import { useI18n } from "vue-i18n";
+import { partial } from "filesize";
 
-export default {
+const { t } = useI18n({});
-  name: "uploadFiles",
+
-  data: function () {
+const open = ref<boolean>(false);
-    return {
+const speed = ref<number>(0);
-      open: false,
+const eta = ref<number>(Infinity);
-    };
+
-  },
+const fileStore = useFileStore();
-  computed: {
+const uploadStore = useUploadStore();
-    ...mapState(useUploadStore, [
+
-      "filesInUpload",
+const { sentBytes, totalBytes } = storeToRefs(uploadStore);
-      "filesInUploadCount",
+
-      "uploadSpeed",
+const byteToMbyte = partial({ exponent: 2 });
-      "getETA",
+
-      "getProgress",
+const sentPercent = computed(() =>
-      "getProgressDecimal",
+  ((uploadStore.sentBytes / uploadStore.totalBytes) * 100).toFixed(2)
-      "getTotalProgressBytes",
+);
-      "getTotalSize",
+
-    ]),
+const sentMbytes = computed(() => byteToMbyte(uploadStore.sentBytes));
-    ...mapWritableState(useFileStore, ["reload"]),
+const totalMbytes = computed(() => byteToMbyte(uploadStore.totalBytes));
-    formattedETA() {
+const speedMbytes = computed(() => byteToMbyte(speed.value));
-      if (!this.getETA || this.getETA === Infinity) {
+
+let lastSpeedUpdate: number = 0;
+let recentSpeeds: number[] = [];
+
+const calculateSpeed = (sentBytes: number, oldSentBytes: number) => {
+  // Reset the state when the uploads batch is complete
+  if (sentBytes === 0) {
+    lastSpeedUpdate = 0;
+    recentSpeeds = [];
+
+    eta.value = Infinity;
+    speed.value = 0;
+
+    return;
+  }
+
+  const elapsedTime = (Date.now() - (lastSpeedUpdate ?? 0)) / 1000;
+  const bytesSinceLastUpdate = sentBytes - oldSentBytes;
+  const currentSpeed = bytesSinceLastUpdate / elapsedTime;
+
+  recentSpeeds.push(currentSpeed);
+  if (recentSpeeds.length > 5) {
+    recentSpeeds.shift();
+  }
+
+  const recentSpeedsAverage =
+    recentSpeeds.reduce((acc, curr) => acc + curr) / recentSpeeds.length;
+
+  // Use the current speed for the first update to avoid smoothing lag
+  if (recentSpeeds.length === 1) {
+    speed.value = currentSpeed;
+  }
+
+  speed.value = recentSpeedsAverage * 0.2 + speed.value * 0.8;
+
+  lastSpeedUpdate = Date.now();
+
+  calculateEta();
+};
+
+const calculateEta = () => {
+  if (speed.value === 0) {
+    eta.value = Infinity;
+
+    return Infinity;
+  }
+
+  const remainingSize = uploadStore.totalBytes - uploadStore.sentBytes;
+  const speedBytesPerSecond = speed.value;
+
+  eta.value = remainingSize / speedBytesPerSecond;
+};
+
+watch(sentBytes, calculateSpeed);
+
+watch(totalBytes, (totalBytes, oldTotalBytes) => {
+  if (oldTotalBytes !== 0) {
+    return;
+  }
+
+  // Mark the start time of a new upload batch
+  lastSpeedUpdate = Date.now();
+});
+
+const formattedETA = computed(() => {
+  if (!eta.value || eta.value === Infinity) {
     return "--:--:--";
   }
 
-      let totalSeconds = this.getETA;
+  let totalSeconds = eta.value;
   const hours = Math.floor(totalSeconds / 3600);
   totalSeconds %= 3600;
   const minutes = Math.floor(totalSeconds / 60);
@@ -98,23 +174,19 @@ export default {
   return `${hours.toString().padStart(2, "0")}:${minutes
     .toString()
     .padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
-    },
+});
-  },
+
-  methods: {
+const toggle = () => {
-    ...mapActions(useUploadStore, ["reset"]), // Mapping reset action from upload store
+  open.value = !open.value;
-    toggle: function () {
+};
-      this.open = !this.open;
+
-    },
+const abortAll = () => {
-    abortAll() {
+  if (confirm(t("upload.abortUpload"))) {
-      if (confirm(this.$t("upload.abortUpload"))) {
-        abortAllUploads();
     buttons.done("upload");
-        this.open = false;
+    open.value = false;
-        this.reset(); // Resetting the upload store state
+    uploadStore.abort();
-        this.reload = true; // Trigger reload in the file store
+    fileStore.reload = true; // Trigger reload in the file store
   }
-    },
-  },
 };
 </script>
 

frontend/src/components/settings/Languages.vue

@@ -30,6 +30,7 @@ export default {
       ja: "日本語",
       ko: "한국어",
       "nl-be": "Dutch (Belgium)",
+      no: "Norsk",
       pl: "Polski",
       "pt-br": "Português",
       pt: "Português (Brasil)",

frontend/src/css/base.css

@@ -96,6 +96,9 @@ main {
   height: 3em;
   background: var(--background);
   border-bottom: 1px solid var(--divider);
+  position: sticky;
+  z-index: 1000;
+  top: 4em;
 }
 
 .breadcrumbs span,

frontend/src/css/styles.css

@@ -329,6 +329,7 @@ main .spinner .bounce2 {
 #editor-container {
   display: flex;
   flex-direction: column;
+  justify-content: center;
   background-color: var(--background);
   position: fixed;
   padding-top: 4em;
@@ -351,6 +352,8 @@ main .spinner .bounce2 {
 #editor-container .breadcrumbs {
   height: 2.3em;
   padding: 0 1em;
+  position: relative;
+  top: 0;
 }
 
 /*** RTL - flip and position arrow of path ***/

frontend/src/i18n/fr.json

@@ -77,14 +77,14 @@
     "noPreview": "L'aperçu n'est pas disponible pour ce fichier."
   },
   "help": {
-    "click": "Sélectionner un élément",
+    "click": "Sélectionner un fichier ou dossier",
     "ctrl": {
-      "click": "Sélectionner plusieurs éléments",
+      "click": "Sélectionner plusieurs fichiers ou dossiers",
       "f": "Ouvrir l'invité de recherche",
-      "s": "Télécharger l'élément actuel"
+      "s": "Enregistrer un fichier ou télécharger le dossier actuel"
     },
     "del": "Supprimer les éléments sélectionnés",
-    "doubleClick": "Ouvrir un élément",
+    "doubleClick": "Ouvrir un fichier ou dossier",
     "esc": "Désélectionner et/ou fermer la boîte de dialogue",
     "f1": "Ouvrir l'aide",
     "f2": "Renommer le fichier",
@@ -98,8 +98,8 @@
     "passwordsDontMatch": "Les mots de passe ne concordent pas",
     "signup": "S'inscrire",
     "submit": "Se connecter",
-    "username": "Utilisateur",
+    "username": "Utilisateur·ice",
-    "usernameTaken": "Le nom d'utilisateur est déjà pris",
+    "usernameTaken": "Le nom d'utilisateur·ice est déjà pris",
     "wrongCredentials": "Identifiants incorrects !"
   },
   "permanent": "Permanent",
@@ -110,7 +110,7 @@
     "deleteMessageMultiple": "Êtes-vous sûr de vouloir supprimer ces {count} élément(s) ?",
     "deleteMessageSingle": "Êtes-vous sûr de vouloir supprimer cet élément ?",
     "deleteMessageShare": "Êtes-vous sûr de vouloir supprimer ce partage ({path}) ?",
-    "deleteUser": "Êtes-vous sûr de vouloir supprimer cet utilisateur ?",
+    "deleteUser": "Êtes-vous sûr de vouloir supprimer cet·te utilisateur·ice ?",
     "deleteTitle": "Supprimer",
     "displayName": "Nom :",
     "download": "Télécharger",
@@ -120,7 +120,7 @@
     "filesSelected": "{count} éléments sélectionnés",
     "lastModified": "Dernière modification",
     "move": "Déplacer",
-    "moveMessage": "Choisissez l'emplacement où déplacer la sélection :",
+    "moveMessage": "Choisissez un nouveau dossier principal pour vos fichier(s)/dossier(s) :",
     "newArchetype": "Créer un nouveau post basé sur un archétype. Votre fichier sera créé dans le dossier de contenu.",
     "newDir": "Nouveau dossier",
     "newDirMessage": "Nom du nouveau dossier :",
@@ -155,12 +155,12 @@
   },
   "settings": {
     "admin": "Admin",
-    "administrator": "Administrateur",
+    "administrator": "Administrateur·ice",
     "allowCommands": "Exécuter des commandes",
     "allowEdit": "Éditer, renommer et supprimer des fichiers ou des dossiers",
     "allowNew": "Créer de nouveaux fichiers et dossiers",
     "allowPublish": "Publier de nouveaux posts et pages",
-    "allowSignup": "Autoriser les utilisateurs à s'inscrire",
+    "allowSignup": "Autoriser les utilisateur·ices à s'inscrire",
     "avoidChanges": "(Laisser vide pour conserver l'actuel)",
     "branding": "Image de marque",
     "brandingDirectoryPath": "Chemin du dossier d'image de marque",
@@ -169,17 +169,17 @@
     "commandRunner": "Exécuteur de commandes",
     "commandRunnerHelp": "Ici, vous pouvez définir les commandes qui seront exécutées lors des événements nommés précédemments. Vous devez en écrire une par ligne. Les variables d'environnement {0} et {1} seront disponibles, {0} étant relatif à {1}. Pour plus d'informations sur cette fonctionnalité et les variables d'environnement disponibles, veuillez lire la {2}.",
     "commandsUpdated": "Commandes mises à jour !",
-    "createUserDir": "Créer automatiquement un dossier pour l'utilisateur",
+    "createUserDir": "Créer automatiquement un dossier pour l'utilisateur·ice",
-    "minimumPasswordLength": "Minimum password length",
+    "minimumPasswordLength": "Taille minimale du mot de passe",
     "tusUploads": "Uploads segmentés",
     "tusUploadsHelp": "File Browser prend en charge les uploads segmentés afin de permettre une gestion efficace, fiable et reprenable sur des réseaux instables.",
     "tusUploadsChunkSize": "Taille maximale autorisée par segment (les uploads directs seront utilisés pour les fichiers plus petits). Vous pouvez entrer un entier en octets ou une chaîne telle que 10MB, 1GB, etc.",
     "tusUploadsRetryCount": "Nombre de tentatives en cas d'échec d'un segment.",
-    "userHomeBasePath": "Chemin de base pour les répertoires personnels des utilisateurs",
+    "userHomeBasePath": "Chemin de base pour les dossiers personnels des utilisateur·ices",
     "userScopeGenerationPlaceholder": "Le périmètre sera généré automatiquement",
-    "createUserHomeDirectory": "Créer le répertoire personnel de l'utilisateur",
+    "createUserHomeDirectory": "Créer le dossier personnel de l'utilisateur·ice",
     "customStylesheet": "Feuille de style personnalisée",
-    "defaultUserDescription": "Paramètres par défaut pour les nouveaux utilisateurs.",
+    "defaultUserDescription": "Paramètres par défaut pour les nouveaux utilisateur·ices.",
     "disableExternalLinks": "Désactiver les liens externes (sauf la documentation)",
     "disableUsedDiskPercentage": "Désactiver le graphique de pourcentage d'utilisation du disque",
     "documentation": "documentation",
@@ -188,12 +188,12 @@
     "executeOnShellDescription": "Par défaut, File Browser exécute les commandes en appelant directement leurs binaires. Si vous voulez les exécuter sur un shell à la place (comme Bash ou PowerShell), vous pouvez le définir ici avec les arguments et les drapeaux requis. S'il est défini, la commande que vous exécutez sera ajoutée en tant qu'argument. Cela s'applique à la fois aux commandes utilisateur et aux crochets d'événements.",
     "globalRules": "Il s'agit d'un ensemble global de règles d'autorisation et d'interdiction. Elles s'appliquent à tous les utilisateurs. Vous pouvez définir des règles spécifiques sur les paramètres de chaque utilisateur pour remplacer celles-ci.",
     "globalSettings": "Paramètres globaux",
-    "hideDotfiles": "Cacher les fichiers de configuration utilisateur (dotfiles)",
+    "hideDotfiles": "Cacher les fichiers de configuration commançant par un point",
     "insertPath": "Insérer le chemin",
     "insertRegex": "Insérer une expression régulière",
     "instanceName": "Nom de l'instance",
     "language": "Langue",
-    "lockPassword": "Empêcher l'utilisateur de changer son mot de passe",
+    "lockPassword": "Empêcher l'utilisateur·ice de changer son mot de passe",
     "newPassword": "Votre nouveau mot de passe",
     "newPasswordConfirm": "Confirmation du nouveau mot de passe",
     "newUser": "Nouvel utilisateur",
@@ -210,13 +210,13 @@
       "share": "Partager des fichiers"
     },
     "permissions": "Permissions",
-    "permissionsHelp": "Vous pouvez définir l'utilisateur comme étant un administrateur ou encore choisir les permissions individuellement. Si vous sélectionnez \"Administrateur\", toutes les autres options seront automatiquement activées. La gestion des utilisateurs est un privilège que seul l'administrateur possède.\n",
+    "permissionsHelp": "Vous pouvez définir l'utilisateur·ice comme étant administrateur·ice ou encore choisir les permissions individuellement. Si vous sélectionnez \"Administrateur·ice\", toutes les autres options seront automatiquement activées. La gestion des utilisateur·ices est un privilège que seul l'administrateur·ice possède.\n",
     "profileSettings": "Paramètres du profil",
-    "ruleExample1": "Bloque l'accès à tous les fichiers commençant par un point (comme par exemple .git, .gitignore) dans tous les dossiers",
+    "ruleExample1": "Bloque l'accès à tous les fichiers commençant par un point (comme par exemple .git, .gitignore) dans tous les dossiers.\n",
-    "ruleExample2": "Bloque l'accès au fichier nommé \"Caddyfile\" à la racine du dossier utilisateur",
+    "ruleExample2": "Bloque l'accès au fichier nommé \"Caddyfile\" à la racine du dossier utilisateur·ice.",
     "rules": "Règles",
-    "rulesHelp": "Vous pouvez définir ici un ensemble de règles pour cet utilisateur. Les fichiers bloqués ne seront pas affichés et ne seront pas accessibles par l'utilisateur. Les expressions régulières sont supportées et les chemins d'accès sont relatifs par rapport au dossier de l'utilisateur.\n",
+    "rulesHelp": "Vous pouvez définir ici un ensemble de règles pour cet utilisateur·ice. Les fichiers bloqués ne seront pas affichés et ne seront pas accessibles par l'utilisateur·ice. Les expressions régulières sont supportées et les chemins d'accès sont relatifs par rapport au dossier de l'utilisateur·ice.\n",
-    "scope": "Portée du dossier utilisateur",
+    "scope": "Portée du dossier utilisateur·ice",
     "setDateFormat": "Définir le format de la date",
     "settingsUpdated": "Les paramètres ont été mis à jour !",
     "shareDuration": "Durée du partage",
@@ -224,21 +224,21 @@
     "shareDeleted": "Partage supprimé !",
     "singleClick": "Utiliser un simple clic pour ouvrir les fichiers et les dossiers",
     "themes": {
-      "default": "System default",
+      "default": "Par défaut du système",
       "dark": "Sombre",
       "light": "Clair",
       "title": "Thème"
     },
-    "user": "Utilisateur",
+    "user": "Utilisateur·ice",
     "userCommands": "Commandes",
-    "userCommandsHelp": "Une liste séparée par des espaces des commandes permises pour l'utilisateur. Exemple :\n",
+    "userCommandsHelp": "Une liste séparée par des espaces des commandes permises pour l'utilisateur·ice. Exemple :\n",
-    "userCreated": "Utilisateur créé !",
+    "userCreated": "Utilisateur·ice créé !",
-    "userDefaults": "Paramètres par défaut de l'utilisateur",
+    "userDefaults": "Paramètres par défaut de l'utilisateur.ice",
-    "userDeleted": "Utilisateur supprimé !",
+    "userDeleted": "Utilisateur·ice supprimé !",
-    "userManagement": "Gestion des utilisateurs",
+    "userManagement": "Gestion des utilisateur·ices",
-    "userUpdated": "Utilisateur mis à jour !",
+    "userUpdated": "Utilisateur·ice mis à jour !",
-    "username": "Nom d'utilisateur",
+    "username": "Nom d'utilisateur·ice",
-    "users": "Utilisateurs"
+    "users": "Utilisateur·ices"
   },
   "sidebar": {
     "help": "Aide",

frontend/src/i18n/index.ts

@@ -27,6 +27,7 @@ import("dayjs/locale/vi");
 import("dayjs/locale/zh-cn");
 import("dayjs/locale/zh-tw");
 import("dayjs/locale/cs");
+import("dayjs/locale/nb");
 
 // All i18n resources specified in the plugin `include` option can be loaded
 // at once using the import syntax
@@ -101,7 +102,6 @@ export function detectLocale() {
     case /^tr\b/.test(locale):
       locale = "tr";
       break;
-    // ua wasnt a valid locale for ukraine
     case /^uk\b/.test(locale):
       locale = "uk";
       break;
@@ -115,6 +115,10 @@ export function detectLocale() {
     case /^nl-be\b/.test(locale):
       locale = "nl-be";
       break;
+    case /^nb\b/.test(locale):
+    case /^no\b/.test(locale):
+      locale = "no";
+      break;
     default:
       locale = "en";
   }

frontend/src/i18n/no.json

@@ -0,0 +1,266 @@
+{
+  "buttons": {
+    "cancel": "Avbryt",
+    "clear": "Fjern",
+    "close": "Lukk",
+    "continue": "Fortsett",
+    "copy": "Kopier",
+    "copyFile": "Fortsett",
+    "copyToClipboard": "Kopier til utklippstavlen",
+    "copyDownloadLinkToClipboard": "Kopier nedlastingslenken til utklippstavlen",
+    "create": "Opprett",
+    "delete": "Slett",
+    "download": "Nedlast",
+    "file": "Fil",
+    "folder": "Mappe",
+    "fullScreen": "Skru på fullskjerm",
+    "hideDotfiles": "Skjul punktfiler",
+    "info": "Info",
+    "more": "Meir",
+    "move": "Flytt",
+    "moveFile": "Flytt Fil",
+    "new": "Ny",
+    "next": "Neste",
+    "ok": "Ok",
+    "permalink": "Få permanent link",
+    "previous": "Tidligere",
+    "preview": "Forhåndsvisning",
+    "publish": "Publiser",
+    "rename": "Gi nytt navn",
+    "replace": "Bytt ut\n ",
+    "reportIssue": "Rapporter problem",
+    "save": "Lagre",
+    "schedule": "Planlegg ",
+    "search": "Søk",
+    "select": "Velg",
+    "selectMultiple": "Velg Fleire",
+    "share": "Del",
+    "shell": "Skru på shell",
+    "submit": "Send",
+    "switchView": "Skift visning",
+    "toggleSidebar": "Skru på sidebar",
+    "update": "Opptater",
+    "upload": "Last opp",
+    "openFile": "Open file",
+    "discardChanges": "Slett"
+  },
+  "download": {
+    "downloadFile": "Nedlast filen",
+    "downloadFolder": "Nedlast mappen",
+    "downloadSelected": "Nedlast merket"
+  },
+  "upload": {
+    "abortUpload": "Er du sikker på at du ønsker å avbryte?"
+  },
+  "errors": {
+    "forbidden": "Du har ikkje tilgang til denne filen.",
+    "internal": "Noko gikk virkelig galt.",
+    "notFound": "Denne lokasjonen kan ikkje bli nådd.",
+    "connection": "Denne serveren kan ikkje nås."
+  },
+  "files": {
+    "body": "Kropp",
+    "closePreview": "Lukk forhandsvisning",
+    "files": "Filer",
+    "folders": "Mappe",
+    "home": "Hjem",
+    "lastModified": "Sist endret",
+    "loading": "Laster....",
+    "lonely": "Det føltes ensomt her...",
+    "metadata": "Metadata",
+    "multipleSelectionEnabled": "Fleire seksjoner på",
+    "name": "Navn",
+    "size": "Størrelse",
+    "sortByLastModified": "Sorter etter sist endret",
+    "sortByName": "Sorter etter navn",
+    "sortBySize": "Sorter etter størrelse",
+    "noPreview": "Forhåndsvisning er ikkje tilgjengeleg for denne filen."
+  },
+  "help": {
+    "click": "velg fil eller katalog",
+    "ctrl": {
+      "click": "velg flere filer eller mapper",
+      "f": "opner søk",
+      "s": "lagr en fil eller last ned direktoratet der du er"
+    },
+    "del": "slett markert filer",
+    "doubleClick": "open en fil eller direktorat",
+    "esc": "visk av seleksjon og/eller lukk dette varselet",
+    "f1": "denne informasjonen",
+    "f2": "gi nytt navn til denne filen",
+    "help": "Hjelp"
+  },
+  "login": {
+    "createAnAccount": "Opprett ein konto",
+    "loginInstead": "Du har allerede ein konto",
+    "password": "Passord",
+    "passwordConfirm": "Passordbekreftelse",
+    "passwordsDontMatch": "Passordene samsvarer ikkje",
+    "signup": "Registrer deg",
+    "submit": "Logg inn",
+    "username": "Brukernavn",
+    "usernameTaken": "Brukernavn er allerede i bruk",
+    "wrongCredentials": "Feil legitimasjon"
+  },
+  "permanent": "Permanent",
+  "prompts": {
+    "copy": "Kopiere",
+    "copyMessage": "Velg hvor du vil kopiere filene dine:",
+    "currentlyNavigating": "Navigerer nå på:",
+    "deleteMessageMultiple": "Er du sikker på at du vil slette {count} fil(er)?",
+    "deleteMessageSingle": "Er du sikker på at du vil slette denne filen/mappen?",
+    "deleteMessageShare": "Er du sikker på at du vil slette denne delingen ({path})?",
+    "deleteUser": "Er du sikker at du vil slette denne brukeren?",
+    "deleteTitle": "Slett filer",
+    "displayName": "Vis Navn:",
+    "download": "Last ned filer",
+    "downloadMessage": "Velg kva format du ønsker å laste ned.",
+    "error": "Noko gikk galt.",
+    "fileInfo": "Fil informasjon",
+    "filesSelected": "{count} filer valgt.",
+    "lastModified": "Sist endret",
+    "move": "Flytt",
+    "moveMessage": "Velg nytt hjem for filen(e)/mappen(e)din:",
+    "newArchetype": "Opprett et nytt innlegg basert på en arketype. Filen din opprettes i innholdsmappen.",
+    "newDir": "Nytt Direktorat",
+    "newDirMessage": "Navn gi ditt nye direktorat",
+    "newFile": "Ny fil",
+    "newFileMessage": "Navn gi ditt nye fil",
+    "numberDirs": "Nummer av direktorat",
+    "numberFiles": "Nummer av filer",
+    "rename": "Gi nytt navn",
+    "renameMessage": "Sett inn nytt navn for",
+    "replace": "Bytt ut",
+    "replaceMessage": "En av filene du prøver å laste opp har et motstridende navn. Vil du hoppe over denne filen og fortsette opplastingen eller erstatte den eksisterende?\n",
+    "schedule": "Planlegg",
+    "scheduleMessage": "Velg en dato og et klokkeslett for å planlegge publiseringen av dette innlegget.",
+    "show": "Vis",
+    "size": "Størrelse",
+    "upload": "Last opp",
+    "uploadFiles": "Laster opp {filer} filer...",
+    "uploadMessage": "Velg et alternativ for opplasting.",
+    "optionalPassword": "Valgfritt passord",
+    "resolution": "Oppløysning",
+    "discardEditorChanges": "Er du sikker på at du vil forkaste endringene du har gjort?"
+  },
+  "search": {
+    "images": "Bilde",
+    "music": "Musikk",
+    "pdf": "PDF",
+    "pressToSearch": "Trykk enter for å søke...",
+    "search": "Søk...",
+    "typeToSearch": "Trykk for å søke...",
+    "types": "Typer",
+    "video": "Video"
+  },
+  "settings": {
+    "admin": "Admin",
+    "administrator": "Administrator",
+    "allowCommands": "Utfør kommandoer",
+    "allowEdit": "Rediger, gi nytt navn til og slett filer eller mapper",
+    "allowNew": "Opprett nye filer og direktorater",
+    "allowPublish": "Publiser nye innlegg og sider",
+    "allowSignup": "Tilat brukere å registrere seg",
+    "avoidChanges": "(la stå tomt for å unngå endringer)",
+    "branding": "Merkevarebygging",
+    "brandingDirectoryPath": "Bane for merkevarekatalog",
+    "brandingHelp": "Du kan tilpasse hvordan Filleser-instansen din ser ut og føles ved å endre navnet, erstatte logoen, legge til egendefinerte stiler og til og med deaktivere eksterne lenker til GitHub.\n\nFor mer informasjon om tilpasset merkevarebygging, se {0}.",
+    "changePassword": "Skift Passord",
+    "commandRunner": "Kommandoløper",
+    "commandRunnerHelp": "Her kan du angi kommandoer som skal utføres i de navngitte hendelsene. Du må skrive én per linje. Miljøvariablene {0} og {1} vil være tilgjengelige, siden de er {0} relative til {1}. For mer informasjon om denne funksjonen og de tilgjengelige miljøvariablene, vennligst les {2}.",
+    "commandsUpdated": "Komando opptatert!",
+    "createUserDir": "Opprett brukerens hjemmappe automatisk når du legger til en ny bruker",
+    "minimumPasswordLength": "Minimum passord lengde",
+    "tusUploads": "Klumpede opplastinger",
+    "tusUploadsHelp": "Filleseren støtter opplasting av delte filer, noe som gjør det mulig å lage effektive, pålitelige, gjenopptakbare og delte filer, selv på upålitelige nettverk.",
+    "tusUploadsChunkSize": "Angir maksimal størrelse på en forespørsel (direkte opplastinger vil bli brukt for mindre opplastinger). Du kan legge inn et heltall som angir bytestørrelsen, eller en streng som 10 MB, 1 GB osv.",
+    "tusUploadsRetryCount": "Antall nye forsøk som skal utføres hvis en del ikke lastes opp.",
+    "userHomeBasePath": "Basissti for brukerens hjemmekataloger",
+    "userScopeGenerationPlaceholder": "Omfanget vil bli generert automatisk",
+    "createUserHomeDirectory": "Opprett bruker hjemme direktorat",
+    "customStylesheet": "Egendefinert stilark",
+    "defaultUserDescription": "Dette er standardinnstillingene for nye brukere.",
+    "disableExternalLinks": "Deaktiver eksterne lenker (unntatt dokumentasjon)",
+    "disableUsedDiskPercentage": "Deaktiver grafen for prosentandelen brukt disk",
+    "documentation": "dokumentasjon",
+    "examples": "Eksempel",
+    "executeOnShell": "Kjør på skall",
+    "executeOnShellDescription": "Som standard kjører Filleseren kommandoene ved å kalle binærfilene direkte. Hvis du heller ønsker å kjøre dem på et skall (som Bash eller PowerShell), kan du definere det her med de nødvendige argumentene og flaggene. Hvis dette er angitt, vil kommandoen du kjører bli lagt til som et argument. Dette gjelder både brukerkommandoer og hendelseshooker.",
+    "globalRules": "Dette er et globalt sett med regler for tillatelse og forbud. De gjelder for alle brukere. Du kan definere spesifikke regler for hver brukers innstillinger for å overstyre disse.",
+    "globalSettings": "Globale Innstillinger",
+    "hideDotfiles": "Skjul punktfiler",
+    "insertPath": "Sett inn banen",
+    "insertRegex": "sett inn regex-uttrykk",
+    "instanceName": "Forekomstnavn",
+    "language": "Språk",
+    "lockPassword": "Hindre brukeren i å endre passordet",
+    "newPassword": "Sett ditt nye passord",
+    "newPasswordConfirm": "Bekreft ditt nye passord",
+    "newUser": "Ny bruker",
+    "password": "Passord",
+    "passwordUpdated": "Passord opptatert!",
+    "path": "Veg",
+    "perm": {
+      "create": "Opprett filer og direktorater",
+      "delete": "Slett filer og direktorater",
+      "download": "Nedlast",
+      "execute": "Utfør kommandoer",
+      "modify": "Endre filer",
+      "rename": "Gi nytt navn eller flytt filer og direktorater",
+      "share": "Del filer"
+    },
+    "permissions": "Tilaterser",
+    "permissionsHelp": "Du kan angi brukeren som administrator eller velge tillatelsene individuelt. Hvis du velger «Administrator», vil alle de andre alternativene bli automatisk avkrysset. Administrasjon av brukere er fortsatt et privilegium for en administrator.\n",
+    "profileSettings": "Profil Innstilinger",
+    "ruleExample1": "forhindrer tilgang til noen dotfiler (som .git, .gitignore) i alle mapper.\n",
+    "ruleExample2": "blokkerer tilgangen til filen med navnet Caddyfile på roten av omfanget.",
+    "rules": "Regler",
+    "rulesHelp": "Her kan du definere et sett med tillatelses- og forbudsregler for denne spesifikke brukeren. De blokkerte filene vil ikke vises i listene, og de vil ikke være tilgjengelige for brukeren. Vi støtter regex og stier i forhold til brukerens omfang.",
+    "scope": "Omfang",
+    "setDateFormat": "Sett eksakt dato format",
+    "settingsUpdated": "Innstilinger opptatert!",
+    "shareDuration": "Del tidsbruk",
+    "shareManagement": "Del Ledelse",
+    "shareDeleted": "Delte ting slettet!",
+    "singleClick": "Bruk enkeltklikk for å åpne filer og mapper",
+    "themes": {
+      "default": "Systemstandard",
+      "dark": "Mørk",
+      "light": "Lyst",
+      "title": "Tema"
+    },
+    "user": "Bruker",
+    "userCommands": "Kommando",
+    "userCommandsHelp": "En mellomromsseparert liste med tilgjengelige kommandoer for denne brukeren. Eksempel:\n",
+    "userCreated": "Bruker opprettet!",
+    "userDefaults": "Bruker systemstandard instillinger",
+    "userDeleted": "Bruker slettet!",
+    "userManagement": "Brukeradministrasjon",
+    "userUpdated": "Bruker opprettet!",
+    "username": "Brukernavn",
+    "users": "Bruker"
+  },
+  "sidebar": {
+    "help": "Hjelp",
+    "hugoNew": "Hugo Ny",
+    "login": "Logg inn",
+    "logout": "Logg Ut",
+    "myFiles": "Mine filer",
+    "newFile": "Ny fil",
+    "newFolder": "Ny mappe",
+    "preview": "Forhåndsvis",
+    "settings": "Innstillinger",
+    "signup": "Registrer deg",
+    "siteSettings": "Side innstillinger"
+  },
+  "success": {
+    "linkCopied": "Link koppiert!"
+  },
+  "time": {
+    "days": "Dager",
+    "hours": "Timer",
+    "minutes": "Minutt",
+    "seconds": "Sekunder",
+    "unit": "Time format"
+  }
+}

frontend/src/i18n/sk.json

@@ -3,17 +3,17 @@
     "cancel": "Zrušiť",
     "clear": "Zrušiť výber",
     "close": "Zavrieť",
-    "continue": "Continue",
+    "continue": "Pokračovať",
     "copy": "Kopírovať",
     "copyFile": "Kopírovať súbor",
     "copyToClipboard": "Kopírovať do schránky",
-    "copyDownloadLinkToClipboard": "Copy download link to clipboard",
+    "copyDownloadLinkToClipboard": "Kopírovať odkaz na stiahnutie do schránky",
     "create": "Vytvoriť",
     "delete": "Odstrániť",
     "download": "Stiahnuť",
     "file": "Súbor",
     "folder": "Priečinok",
-    "fullScreen": "Toggle full screen",
+    "fullScreen": "Prepnúť na celú obrazovku",
     "hideDotfiles": "Skryť súbory začínajúce bodkou",
     "info": "Info",
     "more": "Viac",
@@ -24,7 +24,7 @@
     "ok": "OK",
     "permalink": "Získať trvalý odkaz",
     "previous": "Predošlé",
-    "preview": "Preview",
+    "preview": "Náhľad",
     "publish": "Zverejniť",
     "rename": "Premenovať",
     "replace": "Nahradiť",
@@ -42,7 +42,7 @@
     "update": "Aktualizovať",
     "upload": "Nahrať",
     "openFile": "Otvoriť súbor",
-    "discardChanges": "Discard"
+    "discardChanges": "Zahodiť"
   },
   "download": {
     "downloadFile": "Stiahnuť súbor",
@@ -50,7 +50,7 @@
     "downloadSelected": "Stiahnuť vybraté"
   },
   "upload": {
-    "abortUpload": "Are you sure you wish to abort?"
+    "abortUpload": "Naozaj chcete prerušiť?"
   },
   "errors": {
     "forbidden": "You don't have permissions to access this.",
@@ -110,7 +110,7 @@
     "deleteMessageMultiple": "Naozaj chcete odstrániť {count} súbor(ov)?",
     "deleteMessageSingle": "Naozaj chcete odstrániť tento súbor/priečinok?",
     "deleteMessageShare": "Naozaj chcete odstrániť toto zdieľanie({path})?",
-    "deleteUser": "Are you sure you want to delete this user?",
+    "deleteUser": "Naozaj chcete odstrániť tohto používateľa?",
     "deleteTitle": "Odstránenie súborov",
     "displayName": "Zobrazený názov:",
     "download": "Stiahnuť súbory",
@@ -137,11 +137,11 @@
     "show": "Zobraziť",
     "size": "Veľkosť",
     "upload": "Nahrať",
-    "uploadFiles": "Uploading {files} files...",
+    "uploadFiles": "Nahráva sa {files} súborov...",
     "uploadMessage": "Zvoľte možnosť nahrávania.",
     "optionalPassword": "Voliteľné heslo",
-    "resolution": "Resolution",
+    "resolution": "Rozlíšenie",
-    "discardEditorChanges": "Are you sure you wish to discard the changes you've made?"
+    "discardEditorChanges": "Naozaj chcete zahodiť vykonané zmeny?"
   },
   "search": {
     "images": "Obrázky",
@@ -170,14 +170,14 @@
     "commandRunnerHelp": "Sem môžete nastaviť príkazy, ktoré sa vykonajú pri určitých udalostiach. Musíte písať jeden na riadok. Premenné prostredia {0} a {1} sú k dispozícii, s tým že {0} relatívne k {1}. Viac informácií o tejto funkcionalite a dostupných premenných prostredia nájdete na {2}.",
     "commandsUpdated": "Príkazy upravené!",
     "createUserDir": "Automaticky vytvoriť domovský priečinok pri pridaní používateľa",
-    "minimumPasswordLength": "Minimum password length",
+    "minimumPasswordLength": "Minimálna dĺžka hesla",
-    "tusUploads": "Chunked Uploads",
+    "tusUploads": "Nahrávanie po častiach",
-    "tusUploadsHelp": "File Browser supports chunked file uploads, allowing for the creation of efficient, reliable, resumable and chunked file uploads even on unreliable networks.",
+    "tusUploadsHelp": "Prehliadač súborov podporuje nahrávanie súborov po častiach, čo umožňuje vytváranie efektívnych, spoľahlivých, obnoviteľných a po častiach nahrávaných súborov aj v prípade nespoľahlivých sietí.",
-    "tusUploadsChunkSize": "Indicates to maximum size of a request (direct uploads will be used for smaller uploads). You may input a plain integer denoting byte size input or a string like 10MB, 1GB etc.",
+    "tusUploadsChunkSize": "Označuje maximálnu veľkosť požiadavky (pre menšie nahratia sa použijú priame nahratia). Môžete zadať celé číslo označujúce veľkosť v bajtoch alebo reťazec ako 10 MB, 1 GB atď.",
-    "tusUploadsRetryCount": "Number of retries to perform if a chunk fails to upload.",
+    "tusUploadsRetryCount": "Počet opakovaných pokusov, ktoré sa majú vykonať, ak sa nepodarí nahrať časť súboru.",
-    "userHomeBasePath": "Base path for user home directories",
+    "userHomeBasePath": "Východisková cesta pre domáce adresáre používateľov",
-    "userScopeGenerationPlaceholder": "The scope will be auto generated",
+    "userScopeGenerationPlaceholder": "Rozsah bude automaticky generovaný",
-    "createUserHomeDirectory": "Create user home directory",
+    "createUserHomeDirectory": "Vytvoriť domovský adresár používateľa",
     "customStylesheet": "Vlastný Stylesheet",
     "defaultUserDescription": "Toto sú predvolané nastavenia nového používateľa.",
     "disableExternalLinks": "Vypnúť externé odkazy (okrem dokumentácie)",
@@ -217,14 +217,14 @@
     "rules": "Pravidlá",
     "rulesHelp": "Tu môžete definovať pravidlá pre konkrétneho používateľa. Blokované súbory používateľ nebude vidieť a ani nebude k nim mať prístup. Podporujeme regex a cesty relatívne k používateľovi.\n",
     "scope": "Scope",
-    "setDateFormat": "Set exact date format",
+    "setDateFormat": "Nastaviť presný formát dátumu",
     "settingsUpdated": "Nastavenia upravené!",
     "shareDuration": "Trvanie zdieľania",
     "shareManagement": "Správa zdieľania",
     "shareDeleted": "Zdieľanie odstránené!",
     "singleClick": "Používať jeden klik na otváranie súborov a priečinkov",
     "themes": {
-      "default": "System default",
+      "default": "Predvolené nastavenie systému",
       "dark": "Tmavá",
       "light": "Svetlá",
       "title": "Téma"

frontend/src/i18n/vi.json

@@ -170,7 +170,7 @@
     "commandRunnerHelp": "Tại đây, bạn có thể thiết lập các lệnh được thực thi trong các sự kiện đã định. Bạn phải viết một lệnh trên mỗi dòng. Các biến môi trường {0} và {1} sẽ có sẵn, trong đó {0} tương đối với {1}. Để biết thêm thông tin về tính năng này và các biến môi trường có sẵn, vui lòng đọc {2}.",
     "commandsUpdated": "Lệnh đã được cập nhật!",
     "createUserDir": "Tự động tạo thư mục chính của người dùng khi thêm người dùng mới",
-    "minimumPasswordLength": "Minimum password length",
+    "minimumPasswordLength": "Độ dài mật khẩu tối thiểu",
     "tusUploads": "Tải lên theo phân đoạn",
     "tusUploadsHelp": "File Browser hỗ trợ tải lên tệp theo phân đoạn, giúp việc tải lên trở nên hiệu quả, đáng tin cậy, có thể tiếp tục và phù hợp với mạng không ổn định.",
     "tusUploadsChunkSize": "Kích thước tối đa của một yêu cầu (tải lên trực tiếp sẽ được sử dụng cho các tệp nhỏ hơn). Bạn có thể nhập một số nguyên biểu thị kích thước theo byte hoặc một chuỗi như 10MB, 1GB, v.v.",

frontend/src/stores/file.ts

@@ -9,6 +9,7 @@ export const useFileStore = defineStore("file", {
     selected: number[];
     multiple: boolean;
     isFiles: boolean;
+    preselect: string | null;
   } => ({
     req: null,
     oldReq: null,
@@ -16,6 +17,7 @@ export const useFileStore = defineStore("file", {
     selected: [],
     multiple: false,
     isFiles: false,
+    preselect: null,
   }),
   getters: {
     selectedCount: (state) => state.selected.length,

frontend/src/stores/upload.ts

@@ -1,8 +1,9 @@
 import { defineStore } from "pinia";
 import { useFileStore } from "./file";
 import { files as api } from "@/api";
-import { throttle } from "lodash-es";
 import buttons from "@/utils/buttons";
+import { computed, inject, markRaw, ref } from "vue";
+import * as tus from "@/api/tus";
 
 // TODO: make this into a user setting
 const UPLOADS_LIMIT = 5;
@@ -13,208 +14,167 @@ const beforeUnload = (event: Event) => {
   // event.returnValue = "";
 };
 
-// Utility function to format bytes into a readable string
+export const useUploadStore = defineStore("upload", () => {
-function formatSize(bytes: number): string {
+  const $showError = inject<IToastError>("$showError")!;
-  if (bytes === 0) return "0.00 Bytes";
 
-  const k = 1024;
+  let progressInterval: number | null = null;
-  const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
 
-  // Return the rounded size with two decimal places
+  //
-  return (bytes / k ** i).toFixed(2) + " " + sizes[i];
+  // STATE
-}
+  //
 
-export const useUploadStore = defineStore("upload", {
+  const allUploads = ref<Upload[]>([]);
-  // convert to a function
+  const activeUploads = ref<Set<Upload>>(new Set());
-  state: (): {
+  const lastUpload = ref<number>(-1);
-    id: number;
+  const totalBytes = ref<number>(0);
-    sizes: number[];
+  const sentBytes = ref<number>(0);
-    progress: number[];
-    queue: UploadItem[];
-    uploads: Uploads;
-    speedMbyte: number;
-    eta: number;
-    error: Error | null;
-  } => ({
-    id: 0,
-    sizes: [],
-    progress: [],
-    queue: [],
-    uploads: {},
-    speedMbyte: 0,
-    eta: 0,
-    error: null,
-  }),
-  getters: {
-    // user and jwt getter removed, no longer needed
-    getProgress: (state) => {
-      if (state.progress.length === 0) {
-        return 0;
-      }
 
-      const totalSize = state.sizes.reduce((a, b) => a + b, 0);
+  //
-      const sum = state.progress.reduce((a, b) => a + b, 0);
+  // ACTIONS
-      return Math.ceil((sum / totalSize) * 100);
+  //
-    },
-    getProgressDecimal: (state) => {
-      if (state.progress.length === 0) {
-        return 0;
-      }
 
-      const totalSize = state.sizes.reduce((a, b) => a + b, 0);
+  const upload = (
-      const sum = state.progress.reduce((a, b) => a + b, 0);
+    path: string,
-      return ((sum / totalSize) * 100).toFixed(2);
+    name: string,
-    },
+    file: File | null,
-    getTotalProgressBytes: (state) => {
+    overwrite: boolean,
-      if (state.progress.length === 0 || state.sizes.length === 0) {
+    type: ResourceType
-        return "0 Bytes";
+  ) => {
-      }
+    if (!hasActiveUploads() && !hasPendingUploads()) {
-      const sum = state.progress.reduce((a, b) => a + b, 0);
-      return formatSize(sum);
-    },
-    getTotalSize: (state) => {
-      if (state.sizes.length === 0) {
-        return "0 Bytes";
-      }
-      const totalSize = state.sizes.reduce((a, b) => a + b, 0);
-      return formatSize(totalSize);
-    },
-    filesInUploadCount: (state) => {
-      return Object.keys(state.uploads).length + state.queue.length;
-    },
-    filesInUpload: (state) => {
-      const files = [];
-
-      for (const index in state.uploads) {
-        const upload = state.uploads[index];
-        const id = upload.id;
-        const type = upload.type;
-        const name = upload.file.name;
-        const size = state.sizes[id];
-        const isDir = upload.file.isDir;
-        const progress = isDir
-          ? 100
-          : Math.ceil((state.progress[id] / size) * 100);
-
-        files.push({
-          id,
-          name,
-          progress,
-          type,
-          isDir,
-        });
-      }
-
-      return files.sort((a, b) => a.progress - b.progress);
-    },
-    uploadSpeed: (state) => {
-      return state.speedMbyte;
-    },
-    getETA: (state) => state.eta,
-  },
-  actions: {
-    // no context as first argument, use `this` instead
-    setProgress({ id, loaded }: { id: number; loaded: number }) {
-      this.progress[id] = loaded;
-    },
-    setError(error: Error) {
-      this.error = error;
-    },
-    reset() {
-      this.id = 0;
-      this.sizes = [];
-      this.progress = [];
-      this.queue = [];
-      this.uploads = {};
-      this.speedMbyte = 0;
-      this.eta = 0;
-      this.error = null;
-    },
-    addJob(item: UploadItem) {
-      this.queue.push(item);
-      this.sizes[this.id] = item.file.size;
-      this.id++;
-    },
-    moveJob() {
-      const item = this.queue[0];
-      this.queue.shift();
-      this.uploads[item.id] = item;
-    },
-    removeJob(id: number) {
-      delete this.uploads[id];
-    },
-    upload(item: UploadItem) {
-      const uploadsCount = Object.keys(this.uploads).length;
-
-      const isQueueEmpty = this.queue.length == 0;
-      const isUploadsEmpty = uploadsCount == 0;
-
-      if (isQueueEmpty && isUploadsEmpty) {
       window.addEventListener("beforeunload", beforeUnload);
       buttons.loading("upload");
     }
 
-      this.addJob(item);
+    const upload: Upload = {
-      this.processUploads();
+      path,
-    },
+      name,
-    finishUpload(item: UploadItem) {
+      file,
-      this.setProgress({ id: item.id, loaded: item.file.size });
+      overwrite,
-      this.removeJob(item.id);
+      type,
-      this.processUploads();
+      totalBytes: file?.size || 1,
-    },
+      sentBytes: 0,
-    async processUploads() {
+      // Stores rapidly changing sent bytes value without causing component re-renders
-      const uploadsCount = Object.keys(this.uploads).length;
+      rawProgress: markRaw({
+        sentBytes: 0,
+      }),
+    };
 
-      const isBelowLimit = uploadsCount < UPLOADS_LIMIT;
+    totalBytes.value += upload.totalBytes;
-      const isQueueEmpty = this.queue.length == 0;
+    allUploads.value.push(upload);
-      const isUploadsEmpty = uploadsCount == 0;
 
-      const isFinished = isQueueEmpty && isUploadsEmpty;
+    processUploads();
-      const canProcess = isBelowLimit && !isQueueEmpty;
+  };
 
-      if (isFinished) {
+  const abort = () => {
+    // Resets the state by preventing the processing of the remaning uploads
+    lastUpload.value = Infinity;
+    tus.abortAllUploads();
+  };
+
+  //
+  // GETTERS
+  //
+
+  const pendingUploadCount = computed(
+    () =>
+      allUploads.value.length -
+      (lastUpload.value + 1) +
+      activeUploads.value.size
+  );
+
+  //
+  // PRIVATE FUNCTIONS
+  //
+
+  const hasActiveUploads = () => activeUploads.value.size > 0;
+
+  const hasPendingUploads = () =>
+    allUploads.value.length > lastUpload.value + 1;
+
+  const isActiveUploadsOnLimit = () => activeUploads.value.size < UPLOADS_LIMIT;
+
+  const processUploads = async () => {
+    if (!hasActiveUploads() && !hasPendingUploads()) {
       const fileStore = useFileStore();
       window.removeEventListener("beforeunload", beforeUnload);
       buttons.success("upload");
-        this.reset();
+      reset();
       fileStore.reload = true;
     }
 
-      if (canProcess) {
+    if (isActiveUploadsOnLimit() && hasPendingUploads()) {
-        const item = this.queue[0];
+      if (!hasActiveUploads()) {
-        this.moveJob();
+        // Update the state in a fixed time interval
+        progressInterval = window.setInterval(syncState, 1000);
+      }
 
-        if (item.file.isDir) {
+      const upload = nextUpload();
-          await api.post(item.path).catch(this.setError);
+
+      if (upload.type === "dir") {
+        await api.post(upload.path).catch($showError);
       } else {
-          const onUpload = throttle(
+        const onUpload = (event: ProgressEvent) => {
-            (event: ProgressEvent) =>
+          upload.rawProgress.sentBytes = event.loaded;
-              this.setProgress({
+        };
-                id: item.id,
-                loaded: event.loaded,
-              }),
-            100,
-            { leading: true, trailing: false }
-          );
 
         await api
-            .post(item.path, item.file.file as File, item.overwrite, onUpload)
+          .post(upload.path, upload.file!, upload.overwrite, onUpload)
-            .catch(this.setError);
+          .catch((err) => err.message !== "Upload aborted" && $showError(err));
       }
 
-        this.finishUpload(item);
+      finishUpload(upload);
     }
-    },
+  };
-    setUploadSpeed(value: number) {
+
-      this.speedMbyte = value;
+  const nextUpload = (): Upload => {
-    },
+    lastUpload.value++;
-    setETA(value: number) {
+
-      this.eta = value;
+    const upload = allUploads.value[lastUpload.value];
-    },
+    activeUploads.value.add(upload);
-    // easily reset state using `$reset`
+
-    clearUpload() {
+    return upload;
-      this.$reset();
+  };
-    },
+
-  },
+  const finishUpload = (upload: Upload) => {
+    sentBytes.value += upload.totalBytes - upload.sentBytes;
+    upload.sentBytes = upload.totalBytes;
+    upload.file = null;
+
+    activeUploads.value.delete(upload);
+    processUploads();
+  };
+
+  const syncState = () => {
+    for (const upload of activeUploads.value) {
+      sentBytes.value += upload.rawProgress.sentBytes - upload.sentBytes;
+      upload.sentBytes = upload.rawProgress.sentBytes;
+    }
+  };
+
+  const reset = () => {
+    if (progressInterval !== null) {
+      clearInterval(progressInterval);
+      progressInterval = null;
+    }
+
+    allUploads.value = [];
+    activeUploads.value = new Set();
+    lastUpload.value = -1;
+    totalBytes.value = 0;
+    sentBytes.value = 0;
+  };
+
+  return {
+    // STATE
+    activeUploads,
+    totalBytes,
+    sentBytes,
+
+    // ACTIONS
+    upload,
+    abort,
+
+    // GETTERS
+    pendingUploadCount,
+  };
 });

frontend/src/types/file.d.ts

@@ -29,6 +29,7 @@ interface ResourceItem extends ResourceBase {
 }
 
 type ResourceType =
+  | "dir"
   | "video"
   | "audio"
   | "image"

frontend/src/types/upload.d.ts

@@ -1,22 +1,15 @@
-interface Uploads {
+type Upload = {
-  [key: number]: Upload;
-}
-
-interface Upload {
-  id: number;
-  file: UploadEntry;
-  type?: ResourceType;
-}
-
-interface UploadItem {
-  id: number;
-  url?: string;
   path: string;
-  file: UploadEntry;
+  name: string;
-  dir?: boolean;
+  file: File | null;
-  overwrite?: boolean;
+  type: ResourceType;
-  type?: ResourceType;
+  overwrite: boolean;
-}
+  totalBytes: number;
+  sentBytes: number;
+  rawProgress: {
+    sentBytes: number;
+  };
+};
 
 interface UploadEntry {
   name: string;
@@ -27,17 +20,3 @@ interface UploadEntry {
 }
 
 type UploadList = UploadEntry[];
-
-type CurrentUploadList = {
-  [key: string]: {
-    upload: import("tus-js-client").Upload;
-    recentSpeeds: number[];
-    initialBytesUploaded: number;
-    currentBytesUploaded: number;
-    currentAverageSpeed: number;
-    lastProgressTimestamp: number | null;
-    sumOfRecentSpeeds: number;
-    hasStarted: boolean;
-    interval: number | undefined;
-  };
-};

frontend/src/utils/upload.ts

@@ -132,7 +132,6 @@ export function handleFiles(
   layoutStore.closeHovers();
 
   for (const file of files) {
-    const id = uploadStore.id;
     let path = base;
 
     if (file.fullPath !== undefined) {
@@ -145,14 +144,8 @@ export function handleFiles(
       path += "/";
     }
 
-    const item: UploadItem = {
+    const type = file.isDir ? "dir" : detectType((file.file as File).type);
-      id,
-      path,
-      file,
-      overwrite,
-      ...(!file.isDir && { type: detectType((file.file as File).type) }),
-    };
 
-    uploadStore.upload(item);
+    uploadStore.upload(path, file.name, file.file ?? null, overwrite, type);
   }
 }

frontend/src/views/Files.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <header-bar
-      v-if="error || fileStore.req?.type === null"
+      v-if="error || fileStore.req?.type === undefined"
       showMenu
       showLogo
     />
@@ -9,7 +9,7 @@
     <breadcrumbs base="/files" />
     <errors v-if="error" :errorCode="error.status" />
     <component v-else-if="currentView" :is="currentView"></component>
-    <div v-else-if="currentView !== null">
+    <div v-else>
       <h2 class="message delayed">
         <div class="spinner">
           <div class="bounce1"></div>
@@ -36,7 +36,6 @@ import { files as api } from "@/api";
 import { storeToRefs } from "pinia";
 import { useFileStore } from "@/stores/file";
 import { useLayoutStore } from "@/stores/layout";
-import { useUploadStore } from "@/stores/upload";
 
 import HeaderBar from "@/components/header/HeaderBar.vue";
 import Breadcrumbs from "@/components/Breadcrumbs.vue";
@@ -52,10 +51,8 @@ const Preview = defineAsyncComponent(() => import("@/views/files/Preview.vue"));
 
 const layoutStore = useLayoutStore();
 const fileStore = useFileStore();
-const uploadStore = useUploadStore();
 
 const { reload } = storeToRefs(fileStore);
-const { error: uploadError } = storeToRefs(uploadStore);
 
 const route = useRoute();
 
@@ -102,26 +99,41 @@ onUnmounted(() => {
   fetchDataController.abort();
 });
 
-watch(route, (to, from) => {
+watch(route, () => {
-  if (from.path.endsWith("/")) {
-    window.sessionStorage.setItem(
-      "listFrozen",
-      (!to.path.endsWith("/")).toString()
-    );
-  } else if (to.path.endsWith("/")) {
-    fileStore.updateRequest(null);
-  }
   fetchData();
 });
 watch(reload, (newValue) => {
   newValue && fetchData();
 });
-watch(uploadError, (newValue) => {
-  newValue && layoutStore.showError();
-});
 
 // Define functions
 
+const applyPreSelection = () => {
+  const preselect = fileStore.preselect;
+  fileStore.preselect = null;
+
+  if (!fileStore.req?.isDir || fileStore.oldReq === null) return;
+
+  let index = -1;
+  if (preselect) {
+    // Find item with the specified path
+    index = fileStore.req.items.findIndex((item) => item.path === preselect);
+  } else if (fileStore.oldReq.path.startsWith(fileStore.req.path)) {
+    // Get immediate child folder of the previous path
+    const name = fileStore.oldReq.path
+      .substring(fileStore.req.path.length)
+      .split("/")
+      .shift();
+
+    index = fileStore.req.items.findIndex(
+      (val) => val.path == fileStore.req!.path + name
+    );
+  }
+
+  if (index === -1) return;
+  fileStore.selected.push(index);
+};
+
 const fetchData = async () => {
   // Reset view information.
   fileStore.reload = false;
@@ -130,12 +142,7 @@ const fetchData = async () => {
   layoutStore.closeHovers();
 
   // Set loading to true and reset the error.
-  if (
-    window.sessionStorage.getItem("listFrozen") !== "true" &&
-    window.sessionStorage.getItem("modified") !== "true"
-  ) {
   layoutStore.loading = true;
-  }
   error.value = null;
 
   let url = route.path;
@@ -149,6 +156,9 @@ const fetchData = async () => {
     fileStore.updateRequest(res);
     document.title = `${res.name || t("sidebar.myFiles")} - ${t("files.files")} - ${name}`;
     layoutStore.loading = false;
+
+    // Selects the post-reload target item or the previously visited child folder
+    applyPreSelection();
   } catch (err) {
     if (err instanceof StatusError && err.is_canceled) {
       return;

frontend/src/views/Layout.vue

@@ -1,7 +1,11 @@
 <template>
   <div>
-    <div v-if="uploadStore.getProgress" class="progress">
+    <div v-if="uploadStore.totalBytes" class="progress">
-      <div v-bind:style="{ width: uploadStore.getProgress + '%' }"></div>
+      <div
+        v-bind:style="{
+          width: sentPercent + '%',
+        }"
+      ></div>
     </div>
     <sidebar></sidebar>
     <main>
@@ -27,7 +31,7 @@ import Prompts from "@/components/prompts/Prompts.vue";
 import Shell from "@/components/Shell.vue";
 import UploadFiles from "@/components/prompts/UploadFiles.vue";
 import { enableExec } from "@/utils/constants";
-import { watch } from "vue";
+import { computed, watch } from "vue";
 import { useRoute } from "vue-router";
 
 const layoutStore = useLayoutStore();
@@ -36,6 +40,10 @@ const fileStore = useFileStore();
 const uploadStore = useUploadStore();
 const route = useRoute();
 
+const sentPercent = computed(() =>
+  ((uploadStore.sentBytes / uploadStore.totalBytes) * 100).toFixed(2)
+);
+
 watch(route, () => {
   fileStore.selected = [];
   fileStore.multiple = false;

frontend/src/views/files/Editor.vue

@@ -32,17 +32,25 @@
       />
     </header-bar>
 
+    <!-- preview container -->
+    <div class="loading delayed" v-if="layoutStore.loading">
+      <div class="spinner">
+        <div class="bounce1"></div>
+        <div class="bounce2"></div>
+        <div class="bounce3"></div>
+      </div>
+    </div>
+    <template v-else>
       <Breadcrumbs base="/files" noLink />
 
-    <!-- preview container -->
       <div
         v-show="isPreview && isMarkdownFile"
         id="preview-container"
         class="md_preview"
         v-html="previewContent"
       ></div>
-
       <form v-show="!isPreview || !isMarkdownFile" id="editor"></form>
+    </template>
   </div>
 </template>
 
@@ -146,12 +154,19 @@ onBeforeUnmount(() => {
 });
 
 onBeforeRouteUpdate((to, from, next) => {
-  if (!editor.value?.session.getUndoManager().isClean()) {
+  if (editor.value?.session.getUndoManager().isClean()) {
-    layoutStore.showHover("discardEditorChanges");
-    next(false);
-  } else {
     next();
+
+    return;
   }
+
+  layoutStore.showHover({
+    prompt: "discardEditorChanges",
+    confirm: (event: Event) => {
+      event.preventDefault();
+      next();
+    },
+  });
 });
 
 const keyEvent = (event: KeyboardEvent) => {
@@ -216,13 +231,6 @@ const decreaseFontSize = () => {
 };
 
 const close = () => {
-  if (!editor.value?.session.getUndoManager().isClean()) {
-    layoutStore.showHover("discardEditorChanges");
-    return;
-  }
-
-  fileStore.updateRequest(null);
-
   const uri = url.removeLastDir(route.path) + "/";
   router.push({ path: uri });
 };

frontend/src/views/files/FileListing.vue

@@ -303,6 +303,7 @@ import {
 import { useRoute } from "vue-router";
 import { useI18n } from "vue-i18n";
 import { storeToRefs } from "pinia";
+import { removePrefix } from "@/api/utils";
 
 const showLimit = ref<number>(50);
 const columnWidth = ref<number>(280);
@@ -420,10 +421,6 @@ const isMobile = computed(() => {
 
 watch(req, () => {
   // Reset the show value
-  if (
-    window.sessionStorage.getItem("listFrozen") !== "true" &&
-    window.sessionStorage.getItem("modified") !== "true"
-  ) {
   showLimit.value = 50;
 
   nextTick(() => {
@@ -431,14 +428,12 @@ watch(req, () => {
     // How much every listing item affects the window height
     setItemWeight();
 
+    // Scroll to the item opened previously
+    if (!revealPreviousItem()) {
       // Fill and fit the window with listing items
       fillWindow(true);
+    }
   });
-  }
-  if (req.value?.isDir) {
-    window.sessionStorage.setItem("listFrozen", "false");
-    window.sessionStorage.setItem("modified", "false");
-  }
 });
 
 onMounted(() => {
@@ -448,8 +443,11 @@ onMounted(() => {
   // How much every listing item affects the window height
   setItemWeight();
 
+  // Scroll to the item opened previously
+  if (!revealPreviousItem()) {
     // Fill and fit the window with listing items
     fillWindow(true);
+  }
 
   // Add the needed event listeners to the window and document.
   window.addEventListener("keydown", keyEvent);
@@ -589,10 +587,13 @@ const paste = (event: Event) => {
     return;
   }
 
+  const preselect = removePrefix(route.path) + items[0].name;
+
   let action = (overwrite: boolean, rename: boolean) => {
     api
       .copy(items, overwrite, rename)
       .then(() => {
+        fileStore.preselect = preselect;
         fileStore.reload = true;
       })
       .catch($showError);
@@ -604,6 +605,7 @@ const paste = (event: Event) => {
         .move(items, overwrite, rename)
         .then(() => {
           clipboardStore.resetClipboard();
+          fileStore.preselect = preselect;
           fileStore.reload = true;
         })
         .catch($showError);
@@ -731,6 +733,8 @@ const drop = async (event: DragEvent) => {
 
   const conflict = upload.checkConflict(files, items);
 
+  const preselect = removePrefix(path) + (files[0].fullPath || files[0].name);
+
   if (conflict) {
     layoutStore.showHover({
       prompt: "replace",
@@ -738,11 +742,13 @@ const drop = async (event: DragEvent) => {
         event.preventDefault();
         layoutStore.closeHovers();
         upload.handleFiles(files, path, false);
+        fileStore.preselect = preselect;
       },
       confirm: (event: Event) => {
         event.preventDefault();
         layoutStore.closeHovers();
         upload.handleFiles(files, path, true);
+        fileStore.preselect = preselect;
       },
     });
 
@@ -750,6 +756,7 @@ const drop = async (event: DragEvent) => {
   }
 
   upload.handleFiles(files, path);
+  fileStore.preselect = preselect;
 };
 
 const uploadInput = (event: Event) => {
@@ -953,4 +960,21 @@ const fillWindow = (fit = false) => {
   // Set the number of displayed items
   showLimit.value = showQuantity > totalItems ? totalItems : showQuantity;
 };
+
+const revealPreviousItem = () => {
+  if (!fileStore.req || !fileStore.oldReq) return;
+
+  const index = fileStore.selected[0];
+  if (index === undefined) return;
+
+  showLimit.value =
+    index + Math.ceil((window.innerHeight * 2) / itemWeight.value);
+
+  nextTick(() => {
+    const items = document.querySelectorAll("#listing .item");
+    items[index].scrollIntoView({ block: "center" });
+  });
+
+  return true;
+};
 </script>

frontend/src/views/files/Preview.vue

@@ -301,10 +301,8 @@ watch(route, () => {
 // Specify hooks
 onMounted(async () => {
   window.addEventListener("keydown", key);
-  if (fileStore.oldReq) {
+  listing.value = fileStore.oldReq?.items ?? null;
-    listing.value = fileStore.oldReq.items;
   updatePreview();
-  }
 });
 
 onBeforeUnmount(() => window.removeEventListener("keydown", key));
@@ -317,11 +315,16 @@ const deleteFile = () => {
       if (listing.value === null) {
         return;
       }
-      listing.value = listing.value.filter((item) => item.name !== name.value);
+
+      const index = listing.value.findIndex((item) => item.name == name.value);
+      listing.value.splice(index, 1);
 
       if (hasNext.value) {
         next();
       } else if (!hasPrevious.value && !hasNext.value) {
+        const nearbyItem = listing.value[Math.max(0, index - 1)];
+        fileStore.preselect = nearbyItem?.path;
+
         close();
       } else {
         prev();
@@ -427,8 +430,6 @@ const toggleNavigation = throttle(function () {
 }, 500);
 
 const close = () => {
-  fileStore.updateRequest(null);
-
   const uri = url.removeLastDir(route.path) + "/";
   router.push({ path: uri });
 };

frontend/tsconfig.tsc.json

@@ -5,10 +5,10 @@
   "exclude": [
     "src/components/Shell.vue",
     "src/components/prompts/Copy.vue",
+    "src/components/prompts/Move.vue",
     "src/components/prompts/Delete.vue",
     "src/components/prompts/FileList.vue",
     "src/components/prompts/Rename.vue",
-    "src/components/prompts/Share.vue",
+    "src/components/prompts/Share.vue"
-    "src/components/prompts/UploadFiles.vue"
   ]
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/filebrowser/filebrowser/v2
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/asdine/storm/v3 v3.2.1

tools/go.mod

@@ -1,6 +1,6 @@
 module github.com/filebrowser/filebrowser/v2/tools
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/golangci/golangci-lint/v2 v2.1.6
@@ -69,7 +69,7 @@ require (
 	github.com/go-toolsmith/astp v1.1.0 // indirect
 	github.com/go-toolsmith/strparse v1.1.0 // indirect
 	github.com/go-toolsmith/typep v1.1.0 // indirect
-	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect

tools/go.sum

@@ -207,8 +207,8 @@ github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQi
 github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ=
 github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus=
 github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig=
-github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUWY=
 github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=

www/docs/configuration.md

@@ -1,6 +1,6 @@
 # Configuration
 
-Most of the configuration can be understood through our Command Line Interface documentation. Although there are some specific topics that we want to cover on this section.
+Most of the configuration can be understood through the command line interface documentation. To access it, you need to install File Browser and run `filebrowser --help`. In this page, we cover some specific, more complex, topics.
 
 ## Custom Branding