updated workflow

update workflow permission
update release (#121 )
2026-11-08 10:25:32 -05:00 · 2024-05-04 20:46:43 -05:00 · 2024-05-04 20:43:36 -05:00 · 2024-05-04 20:40:34 -05:00 · 2024-05-04 20:26:14 -05:00 · 2024-02-09 18:11:00 -06:00
165 changed files with 13558 additions and 6077 deletions
@@ -0,0 +1,5 @@
+# These owners will be the default owners for everything in the repo.
+# Unless a later match takes precedence, @o1egl will be requested for
+# review when someone opens a pull request.
+
+*       @o1egl
@@ -0,0 +1,76 @@
+name: dev
+
+on:
+  push:
+    branches:
+      - 'dev_v*'
+
+jobs:
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
+      - run: cd backend && golangci-lint run
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '21'
+      - run: cd frontend && npm i eslint
+      - run: cd frontend && npm run lint
+  push_dev_to_registry:
+    name: Push dev image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: gtstef/filebrowser
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
@@ -1,12 +1,48 @@
-name: main release
+name: main job

 on:
  push:
    branches:
-      - "main"
+      - 'main'

 jobs:
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
+      - run: cd backend && golangci-lint run
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '21'
+      - run: cd frontend && npm i eslint
+      - run: cd frontend && npm run lint
+
  push_latest_to_registry:
+    needs: [lint-frontend, lint-backend, test-backend, format-backend]
    name: Push latest
    runs-on: ubuntu-latest
    steps:
@@ -16,6 +52,12 @@ jobs:
        uses: docker/setup-qemu-action@v3.0.0
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
      - name: Login to Docker Hub
        uses: docker/login-action@v3
        with:
@@ -23,25 +65,15 @@ jobs:
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
        with:
          images: gtstef/filebrowser
-      - name: Get latest release tag and commit SHA
-        id: get_tag_and_sha
-        run: |
-          latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
-          latest_commit=$(git rev-list -n 1 $latest_tag)
-          echo "latest_tag=${latest_tag}" >> $GITHUB_ENV
-          echo "latest_commit=${latest_commit}" >> $GITHUB_ENV
      - name: Build and push
        uses: docker/build-push-action@v5
        with:
          context: .
-          build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
          platforms: linux/amd64,linux/arm64,linux/arm/v7
          file: ./Dockerfile
          push: true
          tags: 'gtstef/filebrowser:latest'
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
@@ -0,0 +1,79 @@
+name: pr-merge
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+      - 'dev_v*'
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
+      - run: cd backend && golangci-lint run
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '21'
+      - run: cd frontend && npm i eslint
+      - run: cd frontend && npm run lint
+
+  push_pr_to_registry:
+    name: Push PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.0.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: gtstef/filebrowser
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
@@ -1,56 +0,0 @@
-name: pr-request
-
-on:
-  pull_request:
-    branches:
-      - "main"
-      - "v[0-9]+.[0-9]+.[0-9]+"
-
-jobs:
-  test_frontend:
-    name: Push release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
-  push_pr_to_registry:
-    name: Push PR
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: gtstef/filebrowser
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            version=${{ steps.meta.outputs.version }}
-            commitSHA=${{ steps.meta.outputs.revision }}
@@ -1,44 +0,0 @@
-name: dev tests
-
-on:
-  push:
-    branches:
-      - "*"
-
-jobs:
-  test-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go test -race -v ./...
-  lint-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-            go-version: '1.22.5'
-      - uses: golangci/golangci-lint-action@v5
-        with:
-          version: v1.60
-          working-directory: backend
-  format-backend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go fmt ./...
-  lint-frontend:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i eslint && npm run lint
@@ -1,9 +1,9 @@
-name: version release
+name: release

 on:
  push:
    branches:
-      - "v[0-9]+.[0-9]+.[0-9]+"
+      - 'v[0-9]+.[0-9]+.[0-9]+'

 permissions:
  contents: write
@@ -14,28 +14,60 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PAT }}
+        uses: actions/checkout@v2
      - name: Extract branch name
        shell: bash
        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
        id: extract_branch
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 1.22.2
      - name: Create Release
-        uses: softprops/action-gh-release@v2
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          target_commitish: ${{ steps.extract_branch.outputs.branch }}
-          token: ${{ secrets.PAT }}
          tag_name: ${{ steps.extract_branch.outputs.branch }}
-          prerelease: false
+          release_name: Release ${{ steps.extract_branch.outputs.branch }}
+          body: |
+            Please see usage on [readme](https://github.com/gtsteffaniak/filebrowser).
+            Docker repo: https://hub.docker.com/r/gtstef/filebrowser/tags
          draft: false
-          generate_release_notes: true
-          name: ${{ steps.extract_branch.outputs.branch }}
-
+          prerelease: false
+  test-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go test -race -v ./...
+  lint-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
+      - run: cd backend && golangci-lint run
+  format-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: 1.22.0
+      - run: cd backend && go fmt ./...
+  lint-frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '21'
+      - run: cd frontend && npm i eslint
+      - run: cd frontend && npm run lint
  push_release_to_registry:
+    needs: [lint-frontend, lint-backend, test-backend, format-backend]
    name: Push release
    runs-on: ubuntu-latest
    steps:
@@ -45,14 +77,21 @@ jobs:
        uses: docker/setup-qemu-action@v3.0.0
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3.0.0
+        # Workaround to fix error:
+        # failed to push: failed to copy: io: read/write on closed pipe
+        # See https://github.com/docker/build-push-action/issues/761
+        with:
+          driver-opts: |
+            image=moby/buildkit:v0.10.6
      - name: Login to Docker Hub
+        # Only push to Docker Hub when making a release
        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
        with:
          images: gtstef/filebrowser
      - name: Strip v from version number
@@ -63,14 +102,11 @@ jobs:
          JSON=$(echo "$JSON" | sed 's/filebrowser:v/filebrowser:/')
          echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
      - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
        with:
          context: .
-          build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
          platforms: linux/amd64,linux/arm64,linux/arm/v7
          file: ./Dockerfile
          push: true
          tags: ${{ steps.modify-json.outputs.cleaned_tag }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
@@ -1,50 +0,0 @@
-name: dev release
-
-on:
-  push:
-    branches:
-      - "dev_v[0-9]+.[0-9]+.[0-9]+"
-
-permissions:
-  contents: write
-
-jobs:
-  push_release_to_registry:
-    name: Push dev release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: gtstef/filebrowser
-      - name: Strip v from version number
-        id: modify-json
-        run: |
-          JSON="${{ steps.meta.outputs.tags }}"
-          # Use jq to remove 'v' from the version field
-          JSON=$(echo "$JSON" | sed 's/filebrowser:v/filebrowser:/')
-          echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
-          context: .
-          platforms: linux/amd64
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.modify-json.outputs.cleaned_tag }}
-          labels: ${{ steps.meta.outputs.labels }}
@@ -0,0 +1,24 @@
+name: 'Close stale issues and PRs'
+permissions:
+  issues: write
+  pull-requests: write
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v5
+        with:
+          stale-pr-message: 'This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          close-pr-message: 'This PR was closed because it has been stalled for 5 days with no activity.'
+          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
+          close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
+          days-before-stale: 30
+          days-before-close: 30
+          exempt-issue-labels: 'feature ☘,enhancement ⚙,bug 🐞'
+          exempt-pr-labels: 'need-help,wip'
+          operations-per-run: 100
@@ -1,31 +0,0 @@
-name: tag
-
-on:
-  push:
-    tags:
-      - "v*"
-
-permissions:
-  contents: write
-
-jobs:
-  update_tag:
-    name: Update Release tag
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-      - name: Install dependencies and build frontend
-        run: npm i && npm run build
-        working-directory: frontend
-      - name: Install UPX
-        run: sudo apt-get install -y upx
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          args: release --clean
-          workdir: backend
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -6,13 +6,8 @@ rice-box.go
 /filebrowser
 /filebrowser.exe
 /frontend/dist
-/frontend/pkg
-/frontend/test-results
-/frontend/package-lock.json
 /backend/vendor
 /backend/*.cov
-/backend/test_config.yaml
-/backend/srv

 .DS_Store
 node_modules
@@ -2,52 +2,12 @@

 All notable changes to this project will be documented in this file. For commit guidelines, please refer to [Standard Version](https://github.com/conventional-changelog/standard-version).

-## v0.2.8
-
- **Feature**: New gallary view scaling options (closes [#141](https://github.com/gtsteffaniak/filebrowser/issues/141))
- **Change**: Refactored backend files functions
- **Change**: Improved UI response to filesystem changes
- **Change**: Added frontend tests for deployment integrity
- **Fix**: move/replace file prompt issue
- **Fix**: opening files from search
- **Fix**: Display count issue when hideDotFile is enabled.
-
-## v0.2.7
-
- - **Change**: New sidebar style and behavior
- - **Change**: make search view and button behavior more consistent.
- - **Fix**: [upload file bug](https://github.com/gtsteffaniak/filebrowser/issues/153)
- - **Fix**: user lock out bug introduced in 0.2.6
- - **Fix**: many minor state related issues.
-
-## v0.2.6
-
-This change focuses on minimizing and simplifying build process.
-
- **Change**: Migrated to Vite / Vue 3
- **Change**: removed npm modules
-  - replaced vuex with custom state management via src/store
-  - replaced noty with simple card popup notifications
-  - replaced moment with simple date formatter where needed
-  - replaced vue-simple-progress with vue component
- **Feature**: improved error logging
-  - backend errors show the root function that called them during the error
-  - frontend errors print errors to console that fail try/catch
-  - all frontend errors via popup notification & print to console as well
- **Fix**: Allow editing blank text based files in editor
- tweaked listing styles
- Feature: Allow disabling the index via configuration yaml
-
-## v0.2.5
-
- Fix: delete user prompt works using native hovers.
-
 ## v0.2.4

- Feature: [create-folder-feature](https://github.com/gtsteffaniak/filebrowser/pull/105)
+- Faature: [create-folder-feature](https://github.com/gtsteffaniak/filebrowser/pull/105)
 - Feature: [playable shared video](https://github.com/filebrowser/filebrowser/issues/2537)
 - Feature: photos, videos, and audio get embedded preview on share instead of icon
- Fix: sharable link bug, now uses special publicUser
+- FIX: sharable link bug, now uses special publicUser
 - Bump go version to 1.22
 - In prep for vue3 migration, npm modules removed:
  - js-base64
@@ -1,23 +1,22 @@
-FROM golang:1.22-alpine AS base
-ARG VERSION
-ARG REVISION
+FROM node:slim as nbuild
 WORKDIR /app
-COPY ./backend ./
-RUN go build -ldflags="-w -s \
-  -X 'github.com/gtsteffaniak/filebrowser/version.Version=${VERSION}' \
-  -X 'github.com/gtsteffaniak/filebrowser/version.CommitSHA=${REVISION}'" \
-  -o filebrowser .
-
-FROM node:slim AS nbuild
-WORKDIR /app
-COPY ./frontend/package.json ./
-RUN npm i --maxsockets 1
+COPY  ./frontend/package*.json ./
+RUN npm ci --maxsockets 1
 COPY  ./frontend/ ./
-RUN npm run build-docker
+RUN npm run build
+
+FROM golang:1.22-alpine as base
+WORKDIR /app
+COPY  ./backend ./
+RUN go get -u golang.org/x/net
+RUN go build -ldflags="-w -s" -o filebrowser .

 FROM alpine:latest
-ENV FILEBROWSER_NO_EMBEDED="true"
-RUN apk --no-cache add ca-certificates mailcap
+ARG app="/app/filebrowser"
+RUN apk --no-cache add \
+      ca-certificates \
+      mailcap
+WORKDIR /
 COPY --from=base /app/filebrowser* ./
 COPY --from=nbuild /app/dist/ ./frontend/dist/
 ENTRYPOINT [ "./filebrowser" ]
@@ -1,19 +0,0 @@
-FROM golang:1.22-alpine AS base
-WORKDIR /app
-COPY ./backend ./
-RUN go build -ldflags="-w -s" -o filebrowser .
-
-FROM node:slim
-WORKDIR /app
-COPY ./frontend/package.json ./
-RUN npm i --maxsockets 1
-RUN npx playwright install --with-deps firefox
-COPY [ "backend/filebrowser.yaml", "./" ]
-COPY  ./frontend/ ./frontend
-WORKDIR /app/frontend
-RUN npm run build-docker
-WORKDIR /app
-COPY --from=base /app/filebrowser* ./
-RUN cp -R frontend/tests/ srv
-ENV FILEBROWSER_NO_EMBEDED="true"
-RUN ./filebrowser & sleep 2 && cd frontend && npx playwright test
@@ -2,78 +2,54 @@
  <a href="https://opensource.org/license/apache-2-0/"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg" alt="License: Apache-2.0"></a>
 </p>
 <p align="center">
-  <img src="frontend/public/img/icons/favicon-256x256.png" width="100" title="Login With Custom URL">
+<img src="frontend/public/img/icons/favicon-256x256.png" width="100" title="Login With Custom URL">
 </p>
-<h3 align="center">Filebrowser Quantum - A modern web-based file manager</h3>
+<h3 align="center">Filebrowser - A modern file manager for the web</h3>
 <p align="center">
-  <img width="800" src="https://github.com/user-attachments/assets/8ba93582-aba2-4996-8ac3-25f763a2e596" title="Main Screenshot">
+  <img width="800" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/899152cf-3e69-4179-aa82-752af2df3fc6" title="Main Screenshot">
 </p>

 > [!WARNING]
-> Starting with v0.2.0, *ALL* configuration is done via `filebrowser.yaml`
-> Configuration file.
-> Starting with v0.2.4 *ALL* share links need to be re-created (due to
-> security fix).
+> Starting with v0.2.0, *ALL* configuration is done via `filebrowser.yaml` configuration file.
+> Starting with v0.2.4 *ALL* share links need to be re-created (due to security fix).

-Filebrowser Quantum is a fork of the filebrowser opensource project with the 
-following changes:
+This fork makes the following significant changes to filebrowser for origin:

-  1. [x] Enhanced lightning fast indexed search
-     - Real-time results as you type
-     - Works with more type filters
-     - Enhanced interactive results page.
-  2. [x] Revamped and simplified GUI navbar and sidebar menu.
-     - Additional compact view mode as well as refreshed view mode
-       styles.
-  3. [x] Revamped and simplified configuration via `filebrowser.yml` config file.
-  4. [x] Faster listing browsing
-     - Switching view modes is instant
-     - Changing Sort order is instant
-     - The entire directory is loaded in 1/3 the time
+ 1. [x] Better search.
+    - Lightning fast
+    - realtime results as you type
+    - Works with more type filters
+    - interactive results page.
+ 2. [x] Revamped and simplified GUI navbar and sidebar menu.
+ 3. [x] **IMPORTANT** Revamped configuration via `filebrowser.yml` config file.
+ 4. [x] More configurations possible at a per-user level
+    - <img width="450" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/625bd7c4-5ee9-4011-aaae-2a388ab0813b">
+ 5. [x] Additional compact view mode as well as refreshed view mode styles.

 ## About

-Filebrowser Quantum provides a file managing interface within a specified directory
-and can be used to upload, delete, preview, rename, and edit your files.
-It allows the creation of multiple users and each user can have its 
-directory.
+Filebrowser provides a file managing interface within a specified directory
+and it can be used to upload, delete, preview, rename and edit your files.
+It allows the creation of multiple users and each user can have its own
+directory. It can be used as a standalone app.

-This repository is a fork of the original [filebrowser](https://github.com/filebrowser/filebrowser) 
-with a collection of changes that make this program work better in terms of 
-aesthetics and performance. Improved search, simplified ui 
-(without removing features) and more secure and up-to-date
-build are just a few examples.
-
-Filebrowser Quantum differs significantly to the original.
-There are hundreds of thousands of lines changed and they are generally
-no longer compatible with each other. This has been intentional -- the
-focus of this fork is on a few key principles:
-  - Simplicity and improved user experience
-  - Improving performance and faster feedback when making changes.
-  - Minimize external dependencies and standard library usage.
-  - Of course -- adding much-needed features.
+This repository is a fork, a collection of changes that make this program
+work better in terms of asthetics and performance. Improved search,
+ simplified ui (without removing features) and more secure and up-to-date
+ build are just a few examples.

 ## Look
-
-One way you can observe the improved user experience is how I changed
-the UI. The Navbar is simplified to a three-component system :
-
-  1. (Left) The slide-out action panel button
-  2. (Middle) The powerful search bar.
-  3. (Right) The view change toggle.
-
-All other functions are moved either into the action menu or popup menus.
-If the action does not depend on context, it will exist in the slide-out
-action panel. If the action is available based on context, it will show up as
-a popup menu.
-
 <p align="center">
-  <img width="800" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/899152cf-3e69-4179-aa82-752af2df3fc6" title="Main Screenshot">
-    <img width="800" src="https://github.com/user-attachments/assets/18c02d03-5c60-4e15-9c32-3cfe058a0c49" title="Main Screenshot">
-      <img width="800" src="https://github.com/user-attachments/assets/75226dc4-9802-46f0-9e3c-e4403d3275da" title="Main Screenshot">
+  <img width="500" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/35cdeb3b-ab79-4b04-8001-8f51f6ea06bb" title="Dark mode">
+<img width="500" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/55fa4f5c-440e-4a97-b711-96139208a163">
+<img width="500" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/c76f4100-949b-4e17-a3e6-e410fb8ec08f">
+<img width="500" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/0bde26f3-fa90-411e-bd0b-abaa47506d62">
+<img width="560" alt="image" src="https://github.com/gtsteffaniak/filebrowser/assets/42989099/71d8f2b8-6fe6-4fdc-8aac-503d08c28d86">
+

 </p>

+
 ## Install

 Using docker:
@@ -84,7 +60,7 @@ Using docker:
 docker run -it -v /path/to/folder:/srv -p 80:80 gtstef/filebrowser
 ```

-1. docker compose:
+1. docker-compose:

  - with local storage

@@ -125,96 +101,43 @@ volumes:

 ```

-Not using docker (not recommended), download your binary from releases and run with your custom config file:
+Not using docker (not recommended)

 ```
-./filebrowser -c <filebrowser.yml or other /path/to/config.yaml>
+./filebrowser -f <filebrowser.yml or other /path/to/config.yaml>
 ```

 ## Configuration

-All configuration is now done via a single configuration file:
-`filebrowser.yaml`, here is an example of minimal [configuration
-file](./backend/filebrowser.yaml).
+All configuration is now done via a single configuration file: `filebrowser.yaml`, here is an example minimal [configuration file](./backend/filebrowser.yaml).

-View the [Configuration Help Page](./configuration.md) for available
-configuration options and other help.
+View the [Configuration Help Page](./configuration.md) for available configuration options and other help.


 ## Migration from filebrowser/filebrowser

-If you currently use the original opensource filebrowser 
-but want to try using this. I recommend you start fresh without
-reusing the database, but there are a few things you'll need to do if you
-must migrate:
+If you are currently using filebrowser from the filebrowser/filebrowser repo, but want to try using this. I recommend you start fresh without reusing the database, but there are a few things you'll need to do if you must migrate:

 1. Create a configuration file as mentioned above.
-2. Copy your database file from the original filebrowser to the path of
-   the new one.
-3. Update the configuration file to use the database (under server in
-   filebrowser.yml)
-4. If you are using docker, update the docker-compose file or docker run
-   command to use the config file as described in the install section
-   above.
-5. If you are not using docker, just make sure you run filebrowser -c
-   filebrowser.yml and have a valid filebrowser config.
+2. Copy your database file from the original filebrowser to the path of the new one.
+3. Update the configuration file to use the database (under server in filebrowser.yml)
+4. If you are using docker, update the docker-compose file or docker run command to use the config file as described in the install section above.
+5. If you are not using docker, just make sure you run filebrowser -f filebrowser.yml and have valid filebrowser config.


-The filebrowser Quantum application should run with the same user and rules that
-you have from the original. But keep in mind the differences that are
-mentioned at the top of this readme.
+The filebrowser application should run with the same user and rules that you have from the original. But keep in mind the differences that are mentioned at the top of this readme.

+### background & help

-## Comparison Chart
+The original project filebrowser/filebrowser used multiple different ways to configure the server.
+This was confusing and difficult to work with from a user and from a developer's perspective.
+So I completely redesigned the program to use one single human-readable config file.

- Application Name | <img width="48" src="frontend/public/img/icons/favicon-256x256.png" > Quantum | <img width="48" src="https://github.com/filebrowser/filebrowser/blob/master/frontend/public/img/logo.svg" > Filebrowser | <img width="48" src="https://github.com/mickael-kerjean/filestash/blob/master/public/assets/logo/app_icon.png?raw=true" > Filestash | <img width="48" src="https://avatars.githubusercontent.com/u/19211038?s=200&v=4" >  Nextcloud | <img width="48" src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/Google_Drive_logo.png/480px-Google_Drive_logo.png" > Google_Drive | <img width="48" src="https://avatars.githubusercontent.com/u/6422152?v=4" > FileRun
--- | --- | --- | --- | --- | --- | --- |
-Filesystem support            | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
-Linux                         | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
-Windows                       | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
-Mac                           | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
-Self hostable                 | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
-Has Stable Release?           | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
-S3 support                    | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-webdav support                | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-ftp support                   | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-Dedicated docs site?          | ❌ | ✅ | ✅ | ✅ | ❌ | ✅ |
-Multiple sources at once      | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-Docker image size             | 22 MB  | 31 MB  | 240 MB (main image) | 250 MB | ❌ | > 2 GB |
-Min. Memory Requirements      | 128 MB | 128 MB | 128 MB (main image) | 128 MB | ❌ | 4 GB   |
-has standalone binary         | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |
-price                         | free | free | free | free tier | free tier | $99+ |
-rich media preview            | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-upload files from the web?    | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ |
-Advanced Search?              | ✅ | ❌ | ❌ | configurable | ✅ | ✅ |
-Indexed Search?               | ✅ | ❌ | ❌ | configurable | ✅ | ✅ |
-Content-aware search?         | ❌ | ❌ | ❌ | configurable | ✅ | ✅ |
-Custom job support            | ❌ | ✅ | ❌ | ✅ | ❌ | ✅ |
-Multiple users                | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-Single sign-on support        | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-LDAP sign-on support          | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-2FA sign-on support           | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-Long-live API key support     | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ |
-Mobile App                    | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ |
-open source?                  | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
-tags support                  | ❌ | ❌ | ❌ | ✅ | ❌ | ✅ |
-sharable web links?           | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-Event-based notifications     | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
-Metrics                       | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-file space quotas             | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
-text-based files editor       | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-office file support           | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ |
-Themes                        | ✅ | ✅ | ❌ | ❌ | ❌ | ✅ |
-Branding support              | ❌ | ✅ | ❌ | ❌ | ❌ | ✅ |
-activity log                  | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-Comments support              | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-collaboration on same file    | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-trash support                 | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
-Starred/pinned files          | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
-Content preview icons         | ✅ | ✅ | ❌ | ❌ | ✅ | ✅ |
-Plugins support               | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-Chromecast support            | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ |
+I understand many coming from the original fork may notice differences which make using this improved version more difficult. If you notice issues that you believe should be fixed, please open an issue here and it will very likely be addressed with a PR within a few weeks.
+
+This version of filebrowser is going through a configuration overhaul as mentioned above. Certain features related to rules and commands may not work as they do on the original filebrowser. The purpose of this is to create a more consistent experience where configuration is done via files rather than running commands, so that it's very clear what the current state of the configuration is. When running commands its not clear what the configuration is.

 ## Roadmap

 see [Roadmap Page](./roadmap.md)
+
@@ -1,232 +0,0 @@
-# This code is licensed under the terms of the MIT license https://opensource.org/license/mit
-# Copyright (c) 2021 Marat Reymers
-
-## Golden config for golangci-lint v1.59.1
-#
-# This is the best config for golangci-lint based on my experience and opinion.
-# It is very strict, but not extremely strict.
-# Feel free to adapt and change it for your needs.
-
-run:
-  # Timeout for analysis, e.g. 30s, 5m.
-  # Default: 1m
-  timeout: 3m
-
-
-# This file contains only configs which differ from defaults.
-# All possible options can be found here https://github.com/golangci/golangci-lint/blob/master/.golangci.reference.yml
-linters-settings:
-  cyclop:
-    # The maximal code complexity to report.
-    # Default: 10
-    max-complexity: 30
-    # The maximal average package complexity.
-    # If it's higher than 0.0 (float) the check is enabled
-    # Default: 0.0
-    package-average: 10.0
-
-  errcheck:
-    # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
-    # Such cases aren't reported by default.
-    # Default: false
-    check-type-assertions: true
-
-  exhaustive:
-    # Program elements to check for exhaustiveness.
-    # Default: [ switch ]
-    check:
-      - switch
-      - map
-
-  exhaustruct:
-    # List of regular expressions to exclude struct packages and their names from checks.
-    # Regular expressions must match complete canonical struct package/name/structname.
-    # Default: []
-    exclude:
-      # std libs
-      - "^net/http.Client$"
-      - "^net/http.Cookie$"
-      - "^net/http.Request$"
-      - "^net/http.Response$"
-      - "^net/http.Server$"
-      - "^net/http.Transport$"
-      - "^net/url.URL$"
-      - "^os/exec.Cmd$"
-      - "^reflect.StructField$"
-      # public libs
-      - "^github.com/Shopify/sarama.Config$"
-      - "^github.com/Shopify/sarama.ProducerMessage$"
-      - "^github.com/mitchellh/mapstructure.DecoderConfig$"
-      - "^github.com/prometheus/client_golang/.+Opts$"
-      - "^github.com/spf13/cobra.Command$"
-      - "^github.com/spf13/cobra.CompletionOptions$"
-      - "^github.com/stretchr/testify/mock.Mock$"
-      - "^github.com/testcontainers/testcontainers-go.+Request$"
-      - "^github.com/testcontainers/testcontainers-go.FromDockerfile$"
-      - "^golang.org/x/tools/go/analysis.Analyzer$"
-      - "^google.golang.org/protobuf/.+Options$"
-      - "^gopkg.in/yaml.v3.Node$"
-
-  funlen:
-    # Checks the number of lines in a function.
-    # If lower than 0, disable the check.
-    # Default: 60
-    lines: 100
-    # Checks the number of statements in a function.
-    # If lower than 0, disable the check.
-    # Default: 40
-    statements: 50
-    # Ignore comments when counting lines.
-    # Default false
-    ignore-comments: true
-
-  gocognit:
-    # Minimal code complexity to report.
-    # Default: 30 (but we recommend 10-20)
-    min-complexity: 20
-
-  gocritic:
-    # Settings passed to gocritic.
-    # The settings key is the name of a supported gocritic checker.
-    # The list of supported checkers can be find in https://go-critic.github.io/overview.
-    settings:
-      captLocal:
-        # Whether to restrict checker to params only.
-        # Default: true
-        paramsOnly: false
-      underef:
-        # Whether to skip (*x).method() calls where x is a pointer receiver.
-        # Default: true
-        skipRecvDeref: false
-
-  gomodguard:
-    blocked:
-      # List of blocked modules.
-      # Default: []
-      modules:
-        - github.com/golang/protobuf:
-            recommendations:
-              - google.golang.org/protobuf
-            reason: "see https://developers.google.com/protocol-buffers/docs/reference/go/faq#modules"
-        - github.com/satori/go.uuid:
-            recommendations:
-              - github.com/google/uuid
-            reason: "satori's package is not maintained"
-        - github.com/gofrs/uuid:
-            recommendations:
-              - github.com/gofrs/uuid/v5
-            reason: "gofrs' package was not go module before v5"
-
-  govet:
-    # Enable all analyzers.
-    # Default: false
-    enable-all: true
-    # Disable analyzers by name.
-    # Run `go tool vet help` to see all analyzers.
-    # Default: []
-    disable:
-      - fieldalignment # too strict
-    # Settings per analyzer.
-    settings:
-      shadow:
-        # Whether to be strict about shadowing; can be noisy.
-        # Default: false
-        strict: false
-
-  inamedparam:
-    # Skips check for interface methods with only a single parameter.
-    # Default: false
-    skip-single-param: true
-
-  mnd:
-    # List of function patterns to exclude from analysis.
-    # Values always ignored: `time.Date`,
-    # `strconv.FormatInt`, `strconv.FormatUint`, `strconv.FormatFloat`,
-    # `strconv.ParseInt`, `strconv.ParseUint`, `strconv.ParseFloat`.
-    # Default: []
-    ignored-functions:
-      - args.Error
-      - flag.Arg
-      - flag.Duration.*
-      - flag.Float.*
-      - flag.Int.*
-      - flag.Uint.*
-      - os.Chmod
-      - os.Mkdir.*
-      - os.OpenFile
-      - os.WriteFile
-      - prometheus.ExponentialBuckets.*
-      - prometheus.LinearBuckets
-
-  nakedret:
-    # Make an issue if func has more lines of code than this setting, and it has naked returns.
-    # Default: 30
-    max-func-lines: 0
-
-  nolintlint:
-    # Exclude following linters from requiring an explanation.
-    # Default: []
-    allow-no-explanation: [ funlen, gocognit, lll ]
-    # Enable to require an explanation of nonzero length after each nolint directive.
-    # Default: false
-    require-explanation: true
-    # Enable to require nolint directives to mention the specific linter being suppressed.
-    # Default: false
-    require-specific: true
-
-  perfsprint:
-    # Optimizes into strings concatenation.
-    # Default: true
-    strconcat: false
-
-  rowserrcheck:
-    # database/sql is always checked
-    # Default: []
-    packages:
-      - github.com/jmoiron/sqlx
-
-  sloglint:
-    # Enforce not using global loggers.
-    # Values:
-    # - "": disabled
-    # - "all": report all global loggers
-    # - "default": report only the default slog logger
-    # https://github.com/go-simpler/sloglint?tab=readme-ov-file#no-global
-    # Default: ""
-    no-global: "all"
-    # Enforce using methods that accept a context.
-    # Values:
-    # - "": disabled
-    # - "all": report all contextless calls
-    # - "scope": report only if a context exists in the scope of the outermost function
-    # https://github.com/go-simpler/sloglint?tab=readme-ov-file#context-only
-    # Default: ""
-    context: "scope"
-
-  tenv:
-    # The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.
-    # Otherwise, only methods that take `*testing.T`, `*testing.B`, and `testing.TB` as arguments are checked.
-    # Default: false
-    all: true
-
-
-issues:
-  # Maximum count of issues with the same text.
-  # Set to 0 to disable.
-  # Default: 3
-  max-same-issues: 50
-
-  exclude-rules:
-    - source: "(noinspection|TODO)"
-      linters: [ godot ]
-    - source: "//noinspection"
-      linters: [ gocritic ]
-    - path: "_test\\.go"
-      linters:
-        - bodyclose
-        - dupl
-        - funlen
-        - goconst
-        - gosec
-        - noctx
-        - wrapcheck
@@ -1,43 +0,0 @@
-# .goreleaser.yaml
-project_name: filebrowser
-version: 2
-
-builds:
-  # Build configuration for darwin and linux
-  - id: default
-    ldflags: &ldflags
-      - -s -w -X github.com/gtsteffaniak/filebrowser/version.Version={{ .Version }} -X github.com/gtsteffaniak/filebrowser/version.CommitSHA={{ .ShortCommit }}
-    main: main.go
-    binary: filebrowser
-    goos:
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm
-      - arm64
-    goarm:
-      - 6
-      - 7
-    hooks:
-      post: 
-        - upx {{ .Path }}  # Compress the binary with UPX
-
-  # Build configuration for windows without arm
-  - id: windows
-    ldflags: *ldflags
-    main: main.go
-    binary: filebrowser
-    goos:
-      - windows
-    goarch:
-      - amd64
-      - arm64
-
-archives:
-  - name_template: "{{.Os}}-{{.Arch}}{{if .Arm}}v{{.Arm}}{{end}}-{{ .ProjectName }}"
-    format: binary
-
-checksum:
-  disable: true
-
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
@@ -3,7 +3,6 @@ package cmd
 import (
 	"crypto/tls"
 	"flag"
-	"fmt"
 	"io/fs"
 	"log"
 	"net"
@@ -13,10 +12,9 @@ import (
 	"strconv"
 	"syscall"

-	"embed"
-
 	"github.com/spf13/pflag"

+	"github.com/spf13/afero"
 	"github.com/spf13/cobra"

 	"github.com/gtsteffaniak/filebrowser/auth"
@@ -28,11 +26,6 @@ import (
 	"github.com/gtsteffaniak/filebrowser/users"
 )

-//go:embed dist/*
-var assets embed.FS
-
-var nonEmbededFS = os.Getenv("FILEBROWSER_NO_EMBEDED") == "true"
-
 type dirFS struct {
 	http.Dir
 }
@@ -48,7 +41,6 @@ func init() {
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 	pflag.Parse()
 	log.Println("Initializing with config file:", *configFlag)
-	log.Println("Embeded Frontend:", !nonEmbededFS)
 	settings.Initialize(*configFlag)
 }

@@ -63,81 +55,58 @@ var rootCmd = &cobra.Command{
 			log.Fatal("Image resize workers count could not be < 1")
 		}
 		imgSvc := img.New(serverConfig.NumImageProcessors)
-
+		var fileCache diskcache.Interface = diskcache.NewNoOp()
 		cacheDir := "/tmp"
-		var fileCache diskcache.Interface
-
-		// Use file cache if cacheDir is specified
 		if cacheDir != "" {
-			var err error
-			fileCache, err = diskcache.NewFileCache(cacheDir)
-			if err != nil {
-				log.Fatalf("failed to create file cache: %v", err)
+			if err := os.MkdirAll(cacheDir, 0700); err != nil { //nolint:govet,gomnd
+				log.Fatalf("can't make directory %s: %s", cacheDir, err)
 			}
-		} else {
-			// No-op cache if no cacheDir is specified
-			fileCache = diskcache.NewNoOp()
+			fileCache = diskcache.New(afero.NewOsFs(), cacheDir)
 		}
 		// initialize indexing and schedule indexing ever n minutes (default 5)
-		go files.InitializeIndex(serverConfig.IndexingInterval, serverConfig.Indexing)
+		go files.InitializeIndex(serverConfig.IndexingInterval, true)
 		_, err := os.Stat(serverConfig.Root)
-		checkErr(fmt.Sprint("cmd os.Stat ", serverConfig.Root), err)
+		checkErr(err)
 		var listener net.Listener
 		address := serverConfig.Address + ":" + strconv.Itoa(serverConfig.Port)
 		switch {
 		case serverConfig.Socket != "":
 			listener, err = net.Listen("unix", serverConfig.Socket)
-			checkErr("net.Listen", err)
+			checkErr(err)
 			socketPerm, err := cmd.Flags().GetUint32("socket-perm") //nolint:govet
-			checkErr("cmd.Flags().GetUint32", err)
+			checkErr(err)
 			err = os.Chmod(serverConfig.Socket, os.FileMode(socketPerm))
-			checkErr("os.Chmod", err)
+			checkErr(err)
 		case serverConfig.TLSKey != "" && serverConfig.TLSCert != "":
 			cer, err := tls.LoadX509KeyPair(serverConfig.TLSCert, serverConfig.TLSKey) //nolint:govet
-			checkErr("tls.LoadX509KeyPair", err)
+			checkErr(err)
 			listener, err = tls.Listen("tcp", address, &tls.Config{
 				MinVersion:   tls.VersionTLS12,
 				Certificates: []tls.Certificate{cer}},
 			)
-			checkErr("tls.Listen", err)
+			checkErr(err)
 		default:
 			listener, err = net.Listen("tcp", address)
-			checkErr("net.Listen", err)
+			checkErr(err)
 		}
 		sigc := make(chan os.Signal, 1)
 		signal.Notify(sigc, os.Interrupt, syscall.SIGTERM)
 		go cleanupHandler(listener, sigc)
-		if !nonEmbededFS {
-			assetsFs, err := fs.Sub(assets, "dist")
-			if err != nil {
-				log.Fatal("Could not embed frontend. Does backend/cmd/dist exist? Must be built and exist first")
-			}
-			handler, err := fbhttp.NewHandler(imgSvc, fileCache, d.store, &serverConfig, assetsFs)
-			checkErr("fbhttp.NewHandler", err)
-			defer listener.Close()
-			log.Println("Listening on", listener.Addr().String())
-			//nolint: gosec
-			if err := http.Serve(listener, handler); err != nil {
-				log.Fatalf("Could not start server on port %d: %v", serverConfig.Port, err)
-			}
-		} else {
-			assetsFs := dirFS{Dir: http.Dir("frontend/dist")}
-			handler, err := fbhttp.NewHandler(imgSvc, fileCache, d.store, &serverConfig, assetsFs)
-			checkErr("fbhttp.NewHandler", err)
-			defer listener.Close()
-			log.Println("Listening on", listener.Addr().String())
-			//nolint: gosec
-			if err := http.Serve(listener, handler); err != nil {
-				log.Fatalf("Could not start server on port %d: %v", serverConfig.Port, err)
-			}
+		assetsFs := dirFS{Dir: http.Dir("frontend/dist")}
+		handler, err := fbhttp.NewHandler(imgSvc, fileCache, d.store, &serverConfig, assetsFs)
+		checkErr(err)
+		defer listener.Close()
+		log.Println("Listening on", listener.Addr().String())
+		//nolint: gosec
+		if err := http.Serve(listener, handler); err != nil {
+			log.Fatal(err)
 		}
-
 	}, pythonConfig{allowNoDB: true}),
 }

 func StartFilebrowser() {
 	if err := rootCmd.Execute(); err != nil {
-		log.Fatal("Error starting filebrowser:", err)
+		log.Fatal(err)
 	}
 }

@@ -152,16 +121,16 @@ func quickSetup(d pythonData) {
 	settings.Config.Auth.Key = generateKey()
 	if settings.Config.Auth.Method == "noauth" {
 		err := d.store.Auth.Save(&auth.NoAuth{})
-		checkErr("d.store.Auth.Save", err)
+		checkErr(err)
 	} else {
 		settings.Config.Auth.Method = "password"
 		err := d.store.Auth.Save(&auth.JSONAuth{})
-		checkErr("d.store.Auth.Save", err)
+		checkErr(err)
 	}
 	err := d.store.Settings.Save(&settings.Config)
-	checkErr("d.store.Settings.Save", err)
+	checkErr(err)
 	err = d.store.Settings.SaveServer(&settings.Config.Server)
-	checkErr("d.store.Settings.SaveServer", err)
+	checkErr(err)
 	user := &users.User{}
 	settings.Config.UserDefaults.Apply(user)
 	user.Username = settings.Config.Auth.AdminUsername
@@ -181,5 +150,5 @@ func quickSetup(d pythonData) {
 		Admin:    true,
 	}
 	err = d.store.Users.Save(user)
-	checkErr("d.store.Users.Save", err)
+	checkErr(err)
 }
@@ -42,23 +42,23 @@ including 'index_end'.`,
 	},
 	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
 		i, err := strconv.Atoi(args[0])
-		checkErr("strconv.Atoi", err)
+		checkErr(err)
 		f := i
 		if len(args) == 2 { //nolint:gomnd
 			f, err = strconv.Atoi(args[1])
-			checkErr("strconv.Atoi", err)
+			checkErr(err)
 		}

 		user := func(u *users.User) {
 			u.Rules = append(u.Rules[:i], u.Rules[f+1:]...)
 			err := d.store.Users.Save(u)
-			checkErr("d.store.Users.Save", err)
+			checkErr(err)
 		}

 		global := func(s *settings.Settings) {
 			s.Rules = append(s.Rules[:i], s.Rules[f+1:]...)
 			err := d.store.Settings.Save(s)
-			checkErr("d.store.Settings.Save", err)
+			checkErr(err)
 		}

 		runRules(d.store, cmd, user, global)
@@ -33,7 +33,7 @@ func runRules(st *storage.Storage, cmd *cobra.Command, usersFn func(*users.User)
 	id := getUserIdentifier(cmd.Flags())
 	if id != nil {
 		user, err := st.Users.Get("", id)
-		checkErr("st.Users.Get", err)
+		checkErr(err)

 		if usersFn != nil {
 			usersFn(user)
@@ -44,7 +44,7 @@ func runRules(st *storage.Storage, cmd *cobra.Command, usersFn func(*users.User)
 	}

 	s, err := st.Settings.Get()
-	checkErr("st.Settings.Get", err)
+	checkErr(err)

 	if globalFn != nil {
 		globalFn(s)
@@ -44,13 +44,13 @@ var rulesAddCmd = &cobra.Command{
 		user := func(u *users.User) {
 			u.Rules = append(u.Rules, rule)
 			err := d.store.Users.Save(u)
-			checkErr("d.store.Users.Save", err)
+			checkErr(err)
 		}

 		global := func(s *settings.Settings) {
 			s.Rules = append(s.Rules, rule)
 			err := d.store.Settings.Save(s)
-			checkErr("d.store.Settings.Save", err)
+			checkErr(err)
 		}

 		runRules(d.store, cmd, user, global)
@@ -22,19 +22,19 @@ var usersAddCmd = &cobra.Command{
 			LockPassword: mustGetBool(cmd.Flags(), "lockPassword"),
 		}
 		servSettings, err := d.store.Settings.GetServer()
-		checkErr("d.store.Settings.GetServer()", err)
+		checkErr(err)
 		// since getUserDefaults() polluted s.Defaults.Scope
 		// which makes the Scope not the one saved in the db
 		// we need the right s.Defaults.Scope here
 		s2, err := d.store.Settings.Get()
-		checkErr("d.store.Settings.Get()", err)
+		checkErr(err)

 		userHome, err := s2.MakeUserDir(user.Username, user.Scope, servSettings.Root)
-		checkErr("s2.MakeUserDir", err)
+		checkErr(err)
 		user.Scope = userHome

 		err = d.store.Users.Save(user)
-		checkErr("d.store.Users.Save", err)
+		checkErr(err)
 		printUsers([]*users.User{user})
 	}, pythonConfig{}),
 }
@@ -16,9 +16,9 @@ path to the file where you want to write the users.`,
 	Args: jsonYamlArg,
 	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
 		list, err := d.store.Users.Gets("")
-		checkErr("d.store.Users.Gets", err)
+		checkErr(err)

 		err = marshal(args[0], list)
-		checkErr("marshal", err)
+		checkErr(err)
 	}, pythonConfig{}),
 }
@@ -46,6 +46,6 @@ var findUsers = python(func(cmd *cobra.Command, args []string, d pythonData) {
 		list, err = d.store.Users.Gets("")
 	}

-	checkErr("findUsers", err)
+	checkErr(err)
 	printUsers(list)
 }, pythonConfig{})
@@ -27,23 +27,28 @@ list or set it to 0.`,
 	Args: jsonYamlArg,
 	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
 		fd, err := os.Open(args[0])
-		checkErr("os.Open", err)
+		checkErr(err)
 		defer fd.Close()

 		list := []*users.User{}
 		err = unmarshal(args[0], &list)
-		checkErr("unmarshal", err)
+		checkErr(err)
+
+		for _, user := range list {
+			err = user.Clean("")
+			checkErr(err)
+		}

 		if mustGetBool(cmd.Flags(), "replace") {
 			oldUsers, err := d.store.Users.Gets("")
-			checkErr("d.store.Users.Gets", err)
+			checkErr(err)

 			err = marshal("users.backup.json", list)
-			checkErr("marshal users.backup.json", err)
+			checkErr(err)

 			for _, user := range oldUsers {
 				err = d.store.Users.Delete(user.ID)
-				checkErr("d.store.Users.Delete", err)
+				checkErr(err)
 			}
 		}

@@ -55,8 +60,7 @@ list or set it to 0.`,
 			// User exists in DB.
 			if err == nil {
 				if !overwrite {
-					newErr := errors.New("user " + strconv.Itoa(int(user.ID)) + " is already registered")
-					checkErr("", newErr)
+					checkErr(errors.New("user " + strconv.Itoa(int(user.ID)) + " is already registred"))
 				}

 				// If the usernames mismatch, check if there is another one in the DB
@@ -64,8 +68,7 @@ list or set it to 0.`,
 				// operation
 				if user.Username != onDB.Username {
 					if conflictuous, err := d.store.Users.Get("", user.Username); err == nil { //nolint:govet
-						newErr := usernameConflictError(user.Username, conflictuous.ID, user.ID)
-						checkErr("usernameConflictError", newErr)
+						checkErr(usernameConflictError(user.Username, conflictuous.ID, user.ID))
 					}
 				}
 			} else {
@@ -75,7 +78,7 @@ list or set it to 0.`,
 			}

 			err = d.store.Users.Save(user)
-			checkErr("d.store.Users.Save", err)
+			checkErr(err)
 		}
 	}, pythonConfig{}),
 }
@@ -25,7 +25,7 @@ var usersRmCmd = &cobra.Command{
 			err = d.store.Users.Delete(id)
 		}

-		checkErr("usersRmCmd", err)
+		checkErr(err)
 		fmt.Println("user deleted successfully")
 	}, pythonConfig{}),
 }
@@ -29,10 +29,10 @@ options you want to change.`,
 		} else {
 			user, err = d.store.Users.Get("", username)
 		}
-		checkErr("d.store.Users.Get", err)
+		checkErr(err)

 		err = d.store.Users.Update(user)
-		checkErr("d.store.Users.Update", err)
+		checkErr(err)
 		printUsers([]*users.User{user})
 	}, pythonConfig{}),
 }
@@ -3,7 +3,6 @@ package cmd
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"log"
 	"os"
 	"path/filepath"
@@ -18,33 +17,33 @@ import (
 	"github.com/gtsteffaniak/filebrowser/storage/bolt"
 )

-func checkErr(source string, err error) {
+func checkErr(err error) {
 	if err != nil {
-		log.Fatalf("%s: %v", source, err)
+		log.Fatal(err)
 	}
 }

 func mustGetString(flags *pflag.FlagSet, flag string) string {
 	s, err := flags.GetString(flag)
-	checkErr("mustGetString", err)
+	checkErr(err)
 	return s
 }

 func mustGetBool(flags *pflag.FlagSet, flag string) bool {
 	b, err := flags.GetBool(flag)
-	checkErr("mustGetBool", err)
+	checkErr(err)
 	return b
 }

 func mustGetUint(flags *pflag.FlagSet, flag string) uint {
 	b, err := flags.GetUint(flag)
-	checkErr("mustGetUint", err)
+	checkErr(err)
 	return b
 }

 func generateKey() []byte {
 	k, err := settings.GenerateKey()
-	checkErr("generateKey", err)
+	checkErr(err)
 	return k
 }

@@ -97,19 +96,18 @@ func python(fn pythonFunc, cfg pythonConfig) cobraFunc {

 		data.hadDB = exists
 		db, err := storm.Open(path)
-		checkErr(fmt.Sprintf("storm.Open path %v", path), err)
+		checkErr(err)

 		defer db.Close()
 		data.store, err = bolt.NewStorage(db)
-		checkErr("bolt.NewStorage", err)
+		checkErr(err)
 		fn(cmd, args, data)
 	}
 }

 func marshal(filename string, data interface{}) error {
 	fd, err := os.Create(filename)
-
-	checkErr("os.Create", err)
+	checkErr(err)
 	defer fd.Close()

 	switch ext := filepath.Ext(filename); ext {
@@ -127,7 +125,7 @@ func marshal(filename string, data interface{}) error {

 func unmarshal(filename string, data interface{}) error {
 	fd, err := os.Open(filename)
-	checkErr("os.Open", err)
+	checkErr(err)
 	defer fd.Close()

 	switch ext := filepath.Ext(filename); ext {
@@ -10,17 +10,13 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+
+	"github.com/spf13/afero"
 )

-// Cache interface for caching operations
-type Cache interface {
-	Get(key string) ([]byte, error)
-	Set(key string, value []byte) error
-}
-
-// FileCache struct for file-based caching
 type FileCache struct {
-	dir string
+	fs afero.Fs
+
 	// granular locks
 	scopedLocks struct {
 		sync.Mutex
@@ -29,12 +25,10 @@ type FileCache struct {
 	}
 }

-// NewFileCache creates a new FileCache
-func NewFileCache(dir string) (*FileCache, error) {
-	if err := os.MkdirAll(dir, 0700); err != nil {
-		return nil, fmt.Errorf("can't make directory %s: %v", dir, err)
+func New(fs afero.Fs, root string) *FileCache {
+	return &FileCache{
+		fs: afero.NewBasePathFs(fs, root),
 	}
-	return &FileCache{dir: dir}, nil
 }

 func (f *FileCache) Store(ctx context.Context, key string, value []byte) error {
@@ -43,11 +37,11 @@ func (f *FileCache) Store(ctx context.Context, key string, value []byte) error {
 	defer mu.Unlock()

 	fileName := f.getFileName(key)
-	if err := os.MkdirAll(filepath.Dir(fileName), 0700); err != nil {
+	if err := f.fs.MkdirAll(filepath.Dir(fileName), 0700); err != nil { //nolint:gomnd
 		return err
 	}

-	if err := os.WriteFile(fileName, value, 0600); err != nil {
+	if err := afero.WriteFile(f.fs, fileName, value, 0700); err != nil { //nolint:gomnd
 		return err
 	}

@@ -74,15 +68,15 @@ func (f *FileCache) Delete(ctx context.Context, key string) error {
 	defer mu.Unlock()

 	fileName := f.getFileName(key)
-	if err := os.Remove(fileName); err != nil && !errors.Is(err, os.ErrNotExist) {
+	if err := f.fs.Remove(fileName); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return err
 	}
 	return nil
 }

-func (f *FileCache) open(key string) (*os.File, bool, error) {
+func (f *FileCache) open(key string) (afero.File, bool, error) {
 	fileName := f.getFileName(key)
-	file, err := os.Open(fileName)
+	file, err := f.fs.Open(fileName)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
 			return nil, false, nil
@@ -112,5 +106,5 @@ func (f *FileCache) getFileName(key string) string {
 	hasher := sha1.New() //nolint:gosec
 	_, _ = hasher.Write([]byte(key))
 	hash := hex.EncodeToString(hasher.Sum(nil))
-	return filepath.Join(f.dir, fmt.Sprintf("%s/%s/%s", hash[:1], hash[1:3], hash))
+	return fmt.Sprintf("%s/%s/%s", hash[:1], hash[1:3], hash)
 }
@@ -2,10 +2,10 @@ package diskcache

 import (
 	"context"
-	"os"
 	"path/filepath"
 	"testing"

+	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
 )

@@ -15,39 +15,35 @@ func TestFileCache(t *testing.T) {
 		key            = "key"
 		value          = "some text"
 		newValue       = "new text"
-		cacheRoot      = "cache"
+		cacheRoot      = "/cache"
 		cachedFilePath = "a/62/a62f2225bf70bfaccbc7f1ef2a397836717377de"
 	)

-	// Create temporary directory for the cache
-	cacheDir, err := os.MkdirTemp("", cacheRoot)
-	require.NoError(t, err)
-	defer os.RemoveAll(cacheDir) // Clean up
-
-	cache, err := NewFileCache(cacheDir)
-	require.NoError(t, err)
+	fs := afero.NewMemMapFs()
+	cache := New(fs, "/cache")

 	// store new key
-	err = cache.Store(ctx, key, []byte(value))
+	err := cache.Store(ctx, key, []byte(value))
 	require.NoError(t, err)
-	checkValue(t, ctx, cache, filepath.Join(cacheDir, cachedFilePath), key, value)
+	checkValue(t, ctx, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, value)

 	// update existing key
 	err = cache.Store(ctx, key, []byte(newValue))
 	require.NoError(t, err)
-	checkValue(t, ctx, cache, filepath.Join(cacheDir, cachedFilePath), key, newValue)
+	checkValue(t, ctx, fs, filepath.Join(cacheRoot, cachedFilePath), cache, key, newValue)

 	// delete key
 	err = cache.Delete(ctx, key)
 	require.NoError(t, err)
-	exists := fileExists(filepath.Join(cacheDir, cachedFilePath))
+	exists, err := afero.Exists(fs, filepath.Join(cacheRoot, cachedFilePath))
+	require.NoError(t, err)
 	require.False(t, exists)
 }

-func checkValue(t *testing.T, ctx context.Context, cache *FileCache, fileFullPath string, key, wantValue string) {
+func checkValue(t *testing.T, ctx context.Context, fs afero.Fs, fileFullPath string, cache *FileCache, key, wantValue string) { //nolint:golint
 	t.Helper()
 	// check actual file content
-	b, err := os.ReadFile(fileFullPath)
+	b, err := afero.ReadFile(fs, fileFullPath)
 	require.NoError(t, err)
 	require.Equal(t, wantValue, string(b))

@@ -57,11 +53,3 @@ func checkValue(t *testing.T, ctx context.Context, cache *FileCache, fileFullPat
 	require.True(t, ok)
 	require.Equal(t, wantValue, string(b))
 }
-
-func fileExists(filename string) bool {
-	info, err := os.Stat(filename)
-	if os.IsNotExist(err) {
-		return false
-	}
-	return !info.IsDir()
-}
@@ -1,7 +1,7 @@
 server:
  port: 80
  baseURL:  "/"
-  root: "./srv"
+  root: "/srv"
 auth:
  method: password
  signup: false
@@ -6,21 +6,21 @@ import (
 	"crypto/sha256"
 	"crypto/sha512"
 	"encoding/hex"
-	"fmt"
 	"hash"
 	"io"
 	"mime"
 	"net/http"
 	"os"
-	"path/filepath"
+	filepath "path/filepath"
 	"strings"
 	"sync"
 	"time"
 	"unicode/utf8"

+	"github.com/spf13/afero"
+
 	"github.com/gtsteffaniak/filebrowser/errors"
 	"github.com/gtsteffaniak/filebrowser/rules"
-	"github.com/gtsteffaniak/filebrowser/settings"
 	"github.com/gtsteffaniak/filebrowser/users"
 )

@@ -33,6 +33,7 @@ var (
 // FileInfo describes a file.
 type FileInfo struct {
 	*Listing
+	Fs        afero.Fs          `json:"-"`
 	Path      string            `json:"path,omitempty"`
 	Name      string            `json:"name"`
 	Size      int64             `json:"size"`
@@ -51,7 +52,8 @@ type FileInfo struct {

 // FileOptions are the options when getting a file info.
 type FileOptions struct {
-	Path       string // realpath
+	Fs         afero.Fs
+	Path       string
 	Modify     bool
 	Expand     bool
 	ReadHeader bool
@@ -89,7 +91,7 @@ func NewFileInfo(opts FileOptions) (*FileInfo, error) {
 	}
 	if opts.Expand {
 		if file.IsDir {
-			if err = file.readListing(opts.Path, opts.Checker, opts.ReadHeader); err != nil {
+			if err := file.readListing(opts.Path, opts.Checker, opts.ReadHeader); err != nil { //nolint:govet
 				return nil, err
 			}
 			return file, nil
@@ -121,7 +123,7 @@ func FileInfoFaster(opts FileOptions) (*FileInfo, error) {
 	if exists && !opts.Content {
 		// Check if the cache time is less than 1 second
 		if time.Since(info.CacheTime) > time.Second {
-			go RefreshFileInfo(opts)
+			go refreshFileInfo(opts)
 		}
 		// refresh cache after
 		return &info, nil
@@ -131,7 +133,7 @@ func FileInfoFaster(opts FileOptions) (*FileInfo, error) {
 			file, err := NewFileInfo(opts)
 			return file, err
 		}
-		updated := RefreshFileInfo(opts)
+		updated := refreshFileInfo(opts)
 		if !updated {
 			file, err := NewFileInfo(opts)
 			return file, err
@@ -144,7 +146,7 @@ func FileInfoFaster(opts FileOptions) (*FileInfo, error) {
 	}
 }

-func RefreshFileInfo(opts FileOptions) bool {
+func refreshFileInfo(opts FileOptions) bool {
 	if !opts.Checker.Check(opts.Path) {
 		return false
 	}
@@ -164,37 +166,60 @@ func RefreshFileInfo(opts FileOptions) bool {
 		if err != nil {
 			return false
 		}
+		//_, exists := index.GetFileMetadata(adjustedPath)
+
 		return index.UpdateFileMetadata(adjustedPath, *file)
 	} else {
+		//_, exists := index.GetFileMetadata(adjustedPath)
 		return index.UpdateFileMetadata(adjustedPath, *file)
 	}
 }

 func stat(path string, opts FileOptions) (*FileInfo, error) {
-	info, err := os.Lstat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	file := &FileInfo{
-		Path:      opts.Path,
-		Name:      info.Name(),
-		ModTime:   info.ModTime(),
-		Mode:      info.Mode(),
-		Size:      info.Size(),
-		Extension: filepath.Ext(info.Name()),
-		Token:     opts.Token,
-	}
-
-	if info.IsDir() {
-		file.IsDir = true
-	}
-	if info.Mode()&os.ModeSymlink != 0 {
-		file.IsSymlink = true
-		targetInfo, err := os.Stat(path)
+	var file *FileInfo
+	if lstaterFs, ok := opts.Fs.(afero.Lstater); ok {
+		info, _, err := lstaterFs.LstatIfPossible(path)
 		if err == nil {
-			file.Size = targetInfo.Size()
-			file.IsDir = targetInfo.IsDir()
+			file = &FileInfo{
+				Fs:        opts.Fs,
+				Path:      opts.Path,
+				Name:      info.Name(),
+				ModTime:   info.ModTime(),
+				Mode:      info.Mode(),
+				Size:      info.Size(),
+				Extension: filepath.Ext(info.Name()),
+				Token:     opts.Token,
+			}
+			if info.IsDir() {
+				file.IsDir = true
+			}
+			if info.Mode()&os.ModeSymlink != 0 {
+				file.IsSymlink = true
+			}
+		}
+	}
+	if file == nil || file.IsSymlink {
+		info, err := opts.Fs.Stat(opts.Path)
+		if err != nil {
+			return nil, err
+		}
+
+		if file != nil && file.IsSymlink {
+			file.Size = info.Size()
+			file.IsDir = info.IsDir()
+			return file, nil
+		}
+
+		file = &FileInfo{
+			Fs:        opts.Fs,
+			Path:      opts.Path,
+			Name:      info.Name(),
+			ModTime:   info.ModTime(),
+			Mode:      info.Mode(),
+			IsDir:     info.IsDir(),
+			Size:      info.Size(),
+			Extension: filepath.Ext(info.Name()),
+			Token:     opts.Token,
 		}
 	}

@@ -212,7 +237,7 @@ func (i *FileInfo) Checksum(algo string) error {
 		i.Checksums = map[string]string{}
 	}

-	reader, err := os.Open(i.Path)
+	reader, err := i.Fs.Open(i.Path)
 	if err != nil {
 		return err
 	}
@@ -241,147 +266,37 @@ func (i *FileInfo) Checksum(algo string) error {

 // RealPath gets the real path for the file, resolving symlinks if supported.
 func (i *FileInfo) RealPath() string {
-	realPath, err := filepath.EvalSymlinks(i.Path)
-	if err == nil {
-		return realPath
+	if realPathFs, ok := i.Fs.(interface {
+		RealPath(name string) (fPath string, err error)
+	}); ok {
+		realPath, err := realPathFs.RealPath(i.Path)
+		if err == nil {
+			return realPath
+		}
 	}
+
 	return i.Path
 }

-func GetRealPath(relativePath ...string) (string, error) {
-	combined := []string{settings.Config.Server.Root}
-	for _, path := range relativePath {
-		combined = append(combined, strings.TrimPrefix(path, settings.Config.Server.Root))
-	}
-	joinedPath := filepath.Join(combined...)
-
-	// Convert relative path to absolute path
-	absolutePath, err := filepath.Abs(joinedPath)
-	if err != nil {
-		return "", err
-	}
-	if !Exists(absolutePath) {
-		return absolutePath, nil // return without error
-	}
-	// Resolve symlinks and get the real path
-	return resolveSymlinks(absolutePath)
-}
-
-func DeleteFiles(absPath string, opts FileOptions) error {
-	err := os.RemoveAll(absPath)
-	if err != nil {
-		return err
-	}
-	parentDir := filepath.Dir(absPath)
-	opts.Path = parentDir
-	updated := RefreshFileInfo(opts)
-	if !updated {
-		return errors.ErrEmptyKey
-	}
-	return nil
-}
-
-func WriteDirectory(opts FileOptions) error {
-	// Ensure the parent directories exist
-	err := os.MkdirAll(opts.Path, 0775)
-	if err != nil {
-		return err
-	}
-	opts.Path = filepath.Dir(opts.Path)
-	updated := RefreshFileInfo(opts)
-	if !updated {
-		return errors.ErrEmptyKey
-	}
-
-	return nil
-}
-
-func WriteFile(opts FileOptions, in io.Reader) error {
-	fmt.Println("writing file", opts.Path)
-	dst := opts.Path
-	parentDir := filepath.Dir(dst)
-	// Split the directory from the destination path
-	dir := filepath.Dir(dst)
-
-	// Create the directory and all necessary parents
-	err := os.MkdirAll(dir, 0775)
-	if err != nil {
-		return err
-	}
-
-	// Open the file for writing (create if it doesn't exist, truncate if it does)
-	file, err := os.OpenFile(dst, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	// Copy the contents from the reader to the file
-	_, err = io.Copy(file, in)
-	if err != nil {
-		return err
-	}
-	fmt.Println("refreshing info for ", parentDir)
-	opts.Path = parentDir
-	updated := RefreshFileInfo(opts)
-	if !updated {
-		return errors.ErrEmptyKey
-	}
-
-	return nil
-}
-
-// resolveSymlinks resolves symlinks in the given path
-func resolveSymlinks(path string) (string, error) {
-	for {
-		// Get the file info
-		info, err := os.Lstat(path)
-		if err != nil {
-			return "", err
-		}
-
-		// Check if it's a symlink
-		if info.Mode()&os.ModeSymlink != 0 {
-			// Read the symlink target
-			target, err := os.Readlink(path)
-			if err != nil {
-				return "", err
-			}
-
-			// Resolve the target relative to the symlink's directory
-			path = filepath.Join(filepath.Dir(path), target)
-		} else {
-			// Not a symlink, so we are done
-			return path, nil
-		}
-	}
-}
-
 // addContent reads and sets content based on the file type.
 func (i *FileInfo) addContent(path string) error {
 	if !i.IsDir {
-		content, err := os.ReadFile(path)
+		afs := &afero.Afero{Fs: i.Fs}
+		content, err := afs.ReadFile(path)
 		if err != nil {
 			return err
 		}
-		stringContent := string(content)
-		if !utf8.ValidString(stringContent) {
+		c := string(string(content))
+		if !utf8.ValidString(c) {
 			return nil
 		}
-		if stringContent == "" {
-			i.Content = "empty-file-x6OlSil"
-			return nil
-		}
-		i.Content = stringContent
+		i.Content = string(c)
 	}
 	return nil
 }

 // detectType detects the file type.
 func (i *FileInfo) detectType(path string, modify, saveContent, readHeader bool) error {
-	if i.IsDir {
-		return nil
-	}
 	if IsNamedPipe(i.Mode) {
 		i.Type = "blob"
 		if saveContent {
@@ -426,6 +341,7 @@ func (i *FileInfo) detectType(path string, modify, saveContent, readHeader bool)
 			}
 		}
 	}
+
 	if i.Type == "" {
 		i.Type = "blob"
 		if saveContent {
@@ -438,15 +354,15 @@ func (i *FileInfo) detectType(path string, modify, saveContent, readHeader bool)

 // readFirstBytes reads the first bytes of the file.
 func (i *FileInfo) readFirstBytes() []byte {
-	file, err := os.Open(i.Path)
+	reader, err := i.Fs.Open(i.Path)
 	if err != nil {
 		i.Type = "blob"
 		return nil
 	}
-	defer file.Close()
+	defer reader.Close()

 	buffer := make([]byte, 512) //nolint:gomnd
-	n, err := file.Read(buffer)
+	n, err := reader.Read(buffer)
 	if err != nil && err != io.EOF {
 		i.Type = "blob"
 		return nil
@@ -467,8 +383,7 @@ func (i *FileInfo) detectSubtitles(parentDir string) {
 		// Directory must have been deleted, remove it from the index
 		return
 	}
-	defer dir.Close() // Ensure directory handle is closed
-
+	// Read the directory contents
 	files, err := dir.Readdir(-1)
 	if err != nil {
 		return
@@ -493,13 +408,8 @@ func (i *FileInfo) detectSubtitles(parentDir string) {

 // readListing reads the contents of a directory and fills the listing.
 func (i *FileInfo) readListing(path string, checker rules.Checker, readHeader bool) error {
-	dir, err := os.Open(i.Path)
-	if err != nil {
-		return err
-	}
-	defer dir.Close()
-
-	files, err := dir.Readdir(-1)
+	afs := &afero.Afero{Fs: i.Fs}
+	dir, err := afs.ReadDir(i.Path)
 	if err != nil {
 		return err
 	}
@@ -511,7 +421,7 @@ func (i *FileInfo) readListing(path string, checker rules.Checker, readHeader bo
 		NumFiles: 0,
 	}

-	for _, f := range files {
+	for _, f := range dir {
 		name := f.Name()
 		fPath := filepath.Join(i.Path, name)

@@ -522,7 +432,7 @@ func (i *FileInfo) readListing(path string, checker rules.Checker, readHeader bo
 		isSymlink, isInvalidLink := false, false
 		if IsSymlink(f.Mode()) {
 			isSymlink = true
-			info, err := os.Stat(fPath)
+			info, err := i.Fs.Stat(fPath)
 			if err == nil {
 				f = info
 			} else {
@@ -564,7 +474,6 @@ func (i *FileInfo) readListing(path string, checker rules.Checker, readHeader bo
 	i.Listing = listing
 	return nil
 }
-
 func IsNamedPipe(mode os.FileMode) bool {
 	return mode&os.ModeNamedPipe != 0
 }
@@ -585,14 +494,3 @@ func getMutex(path string) *sync.Mutex {

 	return pathMutexes[path]
 }
-
-func Exists(path string) bool {
-	_, err := os.Stat(path)
-	if err == nil {
-		return true
-	}
-	if os.IsNotExist(err) {
-		return false
-	}
-	return false
-}
@@ -65,7 +65,7 @@ func (si *Index) Search(search string, scope string, sourceSession string) ([]st
 				if count > maxSearchResults {
 					break
 				}
-				fullName := strings.TrimLeft(pathName+file, "/")
+				fullName := pathName + file
 				fileTypes := map[string]bool{}

 				matches, fileType := containsSearchTerm(fullName, searchTerm, *searchOptions, isDir, fileTypes)
@@ -2,23 +2,23 @@ package fileutils

 import (
 	"os"
-	"path/filepath"
+	"path"
+
+	"github.com/spf13/afero"
 )

 // Copy copies a file or folder from one place to another.
-func Copy(src, dst string) error {
-	src = filepath.Clean(src)
-	if src == "" {
+func Copy(fs afero.Fs, src, dst string) error {
+	if src = path.Clean("/" + src); src == "" {
 		return os.ErrNotExist
 	}

-	dst = filepath.Clean(dst)
-	if dst == "" {
+	if dst = path.Clean("/" + dst); dst == "" {
 		return os.ErrNotExist
 	}

 	if src == "/" || dst == "/" {
-		// Prohibit copying from or to the root directory.
+		// Prohibit copying from or to the virtual root directory.
 		return os.ErrInvalid
 	}

@@ -26,14 +26,14 @@ func Copy(src, dst string) error {
 		return os.ErrInvalid
 	}

-	info, err := os.Stat(src)
+	info, err := fs.Stat(src)
 	if err != nil {
 		return err
 	}

 	if info.IsDir() {
-		return CopyDir(src, dst)
+		return CopyDir(fs, src, dst)
 	}

-	return CopyFile(src, dst)
+	return CopyFile(fs, src, dst)
 }
@@ -2,32 +2,27 @@ package fileutils

 import (
 	"errors"
-	"os"
-	"path/filepath"
+
+	"github.com/spf13/afero"
 )

 // CopyDir copies a directory from source to dest and all
 // of its sub-directories. It doesn't stop if it finds an error
 // during the copy. Returns an error if any.
-func CopyDir(source, dest string) error {
+func CopyDir(fs afero.Fs, source, dest string) error {
 	// Get properties of source.
-	srcinfo, err := os.Stat(source)
+	srcinfo, err := fs.Stat(source)
 	if err != nil {
 		return err
 	}

 	// Create the destination directory.
-	err = os.MkdirAll(dest, srcinfo.Mode())
+	err = fs.MkdirAll(dest, srcinfo.Mode())
 	if err != nil {
 		return err
 	}

-	dir, err := os.Open(source)
-	if err != nil {
-		return err
-	}
-	defer dir.Close()
-
+	dir, _ := fs.Open(source)
 	obs, err := dir.Readdir(-1)
 	if err != nil {
 		return err
@@ -36,18 +31,18 @@ func CopyDir(source, dest string) error {
 	var errs []error

 	for _, obj := range obs {
-		fsource := filepath.Join(source, obj.Name())
-		fdest := filepath.Join(dest, obj.Name())
+		fsource := source + "/" + obj.Name()
+		fdest := dest + "/" + obj.Name()

 		if obj.IsDir() {
 			// Create sub-directories, recursively.
-			err = CopyDir(fsource, fdest)
+			err = CopyDir(fs, fsource, fdest)
 			if err != nil {
 				errs = append(errs, err)
 			}
 		} else {
 			// Perform the file copy.
-			err = CopyFile(fsource, fdest)
+			err = CopyFile(fs, fsource, fdest)
 			if err != nil {
 				errs = append(errs, err)
 			}
@@ -5,22 +5,24 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+
+	"github.com/spf13/afero"
 )

-// MoveFile moves a file from src to dst.
-// By default, the rename system call is used. If src and dst point to different volumes,
-// the file copy is used as a fallback.
-func MoveFile(src, dst string) error {
-	if os.Rename(src, dst) == nil {
+// MoveFile moves file from src to dst.
+// By default the rename filesystem system call is used. If src and dst point to different volumes
+// the file copy is used as a fallback
+func MoveFile(fs afero.Fs, src, dst string) error {
+	if fs.Rename(src, dst) == nil {
 		return nil
 	}
 	// fallback
-	err := CopyFile(src, dst)
+	err := CopyFile(fs, src, dst)
 	if err != nil {
-		_ = os.Remove(dst)
+		_ = fs.Remove(dst)
 		return err
 	}
-	if err := os.Remove(src); err != nil {
+	if err := fs.Remove(src); err != nil {
 		return err
 	}
 	return nil
@@ -28,22 +30,23 @@ func MoveFile(src, dst string) error {

 // CopyFile copies a file from source to dest and returns
 // an error if any.
-func CopyFile(source, dest string) error {
+func CopyFile(fs afero.Fs, source, dest string) error {
 	// Open the source file.
-	src, err := os.Open(source)
+	src, err := fs.Open(source)
 	if err != nil {
 		return err
 	}
 	defer src.Close()

-	// Makes the directory needed to create the dst file.
-	err = os.MkdirAll(filepath.Dir(dest), 0775) //nolint:gomnd
+	// Makes the directory needed to create the dst
+	// file.
+	err = fs.MkdirAll(filepath.Dir(dest), 0666) //nolint:gomnd
 	if err != nil {
 		return err
 	}

 	// Create the destination file.
-	dst, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666) //nolint:gomnd
+	dst, err := fs.OpenFile(dest, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775) //nolint:gomnd
 	if err != nil {
 		return err
 	}
@@ -55,12 +58,12 @@ func CopyFile(source, dest string) error {
 		return err
 	}

-	// Copy the mode.
-	info, err := os.Stat(source)
+	// Copy the mode
+	info, err := fs.Stat(source)
 	if err != nil {
 		return err
 	}
-	err = os.Chmod(dest, info.Mode())
+	err = fs.Chmod(dest, info.Mode())
 	if err != nil {
 		return err
 	}
@@ -68,7 +71,7 @@ func CopyFile(source, dest string) error {
 	return nil
 }

-// CommonPrefix returns the common directory path of provided files.
+// CommonPrefix returns common directory path of provided files
 func CommonPrefix(sep byte, paths ...string) string {
 	// Handle special cases.
 	switch len(paths) {
@@ -78,19 +81,30 @@ func CommonPrefix(sep byte, paths ...string) string {
 		return path.Clean(paths[0])
 	}

-	// Treat string as []byte, not []rune as is often done in Go.
+	// Note, we treat string as []byte, not []rune as is often
+	// done in Go. (And sep as byte, not rune). This is because
+	// most/all supported OS' treat paths as string of non-zero
+	// bytes. A filename may be displayed as a sequence of Unicode
+	// runes (typically encoded as UTF-8) but paths are
+	// not required to be valid UTF-8 or in any normalized form
+	// (e.g. "é" (U+00C9) and "é" (U+0065,U+0301) are different
+	// file names.
 	c := []byte(path.Clean(paths[0]))

-	// Add a trailing sep to handle the case where the common prefix directory
-	// is included in the path list.
+	// We add a trailing sep to handle the case where the
+	// common prefix directory is included in the path list
+	// (e.g. /home/user1, /home/user1/foo, /home/user1/bar).
+	// path.Clean will have cleaned off trailing / separators with
+	// the exception of the root directory, "/" (in which case we
+	// make it "//", but this will get fixed up to "/" bellow).
 	c = append(c, sep)

-	// Ignore the first path since it's already in c.
+	// Ignore the first path since it's already in c
 	for _, v := range paths[1:] {
-		// Clean up each path before testing it.
+		// Clean up each path before testing it
 		v = path.Clean(v) + string(sep)

-		// Find the first non-common byte and truncate c.
+		// Find the first non-common byte and truncate c
 		if len(v) < len(c) {
 			c = c[:len(v)]
 		}
@@ -102,7 +116,7 @@ func CommonPrefix(sep byte, paths ...string) string {
 		}
 	}

-	// Remove trailing non-separator characters and the final separator.
+	// Remove trailing non-separator characters and the final separator
 	for i := len(c) - 1; i >= 0; i-- {
 		if c[i] == sep {
 			c = c[:i]
@@ -1,6 +0,0 @@
-{
-  "name": "frontend",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}
@@ -1,27 +1,27 @@
 module github.com/gtsteffaniak/filebrowser

-go 1.22.5
+go 1.22.0

 require (
 	github.com/asdine/storm/v3 v3.2.1
 	github.com/disintegration/imaging v1.6.2
 	github.com/dsoprea/go-exif/v3 v3.0.1
 	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568
-	github.com/goccy/go-yaml v1.12.0
+	github.com/goccy/go-yaml v1.11.3
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/go-cmp v0.6.0
 	github.com/gorilla/mux v1.8.1
 	github.com/marusama/semaphore/v2 v2.5.0
 	github.com/mholt/archiver/v3 v3.5.1
-	github.com/shirou/gopsutil/v3 v3.24.5
+	github.com/shirou/gopsutil/v3 v3.24.4
 	github.com/spf13/afero v1.11.0
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
 	github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce
-	golang.org/x/crypto v0.26.0
-	golang.org/x/image v0.19.0
-	golang.org/x/text v0.17.0
+	golang.org/x/crypto v0.22.0
+	golang.org/x/image v0.15.0
+	golang.org/x/text v0.15.0
 )

 require (
@@ -30,13 +30,13 @@ require (
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
 	github.com/dsoprea/go-logging v0.0.0-20200710184922-b02d349568dd // indirect
 	github.com/dsoprea/go-utility/v2 v2.0.0-20221003172846-a3e1774ef349 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/fatih/color v1.16.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.8 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -47,10 +47,10 @@ require (
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.etcd.io/bbolt v1.3.10 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
+	go.etcd.io/bbolt v1.3.9 // indirect
+	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
@@ -8,7 +8,8 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/asdine/storm/v3 v3.2.1 h1:I5AqhkPK6nBZ/qJXySdI7ot5BlXSZ7qvDY1zAn5ZJac=
 github.com/asdine/storm/v3 v3.2.1/go.mod h1:LEpXwGt4pIqrE/XcTvCnZHT5MgZCV6Ub9q7yQzOFWr0=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
@@ -35,8 +36,8 @@ github.com/dsoprea/go-utility/v2 v2.0.0-20221003172846-a3e1774ef349 h1:DilThiXje
 github.com/dsoprea/go-utility/v2 v2.0.0-20221003172846-a3e1774ef349/go.mod h1:4GC5sXji84i/p+irqghpPFZBF8tRN/Q7+700G0/DLe8=
 github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
-github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
@@ -56,8 +57,8 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/goccy/go-yaml v1.12.0 h1:/1WHjnMsI1dlIBQutrvSMGZRQufVO3asrHfTwfACoPM=
-github.com/goccy/go-yaml v1.12.0/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
+github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I=
+github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
@@ -76,6 +77,8 @@ github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
@@ -87,8 +90,10 @@ github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c
 github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/compress v1.11.4 h1:kz40R/YWls3iqT9zX9AHN3WoVsrAWVyui5sxuLqiXqU=
 github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
+github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
 github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
@@ -101,6 +106,7 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/marusama/semaphore/v2 v2.5.0 h1:o/1QJD9DBYOWRnDhPwDVAXQn6mQYD0gZaS1Tpx6DJGM=
 github.com/marusama/semaphore/v2 v2.5.0/go.mod h1:z9nMiNUekt/LTpTUQdpp+4sJeYqUGpwMHfW0Z8V8fnQ=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
@@ -126,47 +132,67 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b h1:0LFwY6Q3gMACTjAbMZBjXAqTOzOwFaj2Ld6cjeQ7Rig=
+github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
-github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
+github.com/shirou/gopsutil/v3 v3.24.1 h1:R3t6ondCEvmARp3wxODhXMTLC/klMa87h2PHUw5m7QI=
+github.com/shirou/gopsutil/v3 v3.24.1/go.mod h1:UU7a2MSBQa+kW1uuDq8DeEBS8kmrnQwsv2b5O513rwU=
+github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU=
+github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8=
+github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
+github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
 github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce h1:fb190+cK2Xz/dvi9Hv8eCYJYvIGUTN2/KLq1pT6CjEc=
 github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4=
 github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.9 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I=
 github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
+github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=
-go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ=
+go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
+go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
+go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI=
+go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
-golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
-golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
-golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
-golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ=
-golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys=
+golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -174,10 +200,12 @@ golang.org/x/net v0.0.0-20200320220750-118fecf932d8/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -192,24 +220,27 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk=
-golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
@@ -222,5 +253,6 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"

 	"github.com/gorilla/mux"

@@ -47,6 +46,7 @@ func previewHandler(imgSvc ImgService, fileCache FileCache, enableThumbnails, re
 		}

 		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         d.user.Fs,
 			Path:       "/" + vars["path"],
 			Modify:     d.user.Perm.Modify,
 			Expand:     true,
@@ -110,7 +110,7 @@ func handleImagePreview(

 func createPreview(imgSvc ImgService, fileCache FileCache,
 	file *files.FileInfo, previewSize PreviewSize) ([]byte, error) {
-	fd, err := os.Open(file.Path)
+	fd, err := file.Fs.Open(file.Path)
 	if err != nil {
 		return nil, err
 	}
@@ -2,12 +2,13 @@ package http

 import (
 	"errors"
-	"fmt"
 	"net/http"
 	"net/url"
 	"path"
+	"path/filepath"
 	"strings"

+	"github.com/spf13/afero"
 	"golang.org/x/crypto/bcrypt"

 	"github.com/gtsteffaniak/filebrowser/files"
@@ -19,27 +20,33 @@ import (
 var withHashFile = func(fn handleFunc) handleFunc {
 	return func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 		id, path := ifPathWithName(r)
-		fmt.Println(id, path)
 		link, err := d.store.Share.GetByHash(id)
 		if err != nil {
 			return errToStatus(err), err
 		}
 		if link.Hash != "" {
-			var status int
-			status, err = authenticateShareRequest(r, link) // Assign to the existing `err` variable
-			if err != nil || status != 0 {
+			status, err := authenticateShareRequest(r, link)
+			if status != 0 || err != nil {
 				return status, err
 			}
 		}
 		d.user = &users.PublicUser
-		realPath, err := files.GetRealPath(d.user.Scope, link.Path, path)
-		if err != nil {
-			return http.StatusNotFound, err
+		if path == "/" {
+			path = link.Path
+		} else if strings.HasPrefix("/"+path, link.Path) {
+			path = "/" + path
+		} else {
+			path = link.Path + "/" + path
 		}
+		sharePath := settings.Config.Server.Root + path
+		lastComponent := filepath.Base(sharePath)
+		basePath := filepath.Dir(sharePath)
+		fsPath := afero.NewBasePathFs(afero.NewOsFs(), basePath)
 		file, err := files.FileInfoFaster(files.FileOptions{
-			Path:       realPath,
+			Fs:         fsPath,
+			Path:       lastComponent,
 			Modify:     d.user.Perm.Modify,
-			Expand:     true,
+			Expand:     false,
 			ReadHeader: d.server.TypeDetectionByHeader,
 			Checker:    d,
 			Token:      link.Token,
@@ -56,15 +63,14 @@ func ifPathWithName(r *http.Request) (id, filePath string) {
 	pathElements := strings.Split(r.URL.Path, "/")
 	id = pathElements[0]
 	allButFirst := path.Join(pathElements[1:]...)
+	if len(pathElements) == 1 {
+		allButFirst = "/"
+	}
 	return id, allButFirst
 }

 var publicShareHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
-	file, ok := d.raw.(*files.FileInfo)
-	if !ok {
-		return http.StatusInternalServerError, fmt.Errorf("failed to assert type *files.FileInfo")
-	}
-
+	file := d.raw.(*files.FileInfo)
 	file.Path = strings.TrimPrefix(file.Path, settings.Config.Server.Root)
 	if file.IsDir {
 		return renderJSON(w, r, file)
@@ -80,11 +86,7 @@ var publicUserGetHandler = func(w http.ResponseWriter, r *http.Request, d *data)
 }

 var publicDlHandler = withHashFile(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
-	file, ok := d.raw.(*files.FileInfo)
-	if !ok {
-		return http.StatusInternalServerError, fmt.Errorf("failed to assert type *files.FileInfo")
-	}
-
+	file := d.raw.(*files.FileInfo)
 	if !file.IsDir {
 		return rawFileHandler(w, r, file)
 	}
@@ -8,6 +8,7 @@ import (
 	"testing"

 	"github.com/asdine/storm/v3"
+	"github.com/spf13/afero"

 	"github.com/gtsteffaniak/filebrowser/settings"
 	"github.com/gtsteffaniak/filebrowser/share"
@@ -91,6 +92,7 @@ func TestPublicShareHandlerAuthentication(t *testing.T) {

 				storage.Users = &customFSUser{
 					Store: storage.Users,
+					fs:    &afero.MemMapFs{},
 				}

 				recorder := httptest.NewRecorder()
@@ -120,6 +122,7 @@ func newHTTPRequest(t *testing.T, requestModifiers ...func(*http.Request)) *http

 type customFSUser struct {
 	users.Store
+	fs afero.Fs
 }

 func (cu *customFSUser) Get(baseScope string, id interface{}) (*users.User, error) {
@@ -127,5 +130,7 @@ func (cu *customFSUser) Get(baseScope string, id interface{}) (*users.User, erro
 	if err != nil {
 		return nil, err
 	}
+	user.Fs = cu.fs
+
 	return user, nil
 }
@@ -5,7 +5,6 @@ import (
 	"log"
 	"net/http"
 	"net/url"
-	"os"
 	gopath "path"
 	"path/filepath"
 	"strings"
@@ -81,12 +80,10 @@ var rawHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data)
 	if !d.user.Perm.Download {
 		return http.StatusAccepted, nil
 	}
-	realPath, err := files.GetRealPath(d.user.Scope, r.URL.Path)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
+
 	file, err := files.FileInfoFaster(files.FileOptions{
-		Path:       realPath,
+		Fs:         d.user.Fs,
+		Path:       r.URL.Path,
 		Modify:     d.user.Perm.Modify,
 		Expand:     false,
 		ReadHeader: d.server.TypeDetectionByHeader,
@@ -111,7 +108,7 @@ func addFile(ar archiver.Writer, d *data, path, commonPath string) error {
 	if !d.Check(path) {
 		return nil
 	}
-	info, err := os.Stat(path)
+	info, err := d.user.Fs.Stat(path)
 	if err != nil {
 		return err
 	}
@@ -120,7 +117,7 @@ func addFile(ar archiver.Writer, d *data, path, commonPath string) error {
 		return nil
 	}

-	file, err := os.Open(path)
+	file, err := d.user.Fs.Open(path)
 	if err != nil {
 		return err
 	}
@@ -201,7 +198,7 @@ func rawDirHandler(w http.ResponseWriter, r *http.Request, d *data, file *files.
 }

 func rawFileHandler(w http.ResponseWriter, r *http.Request, file *files.FileInfo) (int, error) {
-	fd, err := os.Open(file.Path)
+	fd, err := file.Fs.Open(file.Path)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
@@ -3,6 +3,7 @@ package http
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -11,6 +12,7 @@ import (
 	"strings"

 	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/spf13/afero"

 	"github.com/gtsteffaniak/filebrowser/errors"
 	"github.com/gtsteffaniak/filebrowser/files"
@@ -18,13 +20,9 @@ import (
 )

 var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
-	realPath, err := files.GetRealPath(d.user.Scope, r.URL.Path)
-	if err != nil {
-		fmt.Println("unable to get real path", d.user.Scope, r.URL.Path)
-		return http.StatusNotFound, err
-	}
 	file, err := files.FileInfoFaster(files.FileOptions{
-		Path:       realPath,
+		Fs:         d.user.Fs,
+		Path:       r.URL.Path,
 		Modify:     d.user.Perm.Modify,
 		Expand:     true,
 		ReadHeader: d.server.TypeDetectionByHeader,
@@ -55,18 +53,15 @@ func resourceDeleteHandler(fileCache FileCache) handleFunc {
 		if r.URL.Path == "/" || !d.user.Perm.Delete {
 			return http.StatusForbidden, nil
 		}
-		realPath, err := files.GetRealPath(d.user.Scope, r.URL.Path)
-		if err != nil {
-			return http.StatusNotFound, err
-		}
-		fileOpts := files.FileOptions{
-			Path:       realPath,
+
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         d.user.Fs,
+			Path:       r.URL.Path,
 			Modify:     d.user.Perm.Modify,
 			Expand:     false,
 			ReadHeader: d.server.TypeDetectionByHeader,
 			Checker:    d,
-		}
-		file, err := files.FileInfoFaster(fileOpts)
+		})
 		if err != nil {
 			return errToStatus(err), err
 		}
@@ -77,10 +72,14 @@ func resourceDeleteHandler(fileCache FileCache) handleFunc {
 			return errToStatus(err), err
 		}

-		err = files.DeleteFiles(realPath, fileOpts)
+		err = d.RunHook(func() error {
+			return d.user.Fs.RemoveAll(r.URL.Path)
+		}, "delete", r.URL.Path, "", d.user)
+
 		if err != nil {
 			return errToStatus(err), err
 		}
+
 		return http.StatusOK, nil
 	})
 }
@@ -90,27 +89,21 @@ func resourcePostHandler(fileCache FileCache) handleFunc {
 		if !d.user.Perm.Create || !d.Check(r.URL.Path) {
 			return http.StatusForbidden, nil
 		}
-		realPath, err := files.GetRealPath(d.user.Scope, r.URL.Path)
-		if err != nil {
-			return http.StatusNotFound, err
+
+		// Directories creation on POST.
+		if strings.HasSuffix(r.URL.Path, "/") {
+			err := d.user.Fs.MkdirAll(r.URL.Path, 0775) //nolint:gomnd
+			return errToStatus(err), err
 		}
-		fileOpts := files.FileOptions{
-			Path:       realPath,
+
+		file, err := files.FileInfoFaster(files.FileOptions{
+			Fs:         d.user.Fs,
+			Path:       r.URL.Path,
 			Modify:     d.user.Perm.Modify,
 			Expand:     false,
 			ReadHeader: d.server.TypeDetectionByHeader,
 			Checker:    d,
-		}
-		// Directories creation on POST.
-		if strings.HasSuffix(r.URL.Path, "/") {
-			err = files.WriteDirectory(fileOpts) // Assign to the existing `err` variable
-			if err != nil {
-				return errToStatus(err), err
-			}
-			return http.StatusOK, nil
-		}
-
-		file, err := files.FileInfoFaster(fileOpts)
+		})
 		if err == nil {
 			if r.URL.Query().Get("override") != "true" {
 				return http.StatusConflict, nil
@@ -126,7 +119,22 @@ func resourcePostHandler(fileCache FileCache) handleFunc {
 				return errToStatus(err), err
 			}
 		}
-		err = files.WriteFile(fileOpts, r.Body)
+
+		err = d.RunHook(func() error {
+			info, writeErr := writeFile(d.user.Fs, r.URL.Path, r.Body)
+			if writeErr != nil {
+				return writeErr
+			}
+
+			etag := fmt.Sprintf(`"%x%x"`, info.ModTime().UnixNano(), info.Size())
+			w.Header().Set("ETag", etag)
+			return nil
+		}, "upload", r.URL.Path, "", d.user)
+
+		if err != nil {
+			_ = d.user.Fs.RemoveAll(r.URL.Path)
+		}
+
 		return errToStatus(err), err
 	})
 }
@@ -141,22 +149,28 @@ var resourcePutHandler = withUser(func(w http.ResponseWriter, r *http.Request, d
 		return http.StatusMethodNotAllowed, nil
 	}

-	realPath, err := files.GetRealPath(d.user.Scope, r.URL.Path)
+	exists, err := afero.Exists(d.user.Fs, r.URL.Path)
 	if err != nil {
-		return http.StatusNotFound, err
+		return http.StatusInternalServerError, err
 	}
-	fileOpts := files.FileOptions{
-		Path:       realPath,
-		Modify:     d.user.Perm.Modify,
-		Expand:     false,
-		ReadHeader: d.server.TypeDetectionByHeader,
-		Checker:    d,
+	if !exists {
+		return http.StatusNotFound, nil
 	}
-	err = files.WriteFile(fileOpts, r.Body)
+
+	err = d.RunHook(func() error {
+		info, writeErr := writeFile(d.user.Fs, r.URL.Path, r.Body)
+		if writeErr != nil {
+			return writeErr
+		}
+
+		etag := fmt.Sprintf(`"%x%x"`, info.ModTime().UnixNano(), info.Size())
+		w.Header().Set("ETag", etag)
+		return nil
+	}, "save", r.URL.Path, "", d.user)
+
 	return errToStatus(err), err
 })

-// TODO fix and verify this function still works in tests
 func resourcePatchHandler(fileCache FileCache) handleFunc {
 	return withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 		src := r.URL.Path
@@ -172,22 +186,29 @@ func resourcePatchHandler(fileCache FileCache) handleFunc {
 		if dst == "/" || src == "/" {
 			return http.StatusForbidden, nil
 		}
+
+		err = checkParent(src, dst)
+		if err != nil {
+			return http.StatusBadRequest, err
+		}
+
 		override := r.URL.Query().Get("override") == "true"
 		rename := r.URL.Query().Get("rename") == "true"
 		if !override && !rename {
-			if _, err = os.Stat(dst); err == nil {
+			if _, err = d.user.Fs.Stat(dst); err == nil {
 				return http.StatusConflict, nil
 			}
 		}
 		if rename {
-			dst = addVersionSuffix(dst)
+			dst = addVersionSuffix(dst, d.user.Fs)
 		}
+
 		// Permission for overwriting the file
 		if override && !d.user.Perm.Modify {
 			return http.StatusForbidden, nil
 		}
+
 		err = d.RunHook(func() error {
-			fmt.Println("hook", src, dst)
 			return patchAction(r.Context(), action, src, dst, d, fileCache)
 		}, action, src, dst, d.user)

@@ -195,22 +216,65 @@ func resourcePatchHandler(fileCache FileCache) handleFunc {
 	})
 }

-func addVersionSuffix(source string) string {
+func checkParent(src, dst string) error {
+	rel, err := filepath.Rel(src, dst)
+	if err != nil {
+		return err
+	}
+
+	rel = filepath.ToSlash(rel)
+	if !strings.HasPrefix(rel, "../") && rel != ".." && rel != "." {
+		return errors.ErrSourceIsParent
+	}
+
+	return nil
+}
+
+func addVersionSuffix(source string, fs afero.Fs) string {
 	counter := 1
 	dir, name := path.Split(source)
 	ext := filepath.Ext(name)
 	base := strings.TrimSuffix(name, ext)
+
 	for {
-		if _, err := os.Stat(source); err != nil {
+		if _, err := fs.Stat(source); err != nil {
 			break
 		}
 		renamed := fmt.Sprintf("%s(%d)%s", base, counter, ext)
 		source = path.Join(dir, renamed)
 		counter++
 	}
+
 	return source
 }

+func writeFile(fs afero.Fs, dst string, in io.Reader) (os.FileInfo, error) {
+	dir, _ := path.Split(dst)
+	err := fs.MkdirAll(dir, 0775) //nolint:gomnd
+	if err != nil {
+		return nil, err
+	}
+
+	file, err := fs.OpenFile(dst, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0775) //nolint:gomnd
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+
+	_, err = io.Copy(file, in)
+	if err != nil {
+		return nil, err
+	}
+
+	// Gets the info about the file.
+	info, err := file.Stat()
+	if err != nil {
+		return nil, err
+	}
+
+	return info, nil
+}
+
 func delThumbs(ctx context.Context, fileCache FileCache, file *files.FileInfo) error {
 	for _, previewSizeName := range PreviewSizeNames() {
 		size, _ := ParsePreviewSize(previewSizeName)
@@ -230,23 +294,17 @@ func patchAction(ctx context.Context, action, src, dst string, d *data, fileCach
 			return errors.ErrPermissionDenied
 		}

-		return fileutils.Copy(src, dst)
+		return fileutils.Copy(d.user.Fs, src, dst)
 	case "rename":
 		if !d.user.Perm.Rename {
 			return errors.ErrPermissionDenied
 		}
 		src = path.Clean("/" + src)
 		dst = path.Clean("/" + dst)
-		realDest, err := files.GetRealPath(d.user.Scope, dst)
-		if err != nil {
-			return err
-		}
-		realSrc, err := files.GetRealPath(d.user.Scope, src)
-		if err != nil {
-			return err
-		}
+
 		file, err := files.FileInfoFaster(files.FileOptions{
-			Path:       realSrc,
+			Fs:         d.user.Fs,
+			Path:       src,
 			Modify:     d.user.Perm.Modify,
 			Expand:     false,
 			ReadHeader: false,
@@ -262,7 +320,7 @@ func patchAction(ctx context.Context, action, src, dst string, d *data, fileCach
 			return err
 		}

-		return fileutils.MoveFile(realSrc, realDest)
+		return fileutils.MoveFile(d.user.Fs, src, dst)
 	default:
 		return fmt.Errorf("unsupported action %s: %w", action, errors.ErrInvalidRequestParams)
 	}
@@ -274,12 +332,9 @@ type DiskUsageResponse struct {
 }

 var diskUsage = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
-	realPath, err := files.GetRealPath(d.user.Scope, r.URL.Path)
-	if err != nil {
-		return http.StatusNotFound, err
-	}
 	file, err := files.FileInfoFaster(files.FileOptions{
-		Path:       realPath,
+		Fs:         d.user.Fs,
+		Path:       r.URL.Path,
 		Modify:     d.user.Perm.Modify,
 		Expand:     false,
 		ReadHeader: false,
@@ -295,6 +350,7 @@ var diskUsage = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (
 			Used:  0,
 		})
 	}
+
 	usage, err := disk.UsageWithContext(r.Context(), fPath)
 	if err != nil {
 		return errToStatus(err), err
@@ -15,17 +15,20 @@ type settingsData struct {
 	Defaults         settings.UserDefaults `json:"defaults"`
 	Rules            []rules.Rule          `json:"rules"`
 	Frontend         settings.Frontend     `json:"frontend"`
+	Shell            []string              `json:"shell"`
 	Commands         map[string][]string   `json:"commands"`
 }

 var settingsGetHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
 	data := &settingsData{
-		Signup:           d.settings.Auth.Signup,
-		CreateUserDir:    d.settings.Server.CreateUserDir,
-		UserHomeBasePath: d.settings.Server.UserHomeBasePath,
+		Signup:           settings.Config.Auth.Signup,
+		CreateUserDir:    settings.Config.Server.CreateUserDir,
+		UserHomeBasePath: settings.Config.Server.UserHomeBasePath,
 		Defaults:         d.settings.UserDefaults,
 		Rules:            d.settings.Rules,
 		Frontend:         d.settings.Frontend,
+		Shell:            d.settings.Shell,
+		Commands:         d.settings.Commands,
 	}

 	return renderJSON(w, r, data)
@@ -43,7 +46,8 @@ var settingsPutHandler = withAdmin(func(w http.ResponseWriter, r *http.Request,
 	d.settings.UserDefaults = req.Defaults
 	d.settings.Rules = req.Rules
 	d.settings.Frontend = req.Frontend
-	d.settings.Auth.Signup = req.Signup
+	d.settings.Shell = req.Shell
+	d.settings.Commands = req.Commands
 	err = d.store.Settings.Save(d.settings)
 	return errToStatus(err), err
 })
@@ -34,7 +34,6 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys
 		"Color":                 d.settings.Frontend.Color,
 		"BaseURL":               d.server.BaseURL,
 		"Version":               version.Version,
-		"CommitSHA":             version.CommitSHA,
 		"StaticURL":             path.Join(d.server.BaseURL, "/static"),
 		"Signup":                settings.Config.Auth.Signup,
 		"NoAuth":                d.settings.Auth.Method == "noauth",
@@ -66,10 +65,7 @@ func handleWithStaticData(w http.ResponseWriter, _ *http.Request, d *data, fSys
 			return http.StatusInternalServerError, err
 		}

-		auther, ok := raw.(*auth.JSONAuth)
-		if !ok {
-			return http.StatusInternalServerError, fmt.Errorf("failed to assert type *auth.JSONAuth")
-		}
+		auther := raw.(*auth.JSONAuth)

 		if auther.ReCaptcha != nil {
 			data["ReCaptcha"] = auther.ReCaptcha.Key != "" && auther.ReCaptcha.Secret != ""
@@ -108,7 +104,7 @@ func getStaticHandlers(store *storage.Storage, server *settings.Server, assetsFs
 		}

 		w.Header().Set("x-xss-protection", "1; mode=block")
-		return handleWithStaticData(w, r, d, assetsFs, "public/index.html", "text/html; charset=utf-8")
+		return handleWithStaticData(w, r, d, assetsFs, "index.html", "text/html; charset=utf-8")
 	}, "", store, server)

 	static = handle(func(w http.ResponseWriter, r *http.Request, d *data) (int, error) {
@@ -2,10 +2,8 @@ package http

 import (
 	"encoding/json"
-	"fmt"
 	"log"
 	"net/http"
-	"reflect"
 	"sort"
 	"strconv"

@@ -14,7 +12,6 @@ import (
 	"golang.org/x/text/language"

 	"github.com/gtsteffaniak/filebrowser/errors"
-	"github.com/gtsteffaniak/filebrowser/files"
 	"github.com/gtsteffaniak/filebrowser/users"
 )

@@ -138,11 +135,7 @@ var userPostHandler = withAdmin(func(w http.ResponseWriter, r *http.Request, d *
 	}
 	req.Data.Scope = userHome
 	log.Printf("user: %s, home dir: [%s].", req.Data.Username, userHome)
-	_, err = files.GetRealPath(d.server.Root, req.Data.Scope)
-	if err != nil {
-		fmt.Println("user path is not valid", req.Data.Scope)
-		return http.StatusBadRequest, nil
-	}
+
 	err = d.store.Users.Save(req.Data)
 	if err != nil {
 		return http.StatusInternalServerError, err
@@ -161,29 +154,31 @@ var userPutHandler = withSelfOrAdmin(func(w http.ResponseWriter, r *http.Request
 	if req.Data.ID != d.raw.(uint) {
 		return http.StatusBadRequest, nil
 	}
-	_, err = files.GetRealPath(d.server.Root, req.Data.Scope)
-	if err != nil {
-		return http.StatusBadRequest, nil
-	}

-	if len(req.Which) == 0 || req.Which[0] == "all" {
+	if len(req.Which) == 0 || (len(req.Which) == 1 && req.Which[0] == "all") {
+		if !d.user.Perm.Admin {
+			return http.StatusForbidden, nil
+		}
+
+		if req.Data.Password != "" {
+			req.Data.Password, err = users.HashPwd(req.Data.Password)
+		} else {
+			var suser *users.User
+			suser, err = d.store.Users.Get(d.server.Root, d.raw.(uint))
+			req.Data.Password = suser.Password
+		}
+
+		if err != nil {
+			return http.StatusInternalServerError, err
+		}
+
 		req.Which = []string{}
-		v := reflect.ValueOf(req.Data)
-		if v.Kind() == reflect.Ptr {
-			v = v.Elem()
-		}
-		t := v.Type()
-		for i := 0; i < t.NumField(); i++ {
-			field := t.Field(i)
-			if field.Name != "Password" && field.Name != "Fs" {
-				req.Which = append(req.Which, field.Name)
-			}
-		}
 	}

 	for k, v := range req.Which {
 		v = cases.Title(language.English, cases.NoLower).String(v)
 		req.Which[k] = v
+
 		if v == "Password" {
 			if !d.user.Perm.Admin && d.user.LockPassword {
 				return http.StatusForbidden, nil
@@ -200,6 +195,7 @@ var userPutHandler = withSelfOrAdmin(func(w http.ResponseWriter, r *http.Request
 			}
 		}
 	}
+
 	err = d.store.Users.Update(req.Data, req.Which...)
 	if err != nil {
 		return http.StatusInternalServerError, err
@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"strings"

-	"github.com/gtsteffaniak/filebrowser/files"
 	"github.com/gtsteffaniak/filebrowser/settings"
 	"github.com/gtsteffaniak/filebrowser/users"
 )
@@ -20,8 +19,8 @@ type Runner struct {

 // RunHook runs the hooks for the before and after event.
 func (r *Runner) RunHook(fn func() error, evt, path, dst string, user *users.User) error {
-	path, _ = files.GetRealPath(user.Scope, path)
-	dst, _ = files.GetRealPath(user.Scope, dst)
+	path = user.FullPath(path)
+	dst = user.FullPath(dst)

 	if r.Enabled {
 		if val, ok := r.Commands["before_"+evt]; ok {
@@ -58,7 +58,6 @@ func setDefaults() Settings {
 			Database:           "database.db",
 			Log:                "stdout",
 			Root:               "/srv",
-			Indexing:           true,
 		},
 		Auth: Auth{
 			TokenExpirationTime: "2h",
@@ -71,7 +70,6 @@ func setDefaults() Settings {
 			},
 		},
 		UserDefaults: UserDefaults{
-			StickySidebar:   true,
 			Scope:           ".",
 			LockPassword:    false,
 			HideDotfiles:    true,
@@ -93,7 +91,6 @@ func setDefaults() Settings {

 // Apply applies the default options to a user.
 func (d *UserDefaults) Apply(u *users.User) {
-	u.StickySidebar = d.StickySidebar
 	u.DisableSettings = d.DisableSettings
 	u.DarkMode = d.DarkMode
 	u.Scope = d.Scope
@@ -6,14 +6,16 @@ import (
 	"log"
 	"os"
 	"path"
-	"path/filepath"
 	"regexp"
 	"strings"
+
+	"github.com/spf13/afero"
 )

 var (
 	invalidFilenameChars = regexp.MustCompile(`[^0-9A-Za-z@_\-.]`)
-	dashes               = regexp.MustCompile(`[\-]+`)
+
+	dashes = regexp.MustCompile(`[\-]+`)
 )

 // MakeUserDir makes the user directory according to settings.
@@ -30,8 +32,8 @@ func (s *Settings) MakeUserDir(username, userScope, serverRoot string) (string,

 	userScope = path.Join("/", userScope)

-	fullPath := filepath.Join(serverRoot, userScope)
-	if err := os.MkdirAll(fullPath, os.ModePerm); err != nil {
+	fs := afero.NewBasePathFs(afero.NewOsFs(), serverRoot)
+	if err := fs.MkdirAll(userScope, os.ModePerm); err != nil {
 		return "", fmt.Errorf("failed to create user home dir: [%s]: %w", userScope, err)
 	}
 	return userScope, nil
@@ -65,6 +65,10 @@ func (s *Storage) Save(set *Settings) error {
 		set.Rules = []rules.Rule{}
 	}

+	if set.Shell == nil {
+		set.Shell = []string{}
+	}
+
 	if set.Commands == nil {
 		set.Commands = map[string][]string{}
 	}
@@ -54,7 +54,6 @@ type Server struct {
 	Root                  string `json:"root"`
 	UserHomeBasePath      string `json:"userHomeBasePath"`
 	CreateUserDir         bool   `json:"createUserDir"`
-	Indexing              bool   `json:"indexing"`
 }

 type Frontend struct {
@@ -68,14 +67,12 @@ type Frontend struct {
 // UserDefaults is a type that holds the default values
 // for some fields on User.
 type UserDefaults struct {
-	StickySidebar   bool         `json:"stickySidebar"`
 	DarkMode        bool         `json:"darkMode"`
 	LockPassword    bool         `json:"lockPassword"`
 	DisableSettings bool         `json:"disableSettings,omitempty"`
 	Scope           string       `json:"scope"`
 	Locale          string       `json:"locale"`
 	ViewMode        string       `json:"viewMode"`
-	GallerySize     int          `json:"gallerySize"`
 	SingleClick     bool         `json:"singleClick"`
 	Rules           []rules.Rule `json:"rules"`
 	Sorting         struct {
@@ -55,6 +55,7 @@ func (st usersBackend) Update(user *users.User, fields ...string) error {
 	if len(fields) == 0 {
 		return st.Save(user)
 	}
+
 	for _, field := range fields {
 		userField := reflect.ValueOf(user).Elem().FieldByName(field)
 		if !userField.IsValid() {
@@ -62,9 +63,10 @@ func (st usersBackend) Update(user *users.User, fields ...string) error {
 		}
 		val := userField.Interface()
 		if err := st.db.UpdateField(user, field, val); err != nil {
-			return fmt.Errorf("Error updating user field: %s, error: %v", field, err.Error())
+			return err
 		}
 	}
+
 	return nil
 }

@@ -54,6 +54,9 @@ func (s *Storage) Get(baseScope string, id interface{}) (user *User, err error)
 	if err != nil {
 		return
 	}
+	if err := user.Clean(baseScope); err != nil {
+		return nil, err
+	}
 	return user, err
 }

@@ -63,12 +66,23 @@ func (s *Storage) Gets(baseScope string) ([]*User, error) {
 	if err != nil {
 		return nil, err
 	}
+	for _, user := range users {
+		if err := user.Clean(baseScope); err != nil { //nolint:govet
+			return nil, err
+		}
+	}
+
 	return users, err
 }

 // Update updates a user in the database.
 func (s *Storage) Update(user *User, fields ...string) error {
-	err := s.back.Update(user, fields...)
+	err := user.Clean("")
+	if err != nil {
+		return err
+	}
+
+	err = s.back.Update(user, fields...)
 	if err != nil {
 		return err
 	}
@@ -124,6 +138,10 @@ func (s *Storage) DeleteRule(userID string, ruleID string) error {
 // Save saves the user in a storage.
 func (s *Storage) Save(user *User) error {
 	log.Println("Saving new user:", user.Username)
+	if err := user.Clean(""); err != nil {
+		return err
+	}
+
 	return s.back.Save(user)
 }

@@ -1,8 +1,11 @@
 package users

 import (
+	"path/filepath"
 	"regexp"

+	"github.com/spf13/afero"
+
 	"github.com/gtsteffaniak/filebrowser/rules"
 )

@@ -25,7 +28,6 @@ type Sorting struct {

 // User describes a user.
 type User struct {
-	StickySidebar   bool         `json:"stickySidebar"`
 	DarkMode        bool         `json:"darkMode"`
 	DisableSettings bool         `json:"disableSettings"`
 	ID              uint         `storm:"id,increment" json:"id"`
@@ -39,10 +41,10 @@ type User struct {
 	Perm            Permissions  `json:"perm"`
 	Commands        []string     `json:"commands"`
 	Sorting         Sorting      `json:"sorting"`
+	Fs              afero.Fs     `json:"-" yaml:"-"`
 	Rules           []rules.Rule `json:"rules"`
 	HideDotfiles    bool         `json:"hideDotfiles"`
 	DateFormat      bool         `json:"dateFormat"`
-	GallerySize     int          `json:"gallerySize"`
 }

 var PublicUser = User{
@@ -51,6 +53,7 @@ var PublicUser = User{
 	Scope:        "./",
 	ViewMode:     "normal",
 	LockPassword: true,
+	Fs:           afero.NewMemMapFs(),
 	Perm: Permissions{
 		Create:   false,
 		Rename:   false,
@@ -67,6 +70,26 @@ func (u *User) GetRules() []rules.Rule {
 	return u.Rules
 }

+// Clean cleans up a user and verifies if all its fields
+// are alright to be saved.
+//
+//nolint:gocyclo
+func (u *User) Clean(baseScope string) error {
+
+	if u.Fs == nil {
+		scope := u.Scope
+		scope = filepath.Join(baseScope, filepath.Join("/", scope)) //nolint:gocritic
+		u.Fs = afero.NewBasePathFs(afero.NewOsFs(), scope)
+	}
+
+	return nil
+}
+
+// FullPath gets the full path for a user's relative path.
+func (u *User) FullPath(path string) string {
+	return afero.FullBaseFsPath(u.Fs.(*afero.BasePathFs), path)
+}
+
 // CanExecute checks if an user can execute a specific command.
 func (u *User) CanExecute(command string) bool {
 	if !u.Perm.Execute {
@@ -1,7 +1,8 @@
 package version

 var (
-	// Dynamically updated during build via build args
-	Version   = "untracked"
-	CommitSHA = "untracked"
+	// Version is the current File Browser version.
+	Version = "(0.2.4)"
+	// CommitSHA is the commmit sha.
+	CommitSHA = "(unknown)"
 )
@@ -11,7 +11,6 @@ server:
  CreateUserDir: false
  UserHomeBasePath: ""
  indexingInterval: 5
-  indexing: true
  numImageProcessors: 4
  socket: ""
  tlsKey: ""
@@ -35,7 +34,9 @@ auth:
  tokenExpirationTime: 2h
  header: ""
  method: json
+  command: ""
  signup: false
+  shell: ""
 frontend:
  name: ""
  disableExternal: false
@@ -61,6 +62,7 @@ userDefaults:
    delete: true
    share: true
    download: true
+  commands: []
  hideDotfiles: false
  dateFormat: false
 ```
@@ -111,8 +113,6 @@ userDefaults:

 - `indexingInterval`: This is the time in minutes the system waits before checking for filesystem changes. Default: `5`

- `indexing`: This enables or disables indexing. (Note: search will not work without indexing) Default: `true`
-
 - `numImageProcessors`: This is the number of image processors available. Default: `4`

 - `socket`: This is the socket configuration.
@@ -162,6 +162,10 @@ userDefaults:
  - `oath` - oath authentication
  - `noauth` - no authentication/login required.

+- `command`: Deprecated: This is the authentication command.
+
+- `shell`: This is the shell configuration.
+
 - `Signup`: This boolean value indicates whether user signup is enabled on the login page. NOTE: Be mindful of `userDefaults` settings if enabled. Default: `false`

 - `AdminUsername`: This is the username of the admin user. Default: `admin`
@@ -220,6 +224,7 @@ userDefaults:

  - `download`: This boolean value determines whether download permissions are granted.

+- `commands`: Deprecated: This is a list of commands.

 - `hideDotfiles`: This boolean value determines whether dotfiles are hidden. (`true` or `false`)

@@ -1,26 +0,0 @@
-{
-  "root": true,
-  "env": {
-    "node": true
-  },
-  "extends": [
-    "plugin:vue/vue3-essential",
-    "eslint:recommended",
-    "@vue/eslint-config-typescript"
-  ],
-  "rules": {
-    "vue/multi-word-component-names": "off",
-    "vue/no-mutating-props": [
-      "error",
-      {
-        "shallowOnly": true
-      }
-    ]
-    // no-undef is already included in
-    // @vue/eslint-config-typescript
-  },
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  }
-}
@@ -0,0 +1,16 @@
+env:
+  browser: true
+  es2021: true
+extends:
+  - eslint:recommended
+  - plugin:vue/vue3-essential
+parserOptions:
+  ecmaVersion: latest
+  sourceType: module
+plugins:
+  - vue
+rules:
+  vue/multi-word-component-names: off
+  vue/no-reserved-component-names: warn
+  vue/no-mutating-props: off
+  vue/no-deprecated-v-bind-sync: warn
@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ["@vue/app"],
+};
@@ -1 +0,0 @@
-frontend
@@ -0,0 +1,47 @@
+{
+  "name": "filebrowser-frontend",
+  "version": "2.0.0",
+  "private": true,
+  "scripts": {
+    // vue 3 changes needed
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "fix": "npx vue-cli-service lint",
+    "watch": "vue-cli-service build --watch",
+    "lint": "eslint --ext .vue,.js src/",
+    "lint:fix": "eslint --ext .vue,.js --fix src/",
+    "format": "prettier --write ."
+  },
+  "dependencies": {
+    "ace-builds": "^1.24.2",
+    "clipboard": "^2.0.4",
+    "css-vars-ponyfill": "^2.4.3",
+    "file-loader": "^6.2.0", // UNNECESSARY IN VITE
+    X"js-base64": "^2.5.1", // REPLACE WITH EQUIVALENT JS
+    "lodash.clonedeep": "^4.5.0", // TOO OLD - REPLACE WITH JS
+    "lodash.throttle": "^4.1.1", // TOO OLD - REPLACE WITH JS
+    "material-icons": "^1.10.5",
+    "moment": "^2.29.4", // REPLACE WITH EQUIVALENT JS
+    "normalize.css": "^8.0.1", // REPLACE WITH EQUIVALENT JS
+    "noty": "^3.2.0-beta", // REPLACE WITH EQUIVALENT JS
+    X"pretty-bytes": "^6.0.0", // REPLACE WITH EQUIVALENT JS
+    "qrcode.vue": "^1.7.0", // UPDATE TO LATEST for VUE3
+    "utif": "^3.1.0", // SPIKE investigate replacement
+    "vue": "^2.6.10", // UPDATE to vue 3
+    "vue-async-computed": "^3.9.0", // REPLACE WITH EQUIVALENT JS
+    "vue-i18n": "^8.15.3", // REMOVE
+    "vue-lazyload": "^1.3.3", // REMOVE
+    "vue-router": "^3.1.3", // UPDATE to vue 3 @vue4 https://www.npmjs.com/package/vue-router
+    "vue-simple-progress": "^1.1.1", // REPLACE WITH EQUIVALENT JS
+    "vuex": "^3.1.2", // SPIKE: HOW TO REMOVE
+    "vuex-router-sync": "^5.0.0", // SPIKE: HOW TO REMOVE
+    X"whatwg-fetch": "^3.6.2"
+  },
+  "devDependencies": {
+    "@vue/cli-service": "^5.0.8", // REMOVE for VUE3
+    "compression-webpack-plugin": "^10.0.0", // REPLACE VUE3
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "vue-template-compiler": "^2.6.10" // REPLACE VUE3
+  }
+}
@@ -1,22 +1,15 @@
 {
  "name": "filebrowser-frontend",
-  "version": "3.0.0",
+  "version": "2.0.0",
  "private": true,
-  "type": "module",
-  "engines": {
-    "npm": ">=7.0.0",
-    "node": ">=18.0.0"
-  },
  "scripts": {
-    "dev": "vite dev",
-    "build": "vite build && cp -R dist/ ../backend/cmd/",
-    "build-docker": "vite build",
-    "watch": "vite build --watch",
-    "typecheck": "vue-tsc -p ./tsconfig.json --noEmit",
-    "lint": "npm run typecheck && eslint src/",
-    "lint:fix": "eslint --fix src/",
-    "format": "prettier --write .",
-    "test": "npx playwright test"
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "fix": "npx vue-cli-service lint",
+    "watch": "vue-cli-service build --watch",
+    "lint": "eslint --ext .vue,.js src/",
+    "lint:fix": "eslint --ext .vue,.js --fix src/",
+    "format": "prettier --write ."
  },
  "dependencies": {
    "ace-builds": "^1.24.2",
@@ -24,23 +17,25 @@
    "css-vars-ponyfill": "^2.4.3",
    "file-loader": "^6.2.0",
    "material-icons": "^1.10.5",
+    "moment": "^2.29.4",
    "normalize.css": "^8.0.1",
-    "qrcode.vue": "^3.4.1",
-    "vue": "^3.4.21",
-    "vue-i18n": "^9.10.2",
-    "vue-lazyload": "^3.0.0",
-    "vue-router": "^4.3.0"
+    "noty": "^3.2.0-beta",
+    "qrcode.vue": "^1.7.0",
+    "utif": "^3.1.0",
+    "vue": "^2.6.10",
+    "vue-async-computed": "^3.9.0",
+    "vue-i18n": "^8.15.3",
+    "vue-lazyload": "^1.3.3",
+    "vue-router": "^3.1.3",
+    "vue-simple-progress": "^1.1.1",
+    "vuex": "^3.1.2",
+    "vuex-router-sync": "^5.0.0"
  },
  "devDependencies": {
-    "@playwright/test": "^1.42.1",
-    "@intlify/unplugin-vue-i18n": "^4.0.0",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "@vue/eslint-config-typescript": "^13.0.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.24.0",
-    "vite": "^5.2.7",
-    "vite-plugin-compression2": "^1.0.0",
-    "vue-tsc": "^2.0.7"
+    "@vue/cli-service": "^5.0.8",
+    "compression-webpack-plugin": "^10.0.0",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "vue-template-compiler": "^2.6.10"
  }
 }
@@ -1,43 +0,0 @@
-import { defineConfig, devices } from "@playwright/test";
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: "./tests",
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: "line",
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: "http://127.0.0.1",
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: "on-first-retry",
-
-    /* Set default locale to English (US) */
-    locale: "en-US",
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: "firefox",
-      use: { ...devices["Desktop Firefox"] },
-    },
-  ],
-});
@@ -6,7 +6,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">

  [{[ if .ReCaptcha -]}]
-    <script src="[{[ .ReCaptchaHost ]}]/recaptcha/api.js?render=explicit" data-vite-ignore></script>
+    <script src="[{[ .ReCaptchaHost ]}]/recaptcha/api.js?render=explicit"></script>
  [{[ end ]}]

  <title>[{[ if .Name -]}][{[ .Name ]}][{[ else ]}]File Browser[{[ end ]}]</title>
@@ -121,7 +121,7 @@
  <div id="app"></div>

  [{[ if .darkMode -]}]
-  <div id="loading" class="dark-mode">
+  <div id="loading dark-mode">
    <div class="spinner">
      <div class="bounce1"></div>
      <div class="bounce2"></div>
@@ -136,8 +136,6 @@
      <div class="bounce3"></div>
    </div>
  </div>  [{[ end ]}]
-  <script type="module" src="/src/main.ts"></script>
-
  [{[ if .CSS -]}]
    <link rel="stylesheet" href="[{[ .StaticURL ]}]/custom.css" />
  [{[ end ]}]
@@ -1,25 +1,15 @@
 <template>
-  <router-view></router-view>
+    <router-view></router-view>
 </template>

 <script>
-import { onMounted } from "vue";
-import { mutations } from "@/store"; // Import your store's mutations
-mutations.setLoading("main-app", true);
+
+// eslint-disable-next-line no-undef
+__webpack_public_path__ = window.FileBrowser.StaticURL + "/";
+
 export default {
  name: "app",
  computed: {},
-  setup() {
-    onMounted(() => {
-      console.log("static vars", window.FileBrowser);
-      mutations.setLoading("main-app", false);
-      // Query the loading element and remove it from the DOM
-      const loadingDiv = document.getElementById("loading");
-      if (loadingDiv) {
-        loadingDiv.remove();
-      }
-    });
-  },
 };
 </script>

@@ -1,13 +1,13 @@
 import { removePrefix } from "./utils";
 import { baseURL } from "@/utils/constants";
-import { state } from "@/store";
+import store from "@/store";

 const ssl = window.location.protocol === "https:";
 const protocol = ssl ? "wss:" : "ws:";

 export default function command(url, command, onmessage, onclose) {
  url = removePrefix(url);
-  url = `${protocol}//${window.location.host}${baseURL}/api/command${url}?auth=${state.jwt}`;
+  url = `${protocol}//${window.location.host}${baseURL}/api/command${url}?auth=${store.state.jwt}`;

  let conn = new window.WebSocket(url);
  conn.onopen = () => conn.send(command);
@@ -1,6 +1,6 @@
 import { createURL, fetchURL, removePrefix } from "./utils";
 import { baseURL } from "@/utils/constants";
-import { state } from "@/store";
+import store from "@/store";

 export async function fetch(url,content=false) {
  url = removePrefix(url);
@@ -70,8 +70,8 @@ export function download(format, ...files) {
    url += `algo=${format}&`;
  }

-  if (state.jwt) {
-    url += `auth=${state.jwt}&`;
+  if (store.state.jwt) {
+    url += `auth=${store.state.jwt}&`;
  }

  window.open(url);
@@ -95,7 +95,7 @@ export async function post(url, content = "", overwrite = false, onupload) {
      `${baseURL}/api/resources${url}?override=${overwrite}`,
      true
    );
-    request.setRequestHeader("X-Auth", state.jwt);
+    request.setRequestHeader("X-Auth", store.state.jwt);

    if (typeof onupload === "function") {
      request.upload.onprogress = onupload;
@@ -15,6 +15,11 @@ export default async function search(base, query) {

  data = data.map((item) => {
    item.url = `/files${base}` + url.encodePath(item.path);
+
+    if (item.dir) {
+      item.url += "/";
+    }
+
    return item;
  });

@@ -18,7 +18,6 @@ export async function remove(hash) {
 export async function create(url, password = "", expires = "", unit = "hours") {
  url = removePrefix(url);
  url = `/api/share${url}`;
-  expires = String(expires);
  if (expires !== "") {
    url += `?expires=${expires}&unit=${unit}`;
  }
@@ -1,6 +1,6 @@
-import { fetchURL, fetchJSON } from "@/api/utils";
+import { fetchURL, fetchJSON } from "./utils";

-export async function getAllUsers() {
+export async function getAll() {
  return await fetchJSON(`/api/users`, {});
 }

@@ -24,12 +24,6 @@ export async function create(user) {
 }

 export async function update(user, which = ["all"]) {
-  if (which[0] != "password") {
-    user.password = "";
-  }
-  if (user.username == "publicUser") {
-    return
-  }
  await fetchURL(`/api/users/${user.id}`, {
    method: "PUT",
    body: JSON.stringify({
@@ -1,8 +1,7 @@
-import { state } from "@/store";
+import store from "@/store";
 import { renew, logout } from "@/utils/auth";
 import { baseURL } from "@/utils/constants";
 import { encodePath } from "@/utils/url";
-import { showError } from "@/notify";

 export async function fetchURL(url, opts, auth = true) {
  opts = opts || {};
@@ -14,22 +13,21 @@ export async function fetchURL(url, opts, auth = true) {
  try {
    res = await fetch(`${baseURL}${url}`, {
      headers: {
-        "X-Auth": state.jwt,
-        "sessionId": state.sessionId,
-        "userScope": state.user.scope,
+        "X-Auth": store.state.jwt,
+        "sessionId": store.state.sessionId,
+        "userScope": store.state.user.scope,
        ...headers,
      },
      ...rest,
    });
-  } catch (e) {
-    console.error(e)
+  } catch {
    const error = new Error("000 No connection");
    error.status = res.status;
    throw error;
  }

  if (auth && res.headers.get("X-Renew-Token") === "true") {
-    await renew(state.jwt);
+    await renew(store.state.jwt);
  }

  if (res.status < 200 || res.status > 299) {
@@ -48,16 +46,17 @@ export async function fetchURL(url, opts, auth = true) {

 export async function fetchJSON(url, opts) {
  const res = await fetchURL(url, opts);
+
  if (res.status === 200) {
    return res.json();
  } else {
-    showError("unable to fetch : " + url + "status" + res.status);
    throw new Error(res.status);
  }
 }

 export function removePrefix(url) {
  url = url.split("/").splice(2).join("/");
+
  if (url === "") url = "/";
  if (url[0] !== "/") url = "/" + url;
  return url;
@@ -71,7 +70,7 @@ export function createURL(endpoint, params = {}, auth = true) {
  const url = new URL(prefix + encodePath(endpoint), origin);

  const searchParams = {
-    ...(auth && { auth: state.jwt }),
+    ...(auth && { auth: store.state.jwt }),
    ...params,
  };

@@ -14,48 +14,24 @@
      <component :is="element" :to="link.url">{{ link.name }}</component>
    </span>
    <action style="display: contents" v-if="showShare" icon="share" show="share" />
-    <div v-if="isResizableView">
-      Size:
-      <input
-        v-model="gallerySize"
-        type="range"
-        id="gallary-size"
-        name="gallary-size"
-        :value="gallerySize"
-        min="0"
-        max="10"
-      />
-    </div>
  </div>
 </template>

 <script>
-import { state, mutations, getters } from "@/store"; // Import mutations as well
-import Action from "@/components/header/Action.vue";
+import { mapState } from "vuex";
+import Action from "@/components/header/Action";

 export default {
  name: "breadcrumbs",
  components: {
    Action,
  },
-  data() {
-    return {
-      gallerySize: state.user.gallerySize,
-    };
-  },
-  watch: {
-    gallerySize(newValue) {
-      this.gallerySize = parseInt(newValue, 0); // Update the user object
-      mutations.setGallerySize(this.gallerySize);
-    },
-  },
  props: ["base", "noLink"],
  computed: {
-    isResizableView() {
-      return getters.isResizableView();
-    },
+    ...mapState(["req", "user"]),
    items() {
-      const relativePath = state.route.path.replace(this.base, "");
+
+      const relativePath = this.$route.path.replace(this.base, "");
      let parts = relativePath.split("/");

      if (parts[0] === "") {
@@ -100,18 +76,13 @@ export default {
      return "router-link";
    },
    showShare() {
-      // Ensure user properties are accessed safely
-      if (state.route.path.startsWith("/share")) {
-        return false;
+      if (this.$route.path.startsWith("/share")) {
+        return;
      }
-      return state.user?.perm && state.user?.perm.share; // Access from state directly
-    },
-  },
-  methods: {
-    // Example of a method using mutations
-    updateUserPermissions(newPerms) {
-      mutations.updateUser({ perm: newPerms });
+      return this.user.perm.share;
    },
  },
 };
 </script>
+
+<style></style>
@@ -1,18 +1,14 @@
 <template>
  <div class="button-group">
-    <button v-if="isDisabled" disabled>
-      No options for folders
+    <button
+      v-for="(btn, index) in buttons"
+      :key="index"
+      :disabled="isDisabled"
+      :class="{ active: activeButton === index && !isDisabled }"
+      @click="setActiveButton(index, btn.label)"
+    >
+      {{ btn.label }}
    </button>
-    <template v-else>
-      <button
-        v-for="(btn, index) in buttons"
-        :key="index"
-        :class="{ active: activeButton === index }"
-        @click="setActiveButton(index, btn.label)"
-      >
-        {{ btn.label }}
-      </button>
-    </template>
  </div>
 </template>

@@ -40,12 +36,15 @@ export default {
  methods: {
    setActiveButton(index, label) {
      if (label == "Only Folders" && this.activeButton != index) {
+        console.log("Only Folders && this.activeButton != index");
        this.$emit("disableAll");
      }
      if (label == "Only Folders" && this.activeButton == index) {
+        console.log("Only Folders && this.activeButton == index");
        this.$emit("enableAll");
      }
      if (label == "Only Files" && this.activeButton != index) {
+        console.log("Only Files && this.activeButton != index");
        this.$emit("enableAll");
      }
      // If the clicked button is already active, de-select it
@@ -107,10 +106,6 @@ button:hover {
  background: #e0e0e0;
 }

-button:disabled {
-  cursor: not-allowed !important;
-}
-
 button.active {
  background-color: var(--blue) !important;
  color: #ffffff;
@@ -1,168 +0,0 @@
-<template>
-  <div v-if="selectedCount > 0" id="file-selection" :class="{ 'dark-mode': isDarkMode }">
-    <span>{{ selectedCount }} selected</span>
-    <div>
-      <action
-        v-if="headerButtons.select"
-        icon="info"
-        :label="$t('buttons.info')"
-        show="info"
-      />
-      <action
-        v-if="headerButtons.select"
-        icon="check_circle"
-        :label="$t('buttons.selectMultiple')"
-        @action="toggleMultipleSelection"
-      />
-      <action
-        v-if="headerButtons.download"
-        icon="file_download"
-        :label="$t('buttons.download')"
-        @action="download"
-        :counter="selectedCount"
-      />
-      <action
-        v-if="headerButtons.share"
-        icon="share"
-        :label="$t('buttons.share')"
-        show="share"
-      />
-      <action
-        v-if="headerButtons.rename"
-        icon="mode_edit"
-        :label="$t('buttons.rename')"
-        show="rename"
-      />
-      <action
-        v-if="headerButtons.copy"
-        icon="content_copy"
-        :label="$t('buttons.copyFile')"
-        show="copy"
-      />
-      <action
-        v-if="headerButtons.move"
-        icon="forward"
-        :label="$t('buttons.moveFile')"
-        show="move"
-      />
-      <action
-        v-if="headerButtons.delete"
-        icon="delete"
-        :label="$t('buttons.delete')"
-        show="delete"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import { state, getters, mutations } from "@/store"; // Import your custom store
-import { files as api } from "@/api";
-import Action from "@/components/header/Action.vue";
-
-export default {
-  name: "fileSelection",
-  components: {
-    Action,
-  },
-  computed: {
-    isDarkMode() {
-      return getters.isDarkMode();
-    },
-    headerButtons() {
-      return {
-        select: state.selected.length > 0,
-        upload: state.user.perm?.create && state.selected.length > 0,
-        download: state.user.perm.download && state.selected.length > 0,
-        delete: state.selected.length > 0 && state.user.perm.delete,
-        rename: state.selected.length === 1 && state.user.perm.rename,
-        share: state.selected.length === 1 && state.user.perm.share,
-        move: state.selected.length > 0 && state.user.perm.rename,
-        copy: state.selected.length > 0 && state.user.perm?.create,
-      };
-    },
-    selectedCount() {
-      return getters.selectedCount();
-    },
-  },
-  methods: {
-    toggleMultipleSelection() {
-      mutations.setMultiple(!state.multiple);
-      mutations.closeHovers();
-    },
-    download() {
-      if (getters.isSingleFileSelected()) {
-        api.download(null, getters.selectedDownloadUrl());
-        return;
-      }
-      mutations.showHover({
-        name: "download",
-        confirm: (format) => {
-          mutations.closeHovers();
-          let files = [];
-          if (state.selected.length > 0) {
-            for (let i of state.selected) {
-              files.push(state.req.items[i].url);
-            }
-          } else {
-            files.push(state.route.path);
-          }
-          try {
-            api.download(format, ...files);
-            showSuccess("download started");
-          } catch (e) {
-            showError("error downloading", e);
-          }
-        },
-      });
-    },
-  },
-};
-</script>
-<style>
-@media (min-width: 800px) {
-  #file-selection {
-    bottom: 4em;
-  }
-}
-
-#file-selection .action {
-  border-radius: 50%;
-  width: auto;
-}
-
-#file-selection > span {
-  display: inline-block;
-  margin-left: 1em;
-  color: #6f6f6f;
-  margin-right: auto;
-}
-
-#file-selection .action span {
-  display: none;
-}
-
-/* File Selection */
-#file-selection {
-  box-shadow: rgba(0, 0, 0, 0.3) 0px 2em 50px 10px;
-  position: fixed;
-  bottom: 4em;
-  left: 50%;
-  transform: translateX(-50%);
-  align-items: center;
-  background: #fff;
-  max-width: 30em;
-  z-index: 3;
-  border-radius: 1em;
-  display: flex;
-  width: 90%;
-}
-/* File selection */
-#file-selection.dark-mode {
-  background: var(--surfaceSecondary) !important;
-}
-
-#file-selection.dark-mode span {
-  color: var(--textPrimary) !important;
-}
-</style>
@@ -1,232 +0,0 @@
-<!-- This component taken directly from vue-simple-progress
-since it didnt support Vue 3 but the component itself does
-https://raw.githubusercontent.com/dzwillia/vue-simple-progress/master/src/components/Progress.vue -->
-<template>
-  <div>
-    <div
-      class="vue-simple-progress-text"
-      :style="text_style"
-      v-if="text.length > 0 && textPosition == 'top'"
-    >
-      {{ text }}
-    </div>
-    <div class="vue-simple-progress" :style="progress_style">
-      <div
-        class="vue-simple-progress-text"
-        :style="text_style"
-        v-if="text.length > 0 && textPosition == 'middle'"
-      >
-        {{ text }}
-      </div>
-      <div
-        style="position: relative; left: -9999px"
-        :style="text_style"
-        v-if="text.length > 0 && textPosition == 'inside'"
-      >
-        {{ text }}
-      </div>
-      <div class="vue-simple-progress-bar" :style="bar_style">
-        <div :style="text_style" v-if="text.length > 0 && textPosition == 'inside'">
-          {{ text }}
-        </div>
-      </div>
-    </div>
-    <div
-      class="vue-simple-progress-text"
-      :style="text_style"
-      v-if="text.length > 0 && textPosition == 'bottom'"
-    >
-      {{ text }}
-    </div>
-  </div>
-</template>
-
-<script>
-// We're leaving this untouched as you can read in the beginning
-var isNumber = function (n) {
-  return !isNaN(parseFloat(n)) && isFinite(n);
-};
-
-export default {
-  name: "progress-bar",
-  props: {
-    val: {
-      default: 0,
-    },
-    max: {
-      default: 100,
-    },
-    size: {
-      // either a number (pixel width/height) or 'tiny', 'small',
-      // 'medium', 'large', 'huge', 'massive' for common sizes
-      default: 3,
-    },
-    "bg-color": {
-      type: String,
-      default: "#eee",
-    },
-    "bar-color": {
-      type: String,
-      default: "#2196f3", // match .blue color to Material Design's 'Blue 500' color
-    },
-    "bar-transition": {
-      type: String,
-      default: "all 0.5s ease",
-    },
-    "bar-border-radius": {
-      type: Number,
-      default: 0,
-    },
-    spacing: {
-      type: Number,
-      default: 4,
-    },
-    text: {
-      type: String,
-      default: "",
-    },
-    "text-align": {
-      type: String,
-      default: "center", // 'left', 'right'
-    },
-    "text-position": {
-      type: String,
-      default: "bottom", // 'bottom', 'top', 'middle', 'inside'
-    },
-    "font-size": {
-      type: Number,
-      default: 13,
-    },
-    "text-fg-color": {
-      type: String,
-      default: "#222",
-    },
-  },
-  computed: {
-    pct() {
-      var pct = (this.val / this.max) * 100;
-      pct = pct.toFixed(2);
-      return Math.min(pct, this.max);
-    },
-    size_px() {
-      switch (this.size) {
-        case "tiny":
-          return 2;
-        case "small":
-          return 4;
-        case "medium":
-          return 8;
-        case "large":
-          return 12;
-        case "big":
-          return 16;
-        case "huge":
-          return 32;
-        case "massive":
-          return 64;
-      }
-
-      return isNumber(this.size) ? this.size : 32;
-    },
-    text_padding() {
-      switch (this.size) {
-        case "tiny":
-        case "small":
-        case "medium":
-        case "large":
-        case "big":
-        case "huge":
-        case "massive":
-          return Math.min(Math.max(Math.ceil(this.size_px / 8), 3), 12);
-      }
-
-      return isNumber(this.spacing) ? this.spacing : 4;
-    },
-    text_font_size() {
-      switch (this.size) {
-        case "tiny":
-        case "small":
-        case "medium":
-        case "large":
-        case "big":
-        case "huge":
-        case "massive":
-          return Math.min(Math.max(Math.ceil(this.size_px * 1.4), 11), 32);
-      }
-
-      return isNumber(this.fontSize) ? this.fontSize : 13;
-    },
-    progress_style() {
-      var style = {
-        background: this.bgColor,
-      };
-
-      if (this.textPosition == "middle" || this.textPosition == "inside") {
-        style["position"] = "relative";
-        style["min-height"] = this.size_px + "px";
-        style["z-index"] = "-2";
-      }
-
-      if (this.barBorderRadius > 0) {
-        style["border-radius"] = this.barBorderRadius + "px";
-      }
-
-      return style;
-    },
-    bar_style() {
-      var style = {
-        background: this.barColor,
-        width: this.pct + "%",
-        height: this.size_px + "px",
-        transition: this.barTransition,
-      };
-
-      if (this.barBorderRadius > 0) {
-        style["border-radius"] = this.barBorderRadius + "px";
-      }
-
-      if (this.textPosition == "middle" || this.textPosition == "inside") {
-        style["position"] = "absolute";
-        style["top"] = "0";
-        style["height"] = "100%";
-        (style["min-height"] = this.size_px + "px"), (style["z-index"] = "-1");
-      }
-
-      return style;
-    },
-    text_style() {
-      var style = {
-        color: this.textFgColor,
-        "font-size": this.text_font_size + "px",
-        "text-align": this.textAlign,
-      };
-
-      if (
-        this.textPosition == "top" ||
-        this.textPosition == "middle" ||
-        this.textPosition == "inside"
-      )
-        style["padding-bottom"] = this.text_padding + "px";
-      if (
-        this.textPosition == "bottom" ||
-        this.textPosition == "middle" ||
-        this.textPosition == "inside"
-      )
-        style["padding-top"] = this.text_padding + "px";
-
-      return style;
-    },
-  },
-};
-</script>
-
-<style>
-.vue-simple-progress {
-  margin: 0.5em;
-}
-
-.vue-simple-progress,
-.vue-simple-progress-bar {
-  border-radius: 0.5em;
-}
-</style>
@@ -1,8 +1,10 @@
 <template>
-  <div id="search" :class="{ active, ongoing, 'dark-mode': isDarkMode }">
-    <!-- Search input section -->
-    <div id="input" @click="open">
-      <!-- Close button visible when search is active -->
+  <div
+    id="search"
+    @click="open"
+    v-bind:class="{ active, ongoing, 'dark-mode': isDarkMode }"
+  >
+    <div id="input">
      <button
        v-if="active"
        class="action"
@@ -12,9 +14,7 @@
      >
        <i class="material-icons">close</i>
      </button>
-      <!-- Search icon when search is not active -->
      <i v-else class="material-icons">search</i>
-      <!-- Input field for search -->
      <input
        class="main-input"
        type="text"
@@ -27,15 +27,17 @@
        :placeholder="$t('search.search')"
      />
    </div>
-
-    <!-- Search results for mobile -->
    <div v-if="isMobile && active" id="result" :class="{ hidden: !active }" ref="result">
      <div id="result-list">
        <div class="button" style="width: 100%">Search Context: {{ getContext }}</div>
-        <!-- List of search results -->
        <ul v-show="results.length > 0">
-          <li v-for="(s, k) in results" :key="k" style="cursor: pointer">
-            <router-link :to="s.url">
+          <li
+            v-for="(s, k) in results"
+            :key="k"
+            @click.stop.prevent="navigateTo(s.url)"
+            style="cursor: pointer"
+          >
+            <router-link to="#" event="">
              <i v-if="s.dir" class="material-icons folder-icons"> folder </i>
              <i v-else-if="s.audio" class="material-icons audio-icons"> volume_up </i>
              <i v-else-if="s.image" class="material-icons image-icons"> photo </i>
@@ -48,18 +50,15 @@
            </router-link>
          </li>
        </ul>
-        <!-- Loading icon when search is ongoing -->
        <p v-show="isEmpty && isRunning" id="renew">
          <i class="material-icons spin">autorenew</i>
        </p>
-        <!-- Message when no results are found -->
        <div v-show="isEmpty && !isRunning">
          <div class="searchPrompt" v-show="isEmpty && !isRunning">
            <p>{{ noneMessage }}</p>
          </div>
        </div>
-        <div v-if="isEmpty">
-          <!-- Reset filters button -->
+        <template v-if="isEmpty">
          <button
            class="mobile-boxes"
            v-if="value.length === 0 && !showBoxes"
@@ -67,8 +66,7 @@
          >
            Reset filters
          </button>
-          <!-- Box types when no search input is present -->
-          <div v-if="value.length === 0 && showBoxes">
+          <template v-if="value.length === 0 && showBoxes">
            <div class="boxes">
              <h3>{{ $t("search.types") }}</h3>
              <div>
@@ -86,18 +84,45 @@
                </div>
              </div>
            </div>
-          </div>
-        </div>
+          </template>
+        </template>
      </div>
    </div>
-
-    <!-- Search results for desktop -->
    <div v-show="!isMobile && active" id="result-desktop" ref="result">
      <div class="searchContext">Search Context: {{ getContext }}</div>
      <div id="result-list">
-        <div>
-          <div>
-            <!-- Button groups for filtering search results -->
+        <template>
+          <p v-show="isEmpty && isRunning" id="renew">
+            <i class="material-icons spin">autorenew</i>
+          </p>
+          <div class="searchPrompt" v-show="isEmpty && !isRunning">
+            <p>{{ noneMessage }}</p>
+            <div class="helpButton" @click="toggleHelp()">Help</div>
+          </div>
+          <div class="helpText" v-if="showHelp">
+            <p>
+              Search occurs on each character you type (3 character minimum for search
+              terms).
+            </p>
+            <p>
+              <b>The index:</b> Search utilizes the index which automatically gets updated
+              on the configured interval (default: 5 minutes). Searching when the program
+              has just started may result in incomplete results.
+            </p>
+            <p>
+              <b>Filter by type:</b> You can have multiple type filters by adding
+              <code>type:condition</code> followed by search terms.
+            </p>
+            <p>
+              <b>Multiple Search terms:</b> Additional terms separated by <code>|</code>,
+              for example <code>"test|not"</code> searches for both terms independently.
+            </p>
+            <p>
+              <b>File size:</b> Searching files by size may have significantly longer
+              search times.
+            </p>
+          </div>
+          <template>
            <ButtonGroup
              :buttons="folderSelect"
              @button-clicked="addToTypes"
@@ -111,8 +136,7 @@
              @remove-button-clicked="removeFromTypes"
              :isDisabled="isTypeSelectDisabled"
            />
-            <!-- Inputs for filtering by file size -->
-            <div v-if="!foldersOnly" class="sizeConstraints">
+            <div class="sizeConstraints">
              <div class="sizeInputWrapper">
                <p>Smaller Than:</p>
                <input
@@ -135,45 +159,16 @@
                <p>MB</p>
              </div>
            </div>
-          </div>
-        </div>
-        <!-- Loading icon when search is ongoing -->
-        <p v-show="isEmpty && isRunning" id="renew">
-          <i class="material-icons spin">autorenew</i>
-        </p>
-        <!-- Message when no results are found -->
-        <div class="searchPrompt" v-show="isEmpty && !isRunning">
-          <p>{{ noneMessage }}</p>
-          <div class="helpButton" @click="toggleHelp()">Help</div>
-        </div>
-        <!-- Help text section -->
-        <div class="helpText" v-if="showHelp">
-          <p>
-            Search occurs on each character you type (3 character minimum for search
-            terms).
-          </p>
-          <p>
-            <b>The index:</b> Search utilizes the index which automatically gets updated
-            on the configured interval (default: 5 minutes). Searching when the program
-            has just started may result in incomplete results.
-          </p>
-          <p>
-            <b>Filter by type:</b> You can have multiple type filters by adding
-            <code>type:condition</code> followed by search terms.
-          </p>
-          <p>
-            <b>Multiple Search terms:</b> Additional terms separated by <code>|</code>,
-            for example <code>"test|not"</code> searches for both terms independently.
-          </p>
-          <p>
-            <b>File size:</b> Searching files by size may have significantly longer search
-            times.
-          </p>
-        </div>
-        <!-- List of search results -->
+          </template>
+        </template>
        <ul v-show="results.length > 0">
-          <li v-for="(s, k) in results" :key="k" style="cursor: pointer">
-            <router-link :to="s.url">
+          <li
+            v-for="(s, k) in results"
+            :key="k"
+            @click.stop.prevent="navigateTo(s.url)"
+            style="cursor: pointer"
+          >
+            <router-link to="#" event="">
              <i v-if="s.dir" class="material-icons folder-icons"> folder </i>
              <i v-else-if="s.audio" class="material-icons audio-icons"> volume_up </i>
              <i v-else-if="s.image" class="material-icons image-icons"> photo </i>
@@ -190,226 +185,6 @@
    </div>
  </div>
 </template>
-<script>
-import ButtonGroup from "./ButtonGroup.vue";
-import { search } from "@/api";
-import { getters, mutations, state } from "@/store";
-import { showError } from "@/notify";
-
-var boxes = {
-  folder: { label: "folders", icon: "folder" },
-  file: { label: "files", icon: "insert_drive_file" },
-  archive: { label: "archives", icon: "archive" },
-  image: { label: "images", icon: "photo" },
-  audio: { label: "audio files", icon: "volume_up" },
-  video: { label: "videos", icon: "movie" },
-  doc: { label: "documents", icon: "picture_as_pdf" },
-};
-
-export default {
-  components: {
-    ButtonGroup,
-  },
-  name: "search",
-  data: function () {
-    return {
-      largerThan: "",
-      smallerThan: "",
-      noneMessage: "Start typing 3 or more characters to begin searching.",
-      searchTypes: "",
-      isTypeSelectDisabled: false,
-      showHelp: false,
-      folderSelect: [
-        { label: "Only Folders", value: "type:folder" },
-        { label: "Only Files", value: "type:file" },
-      ],
-      typeSelect: [
-        { label: "Photos", value: "type:image" },
-        { label: "Audio", value: "type:audio" },
-        { label: "Videos", value: "type:video" },
-        { label: "Documents", value: "type:doc" },
-        { label: "Archives", value: "type:archive" },
-      ],
-      value: "",
-      ongoing: false,
-      results: [],
-      reload: false,
-      scrollable: null,
-    };
-  },
-  watch: {
-    largerThan() {
-      this.submit();
-    },
-    smallerThan() {
-      this.submit();
-    },
-    searchTypes() {
-      this.submit();
-    },
-    active(active) {
-      const resultList = document.getElementById("result-list");
-      if (!active) {
-        resultList.classList.remove("active");
-        return;
-      }
-      setTimeout(() => {
-        resultList.classList.add("active");
-      }, 100);
-    },
-    value() {
-      if (this.results.length) {
-        this.ongoing = false;
-        this.results = [];
-      }
-    },
-  },
-  computed: {
-    isMobile() {
-      return state.isMobile;
-    },
-    foldersOnly() {
-      return this.isTypeSelectDisabled;
-    },
-    active() {
-      return getters.currentPromptName() == "search";
-    },
-    isDarkMode() {
-      return getters.isDarkMode();
-    },
-    showBoxes() {
-      return this.searchTypes == "";
-    },
-    boxes() {
-      return boxes;
-    },
-    isEmpty() {
-      return this.results.length === 0;
-    },
-    text() {
-      if (this.ongoing) {
-        return "";
-      }
-
-      return this.value === ""
-        ? this.$t("search.typeToSearch")
-        : this.$t("search.pressToSearch");
-    },
-    isRunning() {
-      return this.ongoing;
-    },
-    searchHelp() {
-      return this.showHelp;
-    },
-    getContext() {
-      let path = state.route.path;
-      path = path.slice(1);
-      path = "./" + path.substring(path.indexOf("/") + 1);
-      path = path.replace(/\/+$/, "") + "/";
-      return path;
-    },
-  },
-  methods: {
-    basePath(str, isDir) {
-      let parts = str.replace(/(\/$|^\/)/, "").split("/");
-      if (parts.length <= 1) {
-        if (isDir) {
-          return "/";
-        }
-        return "";
-      }
-      parts.pop();
-      parts = parts.join("/") + "/";
-      if (isDir) {
-        parts = "/" + parts; // fix weird rtl thing
-      }
-
-      return parts;
-    },
-    baseName(str) {
-      let parts = str.replace(/(\/$|^\/)/, "").split("/");
-      return parts.pop();
-    },
-    open() {
-      if (!this.active) {
-        mutations.showHover("search");
-      }
-    },
-    close(event) {
-      this.value = "";
-      event.stopPropagation();
-      mutations.closeHovers();
-    },
-    keyup(event) {
-      if (event.keyCode === 27) {
-        this.close(event);
-        return;
-      }
-      this.results.length === 0;
-    },
-    addToTypes(string) {
-      if (this.searchTypes.includes(string)) {
-        return true;
-      }
-      if (string == null || string == "") {
-        return false;
-      }
-      this.searchTypes = this.searchTypes + string + " ";
-    },
-    resetSearchFilters() {
-      this.searchTypes = "";
-    },
-    removeFromTypes(string) {
-      if (string == null || string == "") {
-        return false;
-      }
-      this.searchTypes = this.searchTypes.replace(string + " ", "");
-      if (state.isMobile) {
-        this.$refs.input.focus();
-      }
-    },
-    folderSelectClicked() {
-      this.isTypeSelectDisabled = true; // Disable the other ButtonGroup
-    },
-    resetButtonGroups() {
-      this.isTypeSelectDisabled = false;
-    },
-    async submit(event) {
-      this.showHelp = false;
-      if (event != undefined) {
-        event.preventDefault();
-      }
-      if (this.value === "" || this.value.length < 3) {
-        this.ongoing = false;
-        this.results = [];
-        this.noneMessage = "Not enough characters to search (min 3)";
-        return;
-      }
-      let searchTypesFull = this.searchTypes;
-      if (this.largerThan != "") {
-        searchTypesFull = searchTypesFull + "type:largerThan=" + this.largerThan + " ";
-      }
-      if (this.smallerThan != "") {
-        searchTypesFull = searchTypesFull + "type:smallerThan=" + this.smallerThan + " ";
-      }
-      let path = state.route.path;
-      this.ongoing = true;
-      try {
-        this.results = await search(path, searchTypesFull + this.value);
-      } catch (error) {
-        showError(error);
-      }
-      this.ongoing = false;
-      if (this.results.length == 0) {
-        this.noneMessage = "No results found in indexed search.";
-      }
-    },
-    toggleHelp() {
-      this.showHelp = !this.showHelp;
-    },
-  },
-};
-</script>

 <style>
 .main-input {
@@ -423,7 +198,6 @@ export default {
  color: white;
  border-left: 1px solid gray;
  border-right: 1px solid gray;
-  word-wrap: break-word;
 }

 #result-desktop > #result-list {
@@ -488,8 +262,8 @@ export default {

 /* Search */
 #search {
-  background-color: unset !important;
-  z-index: 5;
+  background-color: unset;
+  z-index: 3;
  position: fixed;
  top: 0.5em;
  min-width: 35em;
@@ -609,10 +383,6 @@ body.rtl #search #result ul > * {
  border-bottom-left-radius: 0;
 }

-input.sizeInput:disabled {
-  cursor: not-allowed;
-}
-
 /* Search Input Placeholder */
 #search::-webkit-input-placeholder {
  color: rgba(255, 255, 255, 0.5);
@@ -739,3 +509,244 @@ body.rtl #search .boxes h3 {
  align-items: center;
 }
 </style>
+
+<script>
+import ButtonGroup from "./ButtonGroup.vue";
+import { mapState, mapGetters, mapMutations } from "vuex";
+import { search } from "@/api";
+import { darkMode } from "@/utils/constants";
+
+var boxes = {
+  folder: { label: "folders", icon: "folder" },
+  file: { label: "files", icon: "insert_drive_file" },
+  archive: { label: "archives", icon: "archive" },
+  image: { label: "images", icon: "photo" },
+  audio: { label: "audio files", icon: "volume_up" },
+  video: { label: "videos", icon: "movie" },
+  doc: { label: "documents", icon: "picture_as_pdf" },
+};
+
+export default {
+  components: {
+    ButtonGroup,
+  },
+  name: "search",
+  data: function () {
+    return {
+      largerThan: "",
+      smallerThan: "",
+      noneMessage: "Start typing 3 or more characters to begin searching.",
+      searchTypes: "",
+      isTypeSelectDisabled: false,
+      showHelp: false,
+      folderSelect: [
+        { label: "Only Folders", value: "type:folder" },
+        { label: "Only Files", value: "type:file" },
+      ],
+      typeSelect: [
+        { label: "Photos", value: "type:image" },
+        { label: "Audio", value: "type:audio" },
+        { label: "Videos", value: "type:video" },
+        { label: "Documents", value: "type:doc" },
+        { label: "Archives", value: "type:archive" },
+      ],
+      value: "",
+      width: window.innerWidth,
+      active: false,
+      ongoing: false,
+      results: [],
+      reload: false,
+      scrollable: null,
+    };
+  },
+  watch: {
+    active(active) {
+      const resultList = document.getElementById("result-list");
+      if (!active) {
+        resultList.classList.remove("active");
+        return;
+      }
+      setTimeout(() => {
+        resultList.classList.add("active");
+      }, 100);
+    },
+    currentPrompt(val, old) {
+      this.active = val?.prompt === "search";
+      if (old?.prompt === "search" && !this.active) {
+        if (this.reload) {
+          this.setReload(true);
+        }
+
+        document.body.style.overflow = "auto";
+        this.ongoing = false;
+        this.results = [];
+        this.value = "";
+        this.active = false;
+        this.$refs.input.blur();
+      } else if (this.active) {
+        this.reload = false;
+        this.$refs.input.focus();
+        document.body.style.overflow = "hidden";
+      }
+    },
+    value() {
+      if (this.results.length) {
+        this.ongoing = false;
+        this.results = [];
+      }
+    },
+  },
+  computed: {
+    ...mapState(["user"]),
+    ...mapGetters(["isListing", "currentPrompt", "currentPromptName"]),
+    showOverlay: function () {
+      return this.currentPrompt !== null && this.currentPrompt.prompt !== "more";
+    },
+    isDarkMode() {
+      return this.user && Object.prototype.hasOwnProperty.call(this.user, "darkMode")
+        ? this.user.darkMode
+        : darkMode;
+    },
+    showBoxes() {
+      return this.searchTypes == "";
+    },
+    boxes() {
+      return boxes;
+    },
+    isEmpty() {
+      return this.results.length === 0;
+    },
+    text() {
+      if (this.ongoing) {
+        return "";
+      }
+
+      return this.value === ""
+        ? this.$t("search.typeToSearch")
+        : this.$t("search.pressToSearch");
+    },
+    isMobile() {
+      return this.width <= 800;
+    },
+    isRunning() {
+      return this.ongoing;
+    },
+    searchHelp() {
+      return this.showHelp;
+    },
+    getContext() {
+      let path = this.$route.path;
+      path = path.slice(1);
+      path = "./" + path.substring(path.indexOf("/") + 1);
+      path = path.replace(/\/+$/, "") + "/";
+      return path;
+    },
+  },
+  mounted() {
+    window.addEventListener("resize", this.handleResize);
+    this.handleResize(); // Call this once to set the initial width
+  },
+  methods: {
+    ...mapMutations(["showHover", "closeHovers", "setReload"]),
+    handleResize() {
+      this.width = window.innerWidth;
+    },
+    async navigateTo(url) {
+      this.closeHovers();
+      await this.$nextTick();
+      setTimeout(() => this.$router.push(url), 0);
+    },
+    basePath(str, isDir) {
+      let parts = str.replace(/(\/$|^\/)/, "").split("/");
+      if (parts.length <= 1) {
+        if (isDir) {
+          return "/";
+        }
+        return "";
+      }
+      parts.pop();
+      parts = parts.join("/") + "/";
+      if (isDir) {
+        parts = "/" + parts; // fix weird rtl thing
+      }
+      return parts;
+    },
+    baseName(str) {
+      let parts = str.replace(/(\/$|^\/)/, "").split("/");
+      return parts.pop();
+    },
+    open() {
+      this.$store.commit("showHover", "search");
+    },
+    close(event) {
+      event.stopPropagation();
+      this.closeHovers();
+    },
+    keyup(event) {
+      if (event.keyCode === 27) {
+        this.close(event);
+        return;
+      }
+      this.results.length === 0;
+    },
+    addToTypes(string) {
+      if (this.searchTypes.includes(string)) {
+        return true;
+      }
+      if (string == null || string == "") {
+        return false;
+      }
+      this.searchTypes = this.searchTypes + string + " ";
+    },
+    resetSearchFilters() {
+      this.searchTypes = "";
+    },
+    removeFromTypes(string) {
+      if (string == null || string == "") {
+        return false;
+      }
+      this.searchTypes = this.searchTypes.replace(string + " ", "");
+      if (this.isMobile) {
+        this.$refs.input.focus();
+      }
+    },
+    folderSelectClicked() {
+      this.isTypeSelectDisabled = true; // Disable the other ButtonGroup
+    },
+    resetButtonGroups() {
+      this.isTypeSelectDisabled = false;
+    },
+    async submit(event) {
+      this.showHelp = false;
+      event.preventDefault();
+      if (this.value === "" || this.value.length < 3) {
+        this.ongoing = false;
+        this.results = [];
+        this.noneMessage = "Not enough characters to search (min 3)";
+        return;
+      }
+      let searchTypesFull = this.searchTypes;
+      if (this.largerThan != "") {
+        searchTypesFull = searchTypesFull + "type:largerThan=" + this.largerThan + " ";
+      }
+      if (this.smallerThan != "") {
+        searchTypesFull = searchTypesFull + "type:smallerThan=" + this.smallerThan + " ";
+      }
+      let path = this.$route.path;
+      this.ongoing = true;
+      try {
+        this.results = await search(path, searchTypesFull + this.value);
+      } catch (error) {
+        this.$showError(error);
+      }
+      this.ongoing = false;
+      if (this.results.length == 0) {
+        this.noneMessage = "No results found in indexed search.";
+      }
+    },
+    toggleHelp() {
+      this.showHelp = !this.showHelp;
+    },
+  },
+};
+</script>
@@ -0,0 +1,233 @@
+<template>
+  <nav :class="{ active, 'dark-mode': isDarkMode }">
+    <template v-if="isLogged">
+      <button
+        class="action"
+        @click="toRoot"
+        :aria-label="$t('sidebar.myFiles')"
+        :title="$t('sidebar.myFiles')"
+      >
+        <i class="material-icons">folder</i>
+        <span>{{ $t("sidebar.myFiles") }}</span>
+      </button>
+      <div v-if="user.perm.create">
+        <button
+          @click="$store.commit('showHover', 'newDir')"
+          class="action"
+          :aria-label="$t('sidebar.newFolder')"
+          :title="$t('sidebar.newFolder')"
+        >
+          <i class="material-icons">create_new_folder</i>
+          <span>{{ $t("sidebar.newFolder") }}</span>
+        </button>
+        <button
+          @click="$store.commit('showHover', 'newFile')"
+          class="action"
+          :aria-label="$t('sidebar.newFile')"
+          :title="$t('sidebar.newFile')"
+        >
+          <i class="material-icons">note_add</i>
+          <span>{{ $t("sidebar.newFile") }}</span>
+        </button>
+        <button id="upload-button" @click="upload($event)" class="action">
+          <i class="material-icons">file_upload</i>
+          <span>Upload file</span>
+        </button>
+      </div>
+      <div>
+        <button
+          class="action"
+          @click="toSettings"
+          :aria-label="$t('sidebar.settings')"
+          :title="$t('sidebar.settings')"
+        >
+          <i class="material-icons">settings_applications</i>
+          <span>{{ $t("sidebar.settings") }}</span>
+        </button>
+
+        <button
+          v-if="canLogout"
+          @click="logout"
+          class="action"
+          id="logout"
+          :aria-label="$t('sidebar.logout')"
+          :title="$t('sidebar.logout')"
+        >
+          <i class="material-icons">exit_to_app</i>
+          <span>{{ $t("sidebar.logout") }}</span>
+        </button>
+      </div>
+    </template>
+    <template v-else>
+      <router-link
+        class="action"
+        to="/login"
+        :aria-label="$t('sidebar.login')"
+        :title="$t('sidebar.login')"
+      >
+        <i class="material-icons">exit_to_app</i>
+        <span>{{ $t("sidebar.login") }}</span>
+      </router-link>
+      <router-link
+        v-if="signup"
+        class="action"
+        to="/login"
+        :aria-label="$t('sidebar.signup')"
+        :title="$t('sidebar.signup')"
+      >
+        <i class="material-icons">person_add</i>
+        <span>{{ $t("sidebar.signup") }}</span>
+      </router-link>
+    </template>
+    <div
+      class="credits"
+      v-if="$router.currentRoute.path.includes('/files/') && !disableUsedPercentage"
+    >
+      <progress-bar :val="usage.usedPercentage" size="medium"></progress-bar>
+      <span style="text-align: center">{{ usage.usedPercentage }}%</span>
+      <span>{{ usage.used }} of {{ usage.total }} used</span>
+      <br />
+      <span v-if="disableExternal">File Browser</span>
+      <span v-else>
+        <a
+          rel="noopener noreferrer"
+          target="_blank"
+          href="https://github.com/gtsteffaniak/filebrowser"
+        >
+          File Browser
+        </a>
+      </span>
+      <span>{{ version }}</span>
+      <span>
+        <a @click="help">{{ $t("sidebar.help") }}</a>
+      </span>
+    </div>
+  </nav>
+</template>
+<script>
+import { mapState, mapGetters } from "vuex";
+import * as upload from "@/utils/upload";
+import * as auth from "@/utils/auth";
+import {
+  version,
+  signup,
+  disableExternal,
+  disableUsedPercentage,
+  noAuth,
+  loginPage,
+} from "@/utils/constants";
+import { files as api } from "@/api";
+import ProgressBar from "vue-simple-progress";
+import { getHumanReadableFilesize } from "@/utils/filesizes";
+import { darkMode } from "@/utils/constants";
+
+export default {
+  name: "sidebar",
+  components: {
+    ProgressBar,
+  },
+  computed: {
+    ...mapState(["user"]),
+    isDarkMode() {
+      return this.user && Object.prototype.hasOwnProperty.call(this.user, "darkMode")
+        ? this.user.darkMode
+        : darkMode;
+    },
+    ...mapGetters(["isLogged", "currentPrompt"]),
+    active() {
+      return this.currentPrompt?.prompt === "sidebar";
+    },
+    signup: () => signup,
+    version: () => version,
+    disableExternal: () => disableExternal,
+    disableUsedPercentage: () => disableUsedPercentage,
+    canLogout: () => !noAuth && loginPage,
+  },
+  asyncComputed: {
+    usage: {
+      async get() {
+        let path = this.$route.path.endsWith("/")
+          ? this.$route.path
+          : this.$route.path + "/";
+        let usageStats = { used: 0, total: 0, usedPercentage: 0 };
+        if (this.disableUsedPercentage) {
+          return usageStats;
+        }
+        try {
+          let usage = await api.usage(path);
+          usageStats = {
+            used: getHumanReadableFilesize(usage.used / 1024),
+            total: getHumanReadableFilesize(usage.total / 1024),
+            usedPercentage: Math.round((usage.used / usage.total) * 100),
+          };
+        } catch (error) {
+          this.$showError(error);
+        }
+        return usageStats;
+      },
+      default: { used: "0 B", total: "0 B", usedPercentage: 0 },
+      shouldUpdate() {
+        return this.$router.currentRoute.path.includes("/files/");
+      },
+    },
+  },
+  methods: {
+    toRoot() {
+      this.$router.push({ path: "/files/" }, () => {});
+      this.$store.commit("closeHovers");
+    },
+    toSettings() {
+      this.$router.push({ path: "/settings" }, () => {});
+      this.$store.commit("closeHovers");
+    },
+    help() {
+      this.$store.commit("showHover", "help");
+    },
+    upload: function () {
+      if (
+        typeof window.DataTransferItem !== "undefined" &&
+        typeof DataTransferItem.prototype.webkitGetAsEntry !== "undefined"
+      ) {
+        this.$store.commit("showHover", "upload");
+      } else {
+        document.getElementById("upload-input").click();
+      }
+    },
+    uploadInput(event) {
+      this.$store.commit("closeHovers");
+
+      let files = event.currentTarget.files;
+      let folder_upload =
+        files[0].webkitRelativePath !== undefined && files[0].webkitRelativePath !== "";
+
+      if (folder_upload) {
+        for (let i = 0; i < files.length; i++) {
+          let file = files[i];
+          files[i].fullPath = file.webkitRelativePath;
+        }
+      }
+
+      let path = this.$route.path.endsWith("/")
+        ? this.$route.path
+        : this.$route.path + "/";
+      let conflict = upload.checkConflict(files, this.req.items);
+
+      if (conflict) {
+        this.$store.commit("showHover", {
+          prompt: "replace",
+          confirm: (event) => {
+            event.preventDefault();
+            this.$store.commit("closeHovers");
+            upload.handleFiles(files, path, true);
+          },
+        });
+
+        return;
+      }
+
+      upload.handleFiles(files, path);
+    },
+    logout: auth.logout,
+  },
+};
+</script>
@@ -10,23 +10,18 @@
    @mouseup="mouseUp"
    @wheel="wheelMove"
  >
-    <div v-if="!isLoaded">Loading image...</div>
-
    <img
-      v-if="!isTiff && isLoaded"
-      :src="src"
-      class="image-ex-img"
+      src=""
+      class="image-ex-img image-ex-img-center"
      ref="imgex"
      @load="onLoad"
    />
-    <canvas v-else-if="isLoaded" ref="imgex" class="image-ex-img"></canvas>
  </div>
 </template>
-
 <script>
-import { state, mutations, getters } from "@/store";
 import throttle from "@/utils/throttle";
-import { showError } from "@/notify";
+import UTIF from "utif";
+
 export default {
  props: {
    src: String,
@@ -60,18 +55,15 @@ export default {
      },
      maxScale: 4,
      minScale: 0.25,
-      isTiff: false, // Determine if the image is a TIFF
    };
  },
  mounted() {
-    this.isTiff = this.checkIfTiff(this.src);
-    if (this.isTiff) {
-      this.decodeTiff(this.src);
-    } else {
+    if (!this.decodeUTIF()) {
      this.$refs.imgex.src = this.src;
    }
    let container = this.$refs.container;
    this.classList.forEach((className) => container.classList.add(className));
+    // set width and height if they are zero
    if (getComputedStyle(container).width === "0px") {
      container.style.width = "100%";
    }
@@ -85,55 +77,61 @@ export default {
    window.removeEventListener("resize", this.onResize);
    document.removeEventListener("mouseup", this.onMouseUp);
  },
-  computed: {
-    isLoaded() {
-      return !("preview-img" in state.loading);
-    },
-  },
  watch: {
    src: function () {
-      if (this.src == undefined || this.$refs.imgex == undefined) {
-        mutations.setLoading("preview-img", false);
-        return;
-      }
-      this.isTiff = this.checkIfTiff(this.src);
-      if (this.isTiff) {
-        this.decodeTiff(this.src);
-      } else {
+      if (!this.decodeUTIF()) {
        this.$refs.imgex.src = this.src;
      }

      this.scale = 1;
      this.setZoom();
      this.setCenter();
-      mutations.setLoading("preview-img", false);
-      this.showSpinner = false;
    },
  },
  methods: {
-    checkIfTiff(src) {
+    // Modified from UTIF.replaceIMG
+    decodeUTIF() {
      const sufs = ["tif", "tiff", "dng", "cr2", "nef"];
-      const suff = src.split(".").pop().toLowerCase();
-      return sufs.includes(suff);
+      let suff = document.location.pathname.split(".").pop().toLowerCase();
+      if (sufs.indexOf(suff) == -1) return false;
+      let xhr = new XMLHttpRequest();
+      UTIF._xhrs.push(xhr);
+      UTIF._imgs.push(this.$refs.imgex);
+      xhr.open("GET", this.src);
+      xhr.responseType = "arraybuffer";
+      xhr.onload = UTIF._imgLoaded;
+      xhr.send();
+      return true;
    },
-    async decodeTiff(src) {
-      try {
-        const response = await fetch(src);
-        if (!response.ok) {
-          throw new Error("Network response was not ok");
-        }
-        const blob = await response.blob(); // Convert response to a blob
-        const imgex = this.$refs.imgex;
+    onLoad() {
+      let img = this.$refs.imgex;

-        if (imgex) {
-          // Create a URL for the blob and set it as the image source
-          imgex.src = URL.createObjectURL(blob);
-          imgex.onload = () => URL.revokeObjectURL(imgex.src); // Clean up URL object after loading
-        }
-      } catch (error) {
-        showError("Error decoding TIFF");
-        console.error("Error decoding TIFF:", error);
+      this.imageLoaded = true;
+
+      if (img === undefined) {
+        return;
      }
+
+      img.classList.remove("image-ex-img-center");
+      this.setCenter();
+      img.classList.add("image-ex-img-ready");
+
+      document.addEventListener("mouseup", this.onMouseUp);
+
+      let realSize = img.naturalWidth;
+      let displaySize = img.offsetWidth;
+
+      // Image is in portrait orientation
+      if (img.naturalHeight > img.naturalWidth) {
+        realSize = img.naturalHeight;
+        displaySize = img.offsetHeight;
+      }
+
+      // Scale needed to display the image on full size
+      const fullScale = realSize / displaySize;
+
+      // Full size plus additional zoom
+      this.maxScale = fullScale + 4;
    },
    onMouseUp() {
      this.inDrag = false;
@@ -148,7 +146,9 @@ export default {
      let container = this.$refs.container;
      let img = this.$refs.imgex;

-      this.position.center.x = Math.floor((container.clientWidth - img.clientWidth) / 2);
+      this.position.center.x = Math.floor(
+        (container.clientWidth - img.clientWidth) / 2
+      );
      this.position.center.y = Math.floor(
        (container.clientHeight - img.clientHeight) / 2
      );
@@ -242,19 +242,32 @@ export default {
      }
    },
    doMove(x, y) {
-      this.position.relative.x += x;
-      this.position.relative.y += y;
-      // Update the transform with separate translate and scale values
-      this.$refs.imgex.style.transform = `translate(${this.position.relative.x}px, ${this.position.relative.y}px) scale(${this.scale})`;
+      let style = this.$refs.imgex.style;
+      let posX = this.pxStringToNumber(style.left) + x;
+      let posY = this.pxStringToNumber(style.top) + y;
+
+      style.left = posX + "px";
+      style.top = posY + "px";
+
+      this.position.relative.x = Math.abs(this.position.center.x - posX);
+      this.position.relative.y = Math.abs(this.position.center.y - posY);
+
+      if (posX < this.position.center.x) {
+        this.position.relative.x = this.position.relative.x * -1;
+      }
+
+      if (posY < this.position.center.y) {
+        this.position.relative.y = this.position.relative.y * -1;
+      }
    },
    wheelMove(event) {
      this.scale += -Math.sign(event.deltaY) * this.zoomStep;
      this.setZoom();
    },
    setZoom() {
-      this.scale = Math.max(this.minScale, Math.min(this.maxScale, this.scale));
-      // Update the transform with both translate and scale values
-      this.$refs.imgex.style.transform = `translate(${this.position.relative.x}px, ${this.position.relative.y}px) scale(${this.scale})`;
+      this.scale = this.scale < this.minScale ? this.minScale : this.scale;
+      this.scale = this.scale > this.maxScale ? this.maxScale : this.scale;
+      this.$refs.imgex.style.transform = `scale(${this.scale})`;
    },
    pxStringToNumber(style) {
      return +style.replace("px", "");
@@ -262,20 +275,28 @@ export default {
  },
 };
 </script>
-
 <style>
 .image-ex-container {
-  max-width: 100%; /* Image container max width */
-  max-height: 100%; /* Image container max height */
-  overflow: hidden; /* Hide overflow if image exceeds container */
-  position: relative; /* Required for absolute positioning of child */
-  display: flex;
-  justify-content: center;
+  margin: auto;
+  overflow: hidden;
+  position: relative;
 }

 .image-ex-img {
-  max-width: 100%; /* Image max width */
-  max-height: 100%; /* Image max height */
  position: absolute;
 }
+
+.image-ex-img-center {
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  position: absolute;
+  transition: none;
+}
+
+.image-ex-img-ready {
+  left: 0;
+  top: 0;
+  transition: transform 0.1s ease;
+}
 </style>
@@ -1,6 +1,6 @@
 <template>
  <div
-    :class="{ activebutton: this.isMaximized && this.isSelected }"
+    :class="{ activebutton: this.isMaximized && this.isSelected}"
    class="item"
    role="button"
    tabindex="0"
@@ -18,23 +18,21 @@
      @click="toggleClick"
      :class="{ activetitle: this.isMaximized && this.isSelected }"
    >
-      <img
-        v-if="readOnly === undefined && type === 'image' && isThumbsEnabled && isInView"
-        v-lazy="thumbnailUrl"
-        :class="{ activeimg: this.isMaximized && this.isSelected }"
-        ref="thumbnail"
-      />
-      <i
-        :class="{ iconActive: this.isMaximized && this.isSelected }"
-        v-else
-        class="material-icons"
-      ></i>
+    <img
+      v-if="readOnly === undefined && type === 'image' && isThumbsEnabled && isInView"
+      v-lazy="thumbnailUrl"
+      :class="{ activeimg: this.isMaximized && this.isSelected }"
+      ref="thumbnail"
+    />
+      <i :class="{ iconActive: this.isMaximized && this.isSelected }" v-else class="material-icons"></i>
    </div>

-    <div class="text" :class="{ activecontent: this.isMaximized && this.isSelected }">
+    <div :class="{ activecontent: this.isMaximized && this.isSelected }">
      <p class="name">{{ name }}</p>
+
      <p v-if="isDir" class="size" data-order="-1">&mdash;</p>
      <p v-else class="size" :data-order="humanSize()">{{ humanSize() }}</p>
+
      <p class="modified">
        <time :datetime="modified">{{ humanTime() }}</time>
      </p>
@@ -66,10 +64,10 @@
 <script>
 import { enableThumbs } from "@/utils/constants";
 import { getHumanReadableFilesize } from "@/utils/filesizes";
-import { fromNow } from "@/utils/moment";
+import { mapMutations, mapGetters, mapState } from "vuex";
+import moment from "moment";
 import { files as api } from "@/api";
 import * as upload from "@/utils/upload";
-import { state, getters, mutations } from "@/store"; // Import your custom store

 export default {
  name: "item",
@@ -92,44 +90,32 @@ export default {
    "path",
  ],
  computed: {
-    user() {
-      return state.user;
-    },
-    selected() {
-      return state.selected;
-    },
-    req() {
-      return state.req;
-    },
-    jwt() {
-      return state.jwt;
-    },
-    selectedCount() {
-      return getters.selectedCount();
-    },
+    ...mapState(["user", "selected", "req", "jwt"]),
+    ...mapGetters(["selectedCount"]),
    isClicked() {
-      if (state.user.singleClick || !this.allowedView) {
+      if (this.user.singleClick || !this.allowedView ) {
        return false;
      }
+      // Assuming toggleClick returns a boolean value
      return !this.isMaximized;
    },
    allowedView() {
-      return state.user.viewMode != "gallery" && state.user.viewMode != "normal";
+      return this.user.viewMode != "gallery" && this.user.viewMode != "normal"
    },
    singleClick() {
-      return this.readOnly == undefined && state.user.singleClick;
+      return this.readOnly == undefined && this.user.singleClick;
    },
    isSelected() {
      return this.selected.indexOf(this.index) !== -1;
    },
    isDraggable() {
-      return this.readOnly == undefined && state.user.perm?.rename;
+      return this.readOnly == undefined && this.user.perm.rename;
    },
    canDrop() {
      if (!this.isDir || this.readOnly !== undefined) return false;

      for (let i of this.selected) {
-        if (state.req.items[i].url === this.url) {
+        if (this.req.items[i].url === this.url) {
          return false;
        }
      }
@@ -137,12 +123,12 @@ export default {
      return true;
    },
    thumbnailUrl() {
-      let path = state.req.path;
-      if (state.req.path == "/") {
-        path = "";
+      let path = this.req.path
+      if (this.req.path == "/") {
+        path = ""
      }
      const file = {
-        path: path + "/" + this.name,
+        path: path +"/"+this.name,
        modified: this.modified,
      };

@@ -158,7 +144,7 @@ export default {
  mounted() {
    const observer = new IntersectionObserver(this.handleIntersect, {
      root: null,
-      rootMargin: "0px",
+      rootMargin: '0px',
      threshold: 0.5, // Adjust threshold as needed
    });

@@ -170,7 +156,7 @@ export default {
  },
  methods: {
    handleIntersect(entries, observer) {
-      entries.forEach((entry) => {
+      entries.forEach(entry => {
        if (entry.isIntersecting) {
          this.isThumbnailInView = true;
          // Stop observing once thumbnail is in view
@@ -181,26 +167,27 @@ export default {
    toggleClick() {
      this.isMaximized = this.isClicked;
    },
+    ...mapMutations(["addSelected", "removeSelected", "resetSelected"]),
    humanSize: function () {
      return this.type == "invalid_link"
        ? "invalid link"
        : getHumanReadableFilesize(this.size);
    },
    humanTime: function () {
-      if (this.readOnly == undefined && state.user.dateFormat) {
-        return fromNow(this.modified, state.user.locale).format("L LT");
+      if (this.readOnly == undefined && this.user.dateFormat) {
+        return moment(this.modified).format("L LT");
      }
-      return fromNow(this.modified, state.user.locale);
+      return moment(this.modified).fromNow();
    },
    dragStart: function () {
-      if (getters.selectedCount() === 0) {
-        mutations.addSelected(this.index);
+      if (this.selectedCount === 0) {
+        this.addSelected(this.index);
        return;
      }

      if (!this.isSelected) {
-        mutations.resetSelected();
-        mutations.addSelected(this.index);
+        this.resetSelected();
+        this.addSelected(this.index);
      }
    },
    dragOver: function (event) {
@@ -221,7 +208,7 @@ export default {
      if (!this.canDrop) return;
      event.preventDefault();

-      if (getters.selectedCount() === 0) return;
+      if (this.selectedCount === 0) return;

      let el = event.target;
      for (let i = 0; i < 5; i++) {
@@ -234,9 +221,9 @@ export default {

      for (let i of this.selected) {
        items.push({
-          from: state.req.items[i].url,
-          to: this.url + encodeURIComponent(state.req.items[i].name),
-          name: state.req.items[i].name,
+          from: this.req.items[i].url,
+          to: this.url + encodeURIComponent(this.req.items[i].name),
+          name: this.req.items[i].name,
        });
      }

@@ -248,9 +235,9 @@ export default {
        api
          .move(items, overwrite, rename)
          .then(() => {
-            mutations.setReload(true);
+            this.$store.commit("setReload", true);
          })
-          .catch(showError);
+          .catch(this.$showError);
      };

      let conflict = upload.checkConflict(items, baseItems);
@@ -259,14 +246,14 @@ export default {
      let rename = false;

      if (conflict) {
-        mutations.showHover({
-          name: "replace-rename",
+        this.$store.commit("showHover", {
+          prompt: "replace-rename",
          confirm: (event, option) => {
            overwrite = option == "overwrite";
            rename = option == "rename";

            event.preventDefault();
-            mutations.closeHovers();
+            this.$store.commit("closeHovers");
            action(overwrite, rename);
          },
        });
@@ -277,11 +264,11 @@ export default {
      action(overwrite, rename);
    },
    itemClick: function (event) {
-      if (this.singleClick && !state.multiple) this.open();
+      if (this.singleClick && !this.$store.state.multiple) this.open();
      else this.click(event);
    },
    click: function (event) {
-      if (!this.singleClick && getters.selectedCount() !== 0) event.preventDefault();
+      if (!this.singleClick && this.selectedCount !== 0) event.preventDefault();

      setTimeout(() => {
        this.touches = 0;
@@ -292,8 +279,8 @@ export default {
        this.open();
      }

-      if (state.selected.indexOf(this.index) !== -1) {
-        mutations.removeSelected(this.index);
+      if (this.$store.state.selected.indexOf(this.index) !== -1) {
+        this.removeSelected(this.index);
        return;
      }

@@ -310,16 +297,21 @@ export default {
        }

        for (; fi <= la; fi++) {
-          if (state.selected.indexOf(fi) == -1) {
-            mutations.addSelected(fi);
+          if (this.$store.state.selected.indexOf(fi) == -1) {
+            this.addSelected(fi);
          }
        }

        return;
      }
-      if (!this.singleClick && !event.ctrlKey && !event.metaKey && !state.multiple)
-        mutations.resetSelected();
-      mutations.addSelected(this.index);
+      if (
+        !this.singleClick &&
+        !event.ctrlKey &&
+        !event.metaKey &&
+        !this.$store.state.multiple
+      )
+        this.resetSelected();
+      this.addSelected(this.index);
    },
    open: function () {
      this.$router.push({ path: this.url });
@@ -7,15 +7,13 @@
 </template>

 <script>
-import { mutations } from "@/store"; // Import your custom store
-
 export default {
  name: "action",
  props: ["icon", "label", "counter", "show"],
  methods: {
    action: function () {
      if (this.show) {
-        mutations.showHover(this.show);
+        this.$store.commit("showHover", this.show);
      }
      this.$emit("action");
    },
@@ -23,6 +21,4 @@ export default {
 };
 </script>

-<style>
-
-</style>
+<style></style>
@@ -27,7 +27,7 @@
      <div>
        <button
          class="button button--flat button--grey"
-          @click="closeHovers"
+          @click="$store.commit('closeHovers')"
          :aria-label="$t('buttons.cancel')"
          :title="$t('buttons.cancel')"
        >
@@ -47,12 +47,11 @@
 </template>

 <script>
-import { mutations, state } from "@/store";
+import { mapState } from "vuex";
 import FileList from "./FileList.vue";
 import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import * as upload from "@/utils/upload";
-import { showError } from "@/notify";

 export default {
  name: "copy",
@@ -63,14 +62,7 @@ export default {
      dest: null,
    };
  },
-  computed: {
-    user() {
-      return state.user;
-    },
-    closeHovers() {
-      return mutations.closeHovers();
-    },
-  },
+  computed: mapState(["req", "selected", "user"]),
  methods: {
    copy: async function (event) {
      event.preventDefault();
@@ -79,9 +71,9 @@ export default {
      // Create a new promise for each file.
      for (let item of this.selected) {
        items.push({
-          from: store.req.items[item].url,
-          to: this.dest + encodeURIComponent(store.req.items[item].name),
-          name: store.req.items[item].name,
+          from: this.req.items[item].url,
+          to: this.dest + encodeURIComponent(this.req.items[item].name),
+          name: this.req.items[item].name,
        });
      }

@@ -93,8 +85,9 @@ export default {
          .then(() => {
            buttons.success("copy");

-            if (state.route.path === this.dest) {
-              mutations.setReload(true);
+            if (this.$route.path === this.dest) {
+              this.$store.commit("setReload", true);
+
              return;
            }

@@ -102,12 +95,12 @@ export default {
          })
          .catch((e) => {
            buttons.done("copy");
-            showError(e);
+            this.$showError(e);
          });
      };

-      if (state.route.path === this.dest) {
-        mutations.closeHovers();
+      if (this.$route.path === this.dest) {
+        this.$store.commit("closeHovers");
        action(false, true);

        return;
@@ -120,14 +113,14 @@ export default {
      let rename = false;

      if (conflict) {
-        mutations.showHover({
-          name: "replace-rename",
+        this.$store.commit("showHover", {
+          prompt: "replace-rename",
          confirm: (event, option) => {
            overwrite = option == "overwrite";
            rename = option == "rename";

            event.preventDefault();
-            mutations.closeHovers();
+            this.$store.commit("closeHovers");
            action(overwrite, rename);
          },
        });
@@ -10,7 +10,7 @@
    </div>
    <div class="card-action">
      <button
-        @click="closeHovers"
+        @click="$store.commit('closeHovers')"
        class="button button--flat button--grey"
        :aria-label="$t('buttons.cancel')"
        :title="$t('buttons.cancel')"
@@ -30,36 +30,25 @@
 </template>

 <script>
+import { mapGetters, mapMutations, mapState } from "vuex";
 import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
-import { state, getters, mutations } from "@/store";
-import { showError,showSuccess } from "@/notify";

 export default {
  name: "delete",
  computed: {
-    isListing() {
-      return getters.isListing();
-    },
-    selectedCount() {
-      return getters.selectedCount();
-    },
-    currentPrompt() {
-      return getters.currentPrompt();
-    },
+    ...mapGetters(["isListing", "selectedCount", "currentPrompt"]),
+    ...mapState(["req", "selected"]),
  },
  methods: {
-    closeHovers() {
-      mutations.closeHovers();
-    },
-    async submit() {
+    ...mapMutations(["closeHovers"]),
+    submit: async function () {
      buttons.loading("delete");

      try {
        if (!this.isListing) {
-          await api.remove(state.route.path);
+          await api.remove(this.$route.path);
          buttons.success("delete");
-          showSuccess("Deleted item successfully")

          this.currentPrompt?.confirm();
          this.closeHovers();
@@ -68,23 +57,22 @@ export default {

        this.closeHovers();

-        if (getters.selectedCount() === 0) {
+        if (this.selectedCount === 0) {
          return;
        }

        let promises = [];
-        for (let index of state.selected) {
-          promises.push(api.remove(state.req.items[index].url));
+        for (let index of this.selected) {
+          promises.push(api.remove(this.req.items[index].url));
        }

        await Promise.all(promises);
        buttons.success("delete");
-        showSuccess("Deleted item successfully")
-        mutations.setReload(true); // Handle reload as needed
+        this.$store.commit("setReload", true);
      } catch (e) {
        buttons.done("delete");
-        showError(e);
-        if (this.isListing) mutations.setReload(true); // Handle reload as needed
+        this.$showError(e);
+        if (this.isListing) this.$store.commit("setReload", true);
      }
    },
  },
@@ -1,89 +0,0 @@
-<template>
-  <div class="card floating">
-    <div class="card-content">
-      <p>Are you sure you want to delete this user?</p>
-    </div>
-    <div class="card-action">
-      <button
-        class="button button--flat button--grey"
-        @click="closeHovers"
-        v-focus
-        :aria-label="$t('buttons.cancel')"
-        :title="$t('buttons.cancel')"
-      >
-        {{ $t("buttons.cancel") }}
-      </button>
-      <button class="button button--flat" @click="deleteUser">
-        {{ $t("buttons.delete") }}
-      </button>
-    </div>
-  </div>
-</template>
-<script>
-import { users as api } from "@/api";
-import { showSuccess,showError } from "@/notify";
-import buttons from "@/utils/buttons";
-import { state, mutations, getters } from "@/store";
-
-export default {
-  name: "delete",
-  computed: {
-    currentPrompt() {
-      return getters.currentPrompt();
-    },
-    user() {
-      return this.currentPrompt?.props?.user;
-    },
-  },
-  methods: {
-    async deleteUser(event) {
-      event.preventDefault();
-      try {
-        await api.remove(this.user.id);
-        this.$router.push({ path: "/settings/users" });
-        showSuccess(this.$t("settings.userDeleted"));
-      } catch (e) {
-        e.message === "403"
-          ? showError(this.$t("errors.forbidden"), false)
-          : showError(e);
-      }
-    },
-    closeHovers() {
-      mutations.closeHovers();
-    },
-    submit: async function () {
-      buttons.loading("delete");
-
-      try {
-        if (!this.isListing) {
-          await api.remove(this.$route.path);
-          buttons.success("delete");
-
-          this.currentPrompt?.confirm();
-          this.closeHovers();
-          return;
-        }
-
-        this.closeHovers();
-
-        if (getters.selectedCount() === 0) {
-          return;
-        }
-
-        let promises = [];
-        for (let index of this.selected) {
-          promises.push(api.remove(state.req.items[index].url));
-        }
-
-        await Promise.all(promises);
-        buttons.success("delete");
-        mutations.setReload(true); // Handle reload as needed
-      } catch (e) {
-        buttons.done("delete");
-        showError(e);
-        if (this.isListing) mutations.setReload(true); // Handle reload as needed
-      }
-    },
-  },
-};
-</script>
@@ -3,6 +3,7 @@
    <div class="card-title">
      <h2>{{ $t("prompts.download") }}</h2>
    </div>
+
    <div class="card-content">
      <p>{{ $t("prompts.downloadMessage") }}</p>

@@ -20,7 +21,7 @@
 </template>

 <script>
-import { getters } from "@/store"; // Import your custom store
+import { mapGetters } from "vuex";

 export default {
  name: "download",
@@ -38,9 +39,6 @@ export default {
    };
  },
  computed: {
-    currentPrompt() {
-      return getters.currentPrompt();
-    },
-  },
-};
+    ...mapGetters(["currentPrompt"]),
+  },};
 </script>
@@ -21,10 +21,9 @@
 </template>

 <script>
-import { state, mutations } from "@/store";
+import { mapState } from "vuex";
 import url from "@/utils/url";
 import { files } from "@/api";
-import { showError } from "@/notify";

 export default {
  name: "file-list",
@@ -40,12 +39,13 @@ export default {
    };
  },
  computed: {
+    ...mapState(["req", "user"]),
    nav() {
      return decodeURIComponent(this.current);
    },
  },
  mounted() {
-    this.fillOptions(state.req);
+    this.fillOptions(this.req);
  },
  methods: {
    fillOptions(req) {
@@ -86,7 +86,7 @@ export default {
      // content.
      let uri = event.currentTarget.dataset.url;

-      files.fetch(uri).then(this.fillOptions).catch(showError);
+      files.fetch(uri).then(this.fillOptions).catch(this.$showError);
    },
    touchstart(event) {
      let url = event.currentTarget.dataset.url;
@@ -114,7 +114,7 @@ export default {
      }
    },
    itemClick: function (event) {
-      if (state.user.singleClick) this.next(event);
+      if (this.user.singleClick) this.next(event);
      else this.select(event);
    },
    select: function (event) {
@@ -130,13 +130,13 @@ export default {
      this.$emit("update:selected", this.selected);
    },
    createDir: async function () {
-      mutations.showHover({
-        name: "newDir",
+      this.$store.commit("showHover", {
+        prompt: "newDir",
        action: null,
        confirm: null,
        props: {
          redirect: false,
-          base: this.current === state.route.path ? null : this.current,
+          base: this.current === this.$route.path ? null : this.current,
        },
      });
    },
@@ -21,7 +21,7 @@
    <div class="card-action">
      <button
        type="submit"
-        @click="closeHovers"
+        @click="$store.commit('closeHovers')"
        class="button button--flat"
        :aria-label="$t('buttons.ok')"
        :title="$t('buttons.ok')"
@@ -33,14 +33,5 @@
 </template>

 <script>
-import { mutations } from "@/store"; // Import the mutations
-
-export default {
-  name: "help",
-  computed: {
-    closeHovers() {
-      return mutations.closeHovers; // Return the closeHovers mutation
-    },
-  },
-};
+export default { name: "help" };
 </script>
@@ -33,25 +33,33 @@
        <p>
          <strong>MD5: </strong
          ><code
-            ><a @click="checksum($event, 'md5')">{{ $t("prompts.show") }}</a></code
+            ><a @click="checksum($event, 'md5')">{{
+              $t("prompts.show")
+            }}</a></code
          >
        </p>
        <p>
          <strong>SHA1: </strong
          ><code
-            ><a @click="checksum($event, 'sha1')">{{ $t("prompts.show") }}</a></code
+            ><a @click="checksum($event, 'sha1')">{{
+              $t("prompts.show")
+            }}</a></code
          >
        </p>
        <p>
          <strong>SHA256: </strong
          ><code
-            ><a @click="checksum($event, 'sha256')">{{ $t("prompts.show") }}</a></code
+            ><a @click="checksum($event, 'sha256')">{{
+              $t("prompts.show")
+            }}</a></code
          >
        </p>
        <p>
          <strong>SHA512: </strong
          ><code
-            ><a @click="checksum($event, 'sha512')">{{ $t("prompts.show") }}</a></code
+            ><a @click="checksum($event, 'sha512')">{{
+              $t("prompts.show")
+            }}</a></code
          >
        </p>
      </template>
@@ -60,7 +68,7 @@
    <div class="card-action">
      <button
        type="submit"
-        @click="closeHovers"
+        @click="$store.commit('closeHovers')"
        class="button button--flat"
        :aria-label="$t('buttons.ok')"
        :title="$t('buttons.ok')"
@@ -70,87 +78,73 @@
    </div>
  </div>
 </template>
+
 <script>
 import { getHumanReadableFilesize } from "@/utils/filesizes";
-import { formatTimestamp } from "@/utils/moment";
+import { mapState, mapGetters } from "vuex";
+import moment from "moment";
 import { files as api } from "@/api";
-import { state, getters, mutations } from "@/store"; // Import your custom store
-import { showError } from "@/notify";

 export default {
  name: "info",
  computed: {
-    closeHovers() {
-      return mutations.closeHovers;
-    },
-    req() {
-      return state.req;
-    },
-    selected() {
-      return state.selected;
-    },
-    selectedCount() {
-      return getters.selectedCount();
-    },
-    isListing() {
-      return getters.isListing();
-    },
-    humanSize() {
-      if (getters.selectedCount() === 0 || !this.isListing) {
-        return getHumanReadableFilesize(state.req.size);
+    ...mapState(["req", "selected"]),
+    ...mapGetters(["selectedCount", "isListing"]),
+    humanSize: function () {
+      if (this.selectedCount === 0 || !this.isListing) {
+        return getHumanReadableFilesize(this.req.size);
      }

      let sum = 0;

      for (let selected of this.selected) {
-        sum += state.req.items[selected].size;
+        sum += this.req.items[selected].size;
      }

      return getHumanReadableFilesize(sum);
    },
-    humanTime() {
-      if (getters.selectedCount() === 0) {
-        return formatTimestamp(state.req.modified, state.user.locale);
+    humanTime: function () {
+      if (this.selectedCount === 0) {
+        return moment(this.req.modified).fromNow();
      }
-      return formatTimestamp(
-        state.req.items[this.selected[0]].modified,
-        state.user.locale
-      );
+
+      return moment(this.req.items[this.selected[0]].modified).fromNow();
    },
-    modTime() {
-      return new Date(Date.parse(state.req.modified)).toLocaleString();
+    modTime: function () {
+      return new Date(Date.parse(this.req.modified)).toLocaleString();
    },
-    name() {
-      return getters.selectedCount() === 0
-        ? state.req.name
-        : state.req.items[this.selected[0]].name;
+    name: function () {
+      return this.selectedCount === 0
+        ? this.req.name
+        : this.req.items[this.selected[0]].name;
    },
-    dir() {
+    dir: function () {
      return (
-        getters.selectedCount() > 1 ||
-        (getters.selectedCount() === 0
-          ? state.req.isDir
-          : state.req.items[this.selected[0]].isDir)
+        this.selectedCount > 1 ||
+        (this.selectedCount === 0
+          ? this.req.isDir
+          : this.req.items[this.selected[0]].isDir)
      );
    },
  },
  methods: {
-    async checksum(event, algo) {
+    checksum: async function (event, algo) {
      event.preventDefault();

      let link;

-      if (getters.selectedCount()) {
-        link = state.req.items[this.selected[0]].url;
+      if (this.selectedCount) {
+        link = this.req.items[this.selected[0]].url;
      } else {
-        link = state.route.path;
+        link = this.$route.path;
      }

      try {
        const hash = await api.checksum(link, algo);
-        event.target.innerHTML = hash;
+        // eslint-disable-next-line
+        event.target.innerHTML = hash
      } catch (e) {
-        showError(e);
+        this.$showError(e);
      }
    },
  },
@@ -26,7 +26,7 @@
      <div>
        <button
          class="button button--flat button--grey"
-          @click="closeHovers"
+          @click="$store.commit('closeHovers')"
          :aria-label="$t('buttons.cancel')"
          :title="$t('buttons.cancel')"
        >
@@ -47,12 +47,11 @@
 </template>

 <script>
-import { mutations, state } from "@/store";
+import { mapState } from "vuex";
 import FileList from "./FileList.vue";
 import { files as api } from "@/api";
 import buttons from "@/utils/buttons";
 import * as upload from "@/utils/upload";
-import { showError } from "@/notify";

 export default {
  name: "move",
@@ -63,39 +62,32 @@ export default {
      dest: null,
    };
  },
-  computed: {
-    user() {
-      return state.user;
-    },
-    closeHovers() {
-      return mutations.closeHovers();
-    },
-  },
+  computed: mapState(["req", "selected", "user"]),
  methods: {
    move: async function (event) {
      event.preventDefault();
      let items = [];

-      for (let item of state.selected) {
+      for (let item of this.selected) {
        items.push({
-          from: state.req.items[item].url,
-          to: this.dest + encodeURIComponent(state.req.items[item].name),
-          name: state.req.items[item].name,
+          from: this.req.items[item].url,
+          to: this.dest + encodeURIComponent(this.req.items[item].name),
+          name: this.req.items[item].name,
        });
      }

      let action = async (overwrite, rename) => {
        buttons.loading("move");
+
        await api
          .move(items, overwrite, rename)
          .then(() => {
            buttons.success("move");
            this.$router.push({ path: this.dest });
-            mutations.setReload(true);
          })
          .catch((e) => {
            buttons.done("move");
-            showError(e);
+            this.$showError(e);
          });
      };

@@ -106,22 +98,22 @@ export default {
      let rename = false;

      if (conflict) {
-        mutations.showHover({
-          name: "replace-rename",
+        this.$store.commit("showHover", {
+          prompt: "replace-rename",
          confirm: (event, option) => {
            overwrite = option == "overwrite";
            rename = option == "rename";
+
            event.preventDefault();
-            mutations.closeHovers();
+            this.$store.commit("closeHovers");
            action(overwrite, rename);
-            mutations.setReload(true);
          },
        });
+
        return;
      }

      action(overwrite, rename);
-
    },
  },
 };
@@ -18,7 +18,7 @@
    <div class="card-action">
      <button
        class="button button--flat button--grey"
-        @click="closeHovers"
+        @click="$store.commit('closeHovers')"
        :aria-label="$t('buttons.cancel')"
        :title="$t('buttons.cancel')"
      >
@@ -35,11 +35,11 @@
    </div>
  </div>
 </template>
+
 <script>
+import { mapGetters } from "vuex";
 import { files as api } from "@/api";
 import url from "@/utils/url";
-import { getters, mutations, state } from "@/store"; // Import your custom store
-import { showError } from "@/notify";

 export default {
  name: "new-dir",
@@ -53,31 +53,23 @@ export default {
      default: null,
    },
  },
-  data() {
+  data: function () {
    return {
      name: "",
    };
  },
  computed: {
-    isFiles() {
-      return getters.isFiles();
-    },
-    isListing() {
-      return getters.isListing();
-    },
+    ...mapGetters(["isFiles", "isListing"]),
  },
  methods: {
-    closeHovers() {
-      return mutations.closeHovers();
-    },
-    async submit(event) {
+    submit: async function (event) {
      event.preventDefault();
-      if (this.name === "") return;
+      if (this.new === "") return;

      // Build the path of the new directory.
      let uri;
      if (this.base) uri = this.base;
-      else if (getters.isFiles()) uri = state.route.path + "/";
+      else if (this.isFiles) uri = this.$route.path + "/";
      else uri = "/";

      if (!this.isListing) {
@@ -93,13 +85,13 @@ export default {
          this.$router.push({ path: uri });
        } else if (!this.base) {
          const res = await api.fetch(url.removeLastDir(uri) + "/");
-          mutations.updateRequest(res);
+          this.$store.commit("updateRequest", res);
        }
      } catch (e) {
-        showError(e);
+        this.$showError(e);
      }

-      mutations.closeHovers();
+      this.$store.commit("closeHovers");
    },
  },
 };
@@ -18,7 +18,7 @@
    <div class="card-action">
      <button
        class="button button--flat button--grey"
-        @click="closeHovers"
+        @click="$store.commit('closeHovers')"
        :aria-label="$t('buttons.cancel')"
        :title="$t('buttons.cancel')"
      >
@@ -35,36 +35,29 @@
    </div>
  </div>
 </template>
+
 <script>
-import { state } from "@/store";
+import { mapGetters } from "vuex";
 import { files as api } from "@/api";
 import url from "@/utils/url";
-import { getters, mutations } from "@/store"; // Import your custom store

 export default {
  name: "new-file",
-  data() {
+  data: function () {
    return {
      name: "",
    };
  },
  computed: {
-    isFiles() {
-      return getters.isFiles();
-    },
-    isListing() {
-      return getters.isListing();
-    },
-    closeHovers() {
-      return mutations.closeHovers;
-    },
+    ...mapGetters(["isFiles", "isListing"]),
  },
  methods: {
-    async submit(event) {
+    submit: async function (event) {
      event.preventDefault();
-      if (this.name === "") return;
-      // Build the path of the new file.
-      let uri = getters.isFiles() ? state.route.path + "/" : "/";
+      if (this.new === "") return;
+
+      // Build the path of the new directory.
+      let uri = this.isFiles ? this.$route.path + "/" : "/";

      if (!this.isListing) {
        uri = url.removeLastDir(uri) + "/";
@@ -77,10 +70,10 @@ export default {
        await api.post(uri);
        this.$router.push({ path: uri });
      } catch (e) {
-        showError(e);
+        this.$showError(e);
      }

-      mutations.closeHovers();
+      this.$store.commit("closeHovers");
    },
  },
 };
@@ -5,7 +5,8 @@
      :ref="currentPromptName"
      :is="currentPromptName"
      v-bind="currentPrompt.props"
-    />
+    >
+    </component>
  </div>
 </template>

@@ -24,10 +25,9 @@ import ReplaceRename from "./ReplaceRename.vue";
 import Share from "./Share.vue";
 import Upload from "./Upload.vue";
 import ShareDelete from "./ShareDelete.vue";
-import DeleteUser from "./DeleteUser.vue";
-import Sidebar from "../sidebar/Sidebar.vue";
+import Sidebar from "../Sidebar.vue";
+import { mapGetters, mapState } from "vuex";
 import buttons from "@/utils/buttons";
-import { state, getters, mutations } from "@/store"; // Import your custom store

 export default {
  name: "prompts",
@@ -47,33 +47,31 @@ export default {
    Upload,
    ShareDelete,
    Sidebar,
-    DeleteUser,
  },
-  data() {
+  data: function () {
    return {
      pluginData: {
        buttons,
-        store: state, // Directly use state
+        store: this.$store,
        router: this.$router,
      },
    };
  },
  created() {
    window.addEventListener("keydown", (event) => {
-      let currentPrompt = getters.currentPrompt();
-      if (!currentPrompt) return;
+      if (this.currentPrompt == null) return;

-      let prompt = this.$refs[currentPrompt.name];
+      let prompt = this.$refs.currentComponent;

      // Esc!
      if (event.keyCode === 27) {
        event.stopImmediatePropagation();
-        mutations.closeHovers();
+        this.$store.commit("closeHovers");
      }

      // Enter
-      if (event.keyCode === 13) {
-        switch (currentPrompt.name) {
+      if (event.keyCode == 13) {
+        switch (this.currentPrompt.prompt) {
          case "delete":
            prompt.submit();
            break;
@@ -91,25 +89,10 @@ export default {
    });
  },
  computed: {
-    currentPromptName() {
-      if (getters.currentPromptName() == null) {
-        return "";
-      }
-      return getters.currentPromptName();
-    },
-    currentPrompt() {
-      if (getters.currentPrompt() == null) {
-        return {
-          props: {},
-        };
-      }
-      return getters.currentPrompt();
-    },
-    plugins() {
-      return state.plugins;
-    },
-    showOverlay() {
-      return getters.currentPromptName() !== "more";
+    ...mapState(["plugins"]),
+    ...mapGetters(["currentPrompt", "currentPromptName"]),
+    showOverlay: function () {
+      return this.currentPrompt !== null && this.currentPrompt.prompt !== "more";
    },
  },
  methods: {},
@@ -21,7 +21,7 @@
    <div class="card-action">
      <button
        class="button button--flat button--grey"
-        @click="closeHovers"
+        @click="$store.commit('closeHovers')"
        :aria-label="$t('buttons.cancel')"
        :title="$t('buttons.cancel')"
      >
@@ -39,14 +39,15 @@
    </div>
  </div>
 </template>
+
 <script>
+import { mapState, mapGetters } from "vuex";
 import url from "@/utils/url";
 import { files as api } from "@/api";
-import { state, getters, mutations } from "@/store";

 export default {
  name: "rename",
-  data() {
+  data: function () {
    return {
      name: "",
    };
@@ -55,48 +56,37 @@ export default {
    this.name = this.oldName();
  },
  computed: {
-    req() {
-      return state.req;
-    },
-    selected() {
-      return state.selected;
-    },
-    selectedCount() {
-      return state.selectedCount;
-    },
-    isListing() {
-      return getters.isListing();
-    },
-    closeHovers() {
-      return mutations.closeHovers;
-    },
+    ...mapState(["req", "selected", "selectedCount"]),
+    ...mapGetters(["isListing"]),
  },
  methods: {
-    cancel() {
-      mutations.closeHovers();
+    cancel: function () {
+      this.$store.commit("closeHovers");
    },
-    oldName() {
+    oldName: function () {
      if (!this.isListing) {
-        return state.req.name;
+        return this.req.name;
      }

-      if (getters.selectedCount() === 0 || getters.selectedCount() > 1) {
+      if (this.selectedCount === 0 || this.selectedCount > 1) {
+        // This shouldn't happen.
        return;
      }

-      return state.req.items[this.selected[0]].name;
+      return this.req.items[this.selected[0]].name;
    },
-    async submit() {
+    submit: async function () {
      let oldLink = "";
      let newLink = "";

      if (!this.isListing) {
-        oldLink = state.req.url;
+        oldLink = this.req.url;
      } else {
-        oldLink = state.req.items[this.selected[0]].url;
+        oldLink = this.req.items[this.selected[0]].url;
      }

-      newLink = url.removeLastDir(oldLink) + "/" + encodeURIComponent(this.name);
+      newLink =
+        url.removeLastDir(oldLink) + "/" + encodeURIComponent(this.name);

      try {
        await api.move([{ from: oldLink, to: newLink }]);
@@ -105,12 +95,12 @@ export default {
          return;
        }

-        mutations.setReload(true);
+        this.$store.commit("setReload", true);
      } catch (e) {
-        showError(e);
+        this.$showError(e);
      }

-      mutations.closeHovers();
+      this.$store.commit("closeHovers");
    },
  },
 };
@@ -28,15 +28,12 @@
    </div>
  </div>
 </template>
+
 <script>
-import { getters } from "@/store"; // Import your custom store
+import { mapGetters } from "vuex";

 export default {
  name: "replace",
-  computed: {
-    currentPrompt() {
-      return getters.currentPrompt(); // Access the getter directly from the store
-    },
-  },
+  computed: mapGetters(["currentPrompt"]),
 };
 </script>
@@ -7,32 +7,29 @@
    <div class="card-content">
      <p>{{ $t("prompts.replaceMessage") }}</p>
    </div>
+
    <div class="card-action">
      <button
        class="button button--flat button--grey"
-        @click="closeHovers"
+        @click="(event) => currentPrompt.confirm(event, 'rename')"
        :aria-label="$t('buttons.cancel')"
        :title="$t('buttons.cancel')"
-        tabindex="3"
      >
        {{ $t("buttons.cancel") }}
      </button>
      <button
        class="button button--flat button--blue"
-        @click="(event) => currentPrompt.confirm(event, 'rename')"
+        @click="(event) => currentPrompt.confirm(event, 'overwrite')"
        :aria-label="$t('buttons.rename')"
        :title="$t('buttons.rename')"
-        tabindex="2"
      >
        {{ $t("buttons.rename") }}
      </button>
      <button
-        id="focus-prompt"
        class="button button--flat button--red"
-        @click="(event) => currentPrompt.confirm(event, 'overwrite')"
+        @click="(event) => showConfirm(event, 'overwrite')"
        :aria-label="$t('buttons.replace')"
        :title="$t('buttons.replace')"
-        tabindex="1"
      >
        {{ $t("buttons.replace") }}
      </button>
@@ -41,14 +38,9 @@
 </template>

 <script>
-import { getters } from "@/store"; // Import your custom store
-
+import { mapGetters } from "vuex";
 export default {
  name: "replace-rename",
-  computed: {
-    currentPrompt() {
-      return getters.currentPrompt(); // Access the getter directly from the store
-    },
-  },
+  computed: mapGetters(["currentPrompt"]),
 };
 </script>
@@ -58,7 +58,7 @@
      <div class="card-action">
        <button
          class="button button--flat button--grey"
-          @click="closeHovers"
+          @click="$store.commit('closeHovers')"
          :aria-label="$t('buttons.close')"
          :title="$t('buttons.close')"
        >
@@ -119,16 +119,16 @@
    </template>
  </div>
 </template>
+
 <script>
-import { showSuccess, showError } from "@/notify";
-import { state, getters, mutations } from "@/store";
+import { mapState, mapGetters } from "vuex";
 import { share as api, pub as pub_api } from "@/api";
-import { fromNow } from "@/utils/moment";
+import moment from "moment";
 import Clipboard from "clipboard";

 export default {
  name: "share",
-  data() {
+  data: function () {
    return {
      time: "",
      unit: "hours",
@@ -139,35 +139,22 @@ export default {
    };
  },
  computed: {
-    closeHovers() {
-      return mutations.closeHovers;
-    },
-    req() {
-      return state.req; // Access state directly
-    },
-    selected() {
-      return state.selected; // Access state directly
-    },
-    selectedCount() {
-      return state.selected.length; // Compute selectedCount directly from state
-    },
-    isListing() {
-      return getters.isListing(); // Access getter directly from the store
-    },
+    ...mapState(["req", "selected", "selectedCount"]),
+    ...mapGetters(["isListing", "selectedCount"]),
    url() {
      if (!this.isListing) {
-        return state.route.path;
+        return this.$route.path;
      }
-      if (getters.selectedCount() !== 1) {
+      if (this.selectedCount != 1) {
        // selecting current view image
-        return state.route.path;
+        return this.$route.path;
      }
-      return state.req.items[this.selected[0]].url;
+      return this.req.items[this.selected[0]].url;
    },
    getContext() {
-      let path = state.route.path.replace("/files/", "./");
-      if (getters.selectedCount() === 1) {
-        path = path + state.req.items[this.selected[0]].name;
+      let path = this.$route.path.replace("/files/", "./");
+      if (this.selectedCount == 1) {
+        path = path + this.req.items[this.selected[0]].name;
      }
      return path;
    },
@@ -178,25 +165,25 @@ export default {
      this.links = links;
      this.sort();

-      if (this.links.length === 0) {
+      if (this.links.length == 0) {
        this.listing = false;
      }
    } catch (e) {
-      showError(e);
+      this.$showError(e);
    }
  },
  mounted() {
    this.clip = new Clipboard(".copy-clipboard");
    this.clip.on("success", () => {
-      showSuccess(this.$t("success.linkCopied"));
+      this.$showSuccess(this.$t("success.linkCopied"));
    });
  },
  beforeUnmount() {
    this.clip.destroy();
  },
  methods: {
-    async submit() {
-      let isPermanent = !this.time || this.time === 0;
+    submit: async function () {
+      let isPermanent = !this.time || this.time == 0;

      try {
        let res = null;
@@ -216,30 +203,30 @@ export default {

        this.listing = true;
      } catch (e) {
-        showError(e);
+        this.$showError(e);
      }
    },
-    async deleteLink(event, link) {
+    deleteLink: async function (event, link) {
      event.preventDefault();
      try {
        await api.remove(link.hash);
        this.links = this.links.filter((item) => item.hash !== link.hash);

-        if (this.links.length === 0) {
+        if (this.links.length == 0) {
          this.listing = false;
        }
      } catch (e) {
-        showError(e);
+        this.$showError(e);
      }
    },
    humanTime(time) {
-      return fromNow(time, state.user.locale);
+      return moment(time * 1000).fromNow();
    },
    buildLink(share) {
      return api.getShareURL(share);
    },
    hasDownloadLink() {
-      return this.selected.length === 1 && !state.req.items[this.selected[0]].isDir;
+      return this.selected.length === 1 && !this.req.items[this.selected[0]].isDir;
    },
    buildDownloadLink(share) {
      return pub_api.getDownloadURL(share);
@@ -252,9 +239,8 @@ export default {
      });
    },
    switchListing() {
-      if (this.links.length === 0 && !this.listing) {
-        // Access the store directly if needed
-        mutations.closeHovers();
+      if (this.links.length == 0 && !this.listing) {
+        this.$store.commit("closeHovers");
      }

      this.listing = !this.listing;
@@ -5,7 +5,7 @@
    </div>
    <div class="card-action">
      <button
-        @click="closeHovers"
+        @click="$store.commit('closeHovers')"
        class="button button--flat button--grey"
        :aria-label="$t('buttons.cancel')"
        :title="$t('buttons.cancel')"
@@ -23,21 +23,16 @@
    </div>
  </div>
 </template>
-<script>
-import { getters } from "@/store"; // Import your custom store

+<script>
+import { mapGetters } from "vuex";
 export default {
  name: "share-delete",
  computed: {
-    closeHovers() {
-      return mutations.closeHovers();
-    },
-    currentPrompt() {
-      return getters.currentPrompt();
-    },
+    ...mapGetters(["currentPrompt"]),
  },
  methods: {
-    submit() {
+    submit: function () {
      this.currentPrompt?.confirm();
    },
  },
Author	SHA1	Message	Date
Graham Steffaniak	34b1c49054	updated workflow	2024-05-04 20:46:43 -05:00
Graham Steffaniak	d79b095bbc	update workflow permission	2024-05-04 20:43:36 -05:00
Graham SteffaniakandGraham Steffaniak	3cc90fab28	update release (#121 ) Co-authored-by: Graham Steffaniak <gtsteff@gamil.com>	2024-05-04 20:40:34 -05:00
Graham SteffaniakandGraham Steffaniak	9f20b21ac9	Add release (#120 ) Co-authored-by: Graham Steffaniak <gtsteff@gamil.com>	2024-05-04 20:26:14 -05:00
Graham Steffaniak	d0532f1c83	v0.2.4 release (#116 )	2024-02-09 18:11:00 -06:00