Fix user creation (#276)

.github/workflows/main.yaml

@@ -6,32 +6,7 @@ on:
       - "main"
 
 jobs:
-  test_frontend:
-    name: Test Playwright
-    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
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
   push_latest_to_registry:
-    needs: [ test_frontend ]
     name: Push latest
     runs-on: ubuntu-latest
     steps:
@@ -39,9 +14,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Find latest beta tag
+      - name: Find latest tag
         run: |
-          echo "LATEST_TAG=$(git describe --tags $(git rev-list --tags="*-beta*" --max-count=1))" >> $GITHUB_ENV
+          echo "LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_ENV
           echo "latest tag is $LATEST_TAG"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3.0.0

.github/workflows/pr.yaml

@@ -1,37 +1,28 @@
-name: PR Request
+name: pr-request
 
 on:
   pull_request:
     branches:
-      - "dev/v[0-9]+.[0-9]+.[0-9]+"
-      - "beta/v[0-9]+.[0-9]+.[0-9]+"
-      - "stable/v[0-9]+.[0-9]+.[0-9]+"
+      - "main"
+      - "v[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
-  test_frontend:
-    name: Test Playwright
-    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
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
+  #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

.github/workflows/regular-tests.yaml

@@ -1,9 +1,9 @@
-name: regular tests
+name: dev tests
 
 on:
   push:
     branches:
-      - "**"
+      - "*"
 
 jobs:
   test-backend:

.github/workflows/release.yaml

@@ -1,40 +1,15 @@
-name: stable release
+name: version release
 
 on:
   push:
     branches:
-      - "stable/v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+"
 
 permissions:
   contents: write
 
 jobs:
-  test_frontend:
-    name: Test Playwright
-    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
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
-  create_release_tag:
-    needs: [ test_frontend ]
+  create_release:
     name: Create Release
     runs-on: ubuntu-latest
     steps:
@@ -44,11 +19,7 @@ jobs:
           token: ${{ secrets.PAT }}
       - name: Extract branch name
         shell: bash
-        run: |
-          original_branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-          echo "branch_name=$transformed_branch" >> $GITHUB_OUTPUT
-          tag_name=$(echo "$original_branch" | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+')-stable
-          echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
         id: extract_branch
       - uses: actions/setup-go@v5
         with:
@@ -56,16 +27,15 @@ jobs:
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
-          target_commitish: ${{ steps.extract_branch.outputs.branch_name }}
+          target_commitish: ${{ steps.extract_branch.outputs.branch }}
           token: ${{ secrets.PAT }}
-          tag_name: ${{ steps.extract_branch.outputs.tag_name }}
+          tag_name: ${{ steps.extract_branch.outputs.branch }}
           prerelease: false
           draft: false
           generate_release_notes: true
-          name: ${{ steps.extract_branch.outputs.tag_name }}
+          name: ${{ steps.extract_branch.outputs.branch }}
 
   push_release_to_registry:
-    needs: [ test_frontend ]
     name: Push release
     runs-on: ubuntu-latest
     steps:
@@ -90,7 +60,7 @@ jobs:
         run: |
           JSON="${{ steps.meta.outputs.tags }}"
           # Use jq to remove 'v' from the version field
-          JSON=$(echo "$JSON" | sed 's/filebrowser:stable\/v/filebrowser:/')
+          JSON=$(echo "$JSON" | sed 's/filebrowser:v/filebrowser:/')
           echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
       - name: Build and push
         uses: docker/build-push-action@v6

.github/workflows/release_beta.yaml

@@ -1,107 +0,0 @@
-name: beta release
-
-on:
-  push:
-    branches:
-      - "beta/v[0-9]+.[0-9]+.[0-9]+"
-
-permissions:
-  contents: write
-
-jobs:
-  test_frontend:
-    name: Test Playwright
-    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
-      - uses: actions/setup-node@v4
-      - working-directory: frontend
-        run: npm i && npm run build
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - working-directory: backend
-        run: go build -o filebrowser .
-      - name: Build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.playwright
-          push: false
-  create_release_tag:
-    needs: [ test_frontend ]
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.PAT }}
-      - name: Extract branch name
-        shell: bash
-        run: |
-          original_branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-          echo "branch_name=$transformed_branch" >> $GITHUB_OUTPUT
-          tag_name=$(echo "$original_branch" | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+')-beta
-          echo "tag_name=$tag_name" >> $GITHUB_OUTPUT
-        id: extract_branch
-      - uses: actions/setup-go@v5
-        with:
-          go-version: 'stable'
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          target_commitish: ${{ steps.extract_branch.outputs.branch_name }}
-          token: ${{ secrets.PAT }}
-          tag_name: ${{ steps.extract_branch.outputs.tag_name }}
-          prerelease: false # change this to false when stable gets released
-          make_latest: true # change this to false when stable gets released
-          draft: false
-          generate_release_notes: true
-          name: ${{ steps.extract_branch.outputs.tag_name }}
-
-  push_release_to_registry:
-    needs: [ 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: 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:beta\/v/filebrowser:beta_v/')
-          echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        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 }}

.github/workflows/release_dev.yaml

@@ -3,7 +3,7 @@ name: dev release
 on:
   push:
     branches:
-      - "dev/v[0-9]+.[0-9]+.[0-9]+"
+      - "dev_v[0-9]+.[0-9]+.[0-9]+"
 
 permissions:
   contents: write
@@ -34,7 +34,7 @@ jobs:
         run: |
           JSON="${{ steps.meta.outputs.tags }}"
           # Use jq to remove 'v' from the version field
-          JSON=$(echo "$JSON" | sed 's/filebrowser:dev\/v/filebrowser:dev_v/')
+          JSON=$(echo "$JSON" | sed 's/filebrowser:v/filebrowser:/')
           echo "cleaned_tag=$JSON" >> $GITHUB_OUTPUT
       - name: Build and push
         uses: docker/build-push-action@v6

.github/workflows/tag.yaml

@@ -1,9 +1,9 @@
-name: tag update
+name: tag
 
 on:
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+*"
+      - "v*"
 
 permissions:
   contents: write

.gitignore

@@ -1,18 +1,13 @@
 *.db
 *.bak
-*.log
-*.mjs
 _old
 rice-box.go
 .idea/
-/backend/backend
-/backend/filebrowser
-/backend/filebrowser.exe
-/backend/backend.exe
+/backend
+/backend.exe
 /frontend/dist
 /frontend/pkg
 /frontend/test-results
-/frontend/loginAuth.json
 /frontend/package-lock.json
 /backend/vendor
 /backend/*.cov

CHANGELOG.md

@@ -2,76 +2,6 @@
 
 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.4.2-beta
-
-  **New Features**
-  - Hidden files changes
-    - windows hidden file properties are respected -- when running on windows binary (not docker) with NTFS filesystem.
-    - windows "system" files are considered hidden.
-    - changed user property from `hideDotFiles` to `showHidden`. Defaults to false, so a user would need to must unhide hidden files if they want to view hidden files.
-
-  **Notes**:
-  - cleaned up old and deprecated config.
-  - removed unneeded "Global settings". All system configuration is done on config yaml, See configuration wiki for more help.
-
-  **Bugfixes**:
-  - Another fix for memory https://github.com/gtsteffaniak/filebrowser/issues/298
-
-## v0.4.1-beta
-
-  **New Features**
-  - right-click actions are available on search. https://github.com/gtsteffaniak/filebrowser/issues/273
-
-  **Notes**
-  - delete prompt now lists all items that will be affected by delete
-  - Debug and logger output tweaks.
-
-  **Bugfixes**:
-  - calculating checksums errors.
-  - copy/move issues for some circumstances.
-  - The previous position wasn't returned when closing a preview window https://github.com/gtsteffaniak/filebrowser/issues/298
-  - fixed sources configuration mapping error (advanced `server.sources` config)
-
-## v0.4.0-beta
-
-  **New Features**
-  - Better logging https://github.com/gtsteffaniak/filebrowser/issues/288
-    - highly configurable
-    - api logs include user
-  - onlyOffice support for editing only office files (inspired from https://github.com/filebrowser/filebrowser/pull/2954)
-
-  **Notes**
-  - Breadcrumbs will only show on file listing (not on previews or editors)
-  - Config file is now optional. It will run with default settings without one and throw a `[WARN ]` message.
-  - Added more descriptions to swagger API
-
-## v0.3.7-beta
-
-  **Notes**:
-  - Adding windows builds back to automated process... will replace manually if they throw malicious defender warnings.
-  - Adding playwright tests to all pr's against dev/beta/release branches.
-    - These playwright tests should help keep release more reliably stable.
-
-  **Bugfixes**:
-  - closing with the default bar issue.
-  - tar.gz archive creation issue
-
-## v0.3.6-beta
-
-  **New Features**
-  - Adds "externalUrl" server config https://github.com/gtsteffaniak/filebrowser/issues/272
-
-  **Notes**:
-  - All views modes to show header bar for sorting.
-  - other small style changes
-
-  **Bugfixes**:
-  - select and info bug after sorting https://github.com/gtsteffaniak/filebrowser/issues/277
-  - downloading from shares with public user
-  - Ctrl and Shift key modifiers work on listing views as expected.
-  - copy/move file/folder error and show errors https://github.com/gtsteffaniak/filebrowser/issues/278
-  - file move/copy context fix.
-
 ## v0.3.5
 
   **New Features**

Dockerfile.playwright

@@ -1,6 +1,19 @@
-FROM gtstef/playwright-base
+FROM golang:1.23-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/config.yaml", "./" ]
+COPY  ./frontend/ ./frontend
 WORKDIR /app/frontend
-COPY [ "./frontend/", "./" ]
-WORKDIR /app/backend/
-COPY [ "./backend/filebrowser*", "./"]
-RUN ./filebrowser -c filebrowser-playwright.yaml & sleep 2 && cd ../frontend && npx playwright test
+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

Dockerfile.playwright-base

@@ -1,4 +0,0 @@
-FROM node:22-slim
-WORKDIR /app/frontend
-RUN npm i @playwright/test
-RUN npx playwright install --with-deps firefox

README.md

@@ -6,11 +6,14 @@
 </p>
 <h3 align="center">FileBrowser Quantum - A modern web-based file manager</h3>
 <p align="center">
-  <img width="800" src="https://github.com/user-attachments/assets/c991fc69-a05b-4f34-b915-0d3cded887a7" title="Main Screenshot">
+  <img width="800" src="https://github.com/user-attachments/assets/b16acd67-0292-437a-a06c-bc83f95758e6" title="Main Screenshot">
 </p>
 
+> [!Note]
+> Starting with v0.3.3, configuration file mapping is different to support non-root user. Now, the default config file name is `config.yaml` and in docker the path is `/home/filebrowser/config.yaml` and `/home/filebrowser/<database_file>`. Please read the usage below to properly update your config to point the new config location. (open an issue for any help needed)
+
 > [!WARNING]
-> There is no stable version yet planned 2025.
+> There is no stable version yet. Always check release notes for bug fixes on functionality that may have been changed. If you notice any unexpected behavior -- please open an issue to have it fixed soon.
 
 FileBrowser Quantum is a fork of the file browser open-source project with the following changes:
 
@@ -97,9 +100,6 @@ See the [API Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/API)
 
 Configuration is done via the `config.yaml`, see the [Configuration Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Configuration) for available configuration options and other help.
 
-## Office File Support
-
-See [Office Support Wiki](https://github.com/gtsteffaniak/filebrowser/wiki/Office-Support#adding-open-office-integration-for-docker) on how to enable office file editing.
 
 ## Migration from the original filebrowser
 
@@ -117,7 +117,7 @@ Self hostable                 | ✅ | ✅ | ✅ | ✅ | ❌ | ✅ |
 Has Stable Release?           | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
 S3 support                    | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
 webdav support                | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
-FTP support                   | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
+ftp support                   | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
 Dedicated docs site?          | ❌ | ✅ | ✅ | ✅ | ❌ | ✅ |
 Multiple sources at once      | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ |
 Docker image size             | 31 MB  | 31 MB  | 240 MB (main image) | 250 MB | ❌ | > 2 GB |
@@ -144,16 +144,14 @@ Event-based notifications     | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
 Metrics                       | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
 file space quotas             | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ |
 text-based files editor       | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-office file support           | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ |
-Office file previews          | ❌ | ❌ | ❌ | ✅ | ✅ | ✅ |
+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            | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ |
-Share collections of files    | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
-Can archive selected files    | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ |
-Can browse archive files      | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ 

backend/.goreleaser.yaml

@@ -10,6 +10,7 @@ builds:
     main: main.go
     binary: filebrowser
     goos:
+      - darwin
       - linux
     goarch:
       - amd64
@@ -23,36 +24,17 @@ builds:
         - 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
-    hooks:
-      post:
-        - upx {{ .Path }}  # Compress the binary with UPX
-
-  # Build configuration for windows without arm & upx
-  - id: macos
-    ldflags: *ldflags
-    main: main.go
-    binary: filebrowser
-    goos:
-      - darwin
-    goarch:
-      - amd64
-      - arm64
+#  - id: windows
+#    ldflags: *ldflags
+#    main: main.go
+#    binary: filebrowser
+#    goos:
+#      - windows
+#    goarch:
+#      - amd64
 
 archives:
-  - name_template: >
-      {{- if eq .Os "windows" -}}
-      {{.ProjectName}}
-      {{- else -}}
-      {{.Os}}-{{.Arch}}{{if .Arm}}v{{.Arm}}{{end}}-{{.ProjectName}}
-      {{- end -}}
+  - name_template: "{{.Os}}-{{.Arch}}{{if .Arm}}v{{.Arm}}{{end}}-{{ .ProjectName }}"
     format: binary
 
 checksum:

backend/auth/hook.go

@@ -3,13 +3,13 @@ package auth
 import (
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"os/exec"
 	"strings"
 
 	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/users"
 )
@@ -146,16 +146,16 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
 	if u == nil {
 		// create user with the provided credentials
 		d := &users.User{
-			Username:    a.Cred.Username,
-			Password:    a.Cred.Password,
-			Scope:       a.Settings.UserDefaults.Scope,
-			Locale:      a.Settings.UserDefaults.Locale,
-			ViewMode:    a.Settings.UserDefaults.ViewMode,
-			SingleClick: a.Settings.UserDefaults.SingleClick,
-			Sorting:     a.Settings.UserDefaults.Sorting,
-			Perm:        a.Settings.UserDefaults.Perm,
-			Commands:    a.Settings.UserDefaults.Commands,
-			ShowHidden:  a.Settings.UserDefaults.ShowHidden,
+			Username:     a.Cred.Username,
+			Password:     a.Cred.Password,
+			Scope:        a.Settings.UserDefaults.Scope,
+			Locale:       a.Settings.UserDefaults.Locale,
+			ViewMode:     a.Settings.UserDefaults.ViewMode,
+			SingleClick:  a.Settings.UserDefaults.SingleClick,
+			Sorting:      a.Settings.UserDefaults.Sorting,
+			Perm:         a.Settings.UserDefaults.Perm,
+			Commands:     a.Settings.UserDefaults.Commands,
+			HideDotfiles: a.Settings.UserDefaults.HideDotfiles,
 		}
 		u = a.GetUser(d)
 
@@ -164,7 +164,7 @@ func (a *HookAuth) SaveUser() (*users.User, error) {
 			return nil, fmt.Errorf("user: failed to mkdir user home dir: [%s]", userHome)
 		}
 		u.Scope = userHome
-		logger.Debug(fmt.Sprintf("user: %s, home dir: [%s].", u.Username, userHome))
+		log.Printf("user: %s, home dir: [%s].", u.Username, userHome)
 
 		err = a.Users.Save(u)
 		if err != nil {
@@ -209,7 +209,7 @@ func (a *HookAuth) GetUser(d *users.User) *users.User {
 			By:  d.Sorting.By,
 		},
 		Commands:     d.Commands,
-		ShowHidden:   d.ShowHidden,
+		HideDotfiles: d.HideDotfiles,
 		Perm:         perms,
 		LockPassword: true,
 	}
@@ -232,7 +232,7 @@ var validHookFields = []string{
 	"user.sorting.by",
 	"user.sorting.asc",
 	"user.commands",
-	"user.showHidden",
+	"user.hideDotfiles",
 	"user.perm.admin",
 	"user.perm.execute",
 	"user.perm.create",

backend/cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"flag"
 	"fmt"
+	"log"
 	"os"
 	"strings"
 
@@ -10,7 +11,6 @@ import (
 	"github.com/gtsteffaniak/filebrowser/backend/files"
 	fbhttp "github.com/gtsteffaniak/filebrowser/backend/http"
 	"github.com/gtsteffaniak/filebrowser/backend/img"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/storage"
 	"github.com/gtsteffaniak/filebrowser/backend/swagger/docs"
@@ -25,22 +25,21 @@ func getStore(config string) (*storage.Storage, bool) {
 	settings.Initialize(config)
 	store, hasDB, err := storage.InitializeDb(settings.Config.Server.Database)
 	if err != nil {
-		logger.Fatal(fmt.Sprintf("could not load db info: %v", err))
+		log.Fatal("could not load db info: ", err)
 	}
 	return store, hasDB
 }
 
 func generalUsage() {
 	fmt.Printf(`usage: ./filebrowser <command> [options]
-commands:
-	-h    	Print help
-	-c    	Print the default config file
-	version Print version information
-	set -u	Username and password for the new user
-	set -a	Create user as admin
-	set -s	Specify a user scope
-	set -h	Print this help message
-`)
+  commands:
+    -v   Print the version
+	-c    Print the default config file
+	set -u   Username and password for the new user
+	set -a   Create user as admin
+	set -s   Specify a user scope
+	set -h   Print this help message
+	` + "\n")
 }
 
 func StartFilebrowser() {
@@ -91,9 +90,9 @@ func StartFilebrowser() {
 			getStore(dbConfig)
 			// Create the user logic
 			if asAdmin {
-				logger.Info(fmt.Sprintf("Creating user as admin: %s\n", username))
+				log.Printf("Creating user as admin: %s\n", username)
 			} else {
-				logger.Info(fmt.Sprintf("Creating non-admin user: %s\n", username))
+				log.Printf("Creating user: %s\n", username)
 			}
 			newUser := users.User{
 				Username: username,
@@ -104,15 +103,14 @@ func StartFilebrowser() {
 			}
 			err = storage.CreateUser(newUser, asAdmin)
 			if err != nil {
-				logger.Fatal(fmt.Sprintf("could not create user: %v", err))
+				log.Fatal("Could not create user: ", err)
 			}
 			return
 		case "version":
-			fmt.Printf(`FileBrowser Quantum - A modern web-based file manager
-Version        : %v
-Commit         : %v
-Release Info   : https://github.com/gtsteffaniak/filebrowser/releases/tag/%v
-`, version.Version, version.CommitSHA, version.Version)
+			fmt.Println("FileBrowser Quantum - A modern web-based file manager")
+			fmt.Printf("Version        : %v\n", version.Version)
+			fmt.Printf("Commit         : %v\n", version.CommitSHA)
+			fmt.Printf("Release Info   : https://github.com/gtsteffaniak/filebrowser/releases/tag/%v\n", version.Version)
 			return
 		}
 	}
@@ -121,15 +119,16 @@ Release Info   : https://github.com/gtsteffaniak/filebrowser/releases/tag/%v
 	if !dbExists {
 		database = fmt.Sprintf("Creating new database    : %v", settings.Config.Server.Database)
 	}
+	log.Printf("Initializing FileBrowser Quantum (%v)\n", version.Version)
+	log.Printf("Using Config file        : %v", configPath)
+	log.Println("Embeded frontend         :", os.Getenv("FILEBROWSER_NO_EMBEDED") != "true")
+	log.Println(database)
 	sources := []string{}
 	for _, v := range settings.Config.Server.Sources {
 		sources = append(sources, v.Name+": "+v.Path)
 	}
-	logger.Info(fmt.Sprintf("Initializing FileBrowser Quantum (%v)", version.Version))
-	logger.Info(fmt.Sprintf("Using Config file        : %v", configPath))
-	logger.Debug(fmt.Sprintf("Embeded frontend         : %v", os.Getenv("FILEBROWSER_NO_EMBEDED") != "true"))
-	logger.Info(database)
-	logger.Info(fmt.Sprintf("Sources                  : %v", sources))
+	log.Println("Sources                  :", sources)
+
 	serverConfig := settings.Config.Server
 	swagInfo := docs.SwaggerInfo
 	swagInfo.BasePath = serverConfig.BaseURL
@@ -137,19 +136,19 @@ Release Info   : https://github.com/gtsteffaniak/filebrowser/releases/tag/%v
 	// initialize indexing and schedule indexing ever n minutes (default 5)
 	sourceConfigs := settings.Config.Server.Sources
 	if len(sourceConfigs) == 0 {
-		logger.Fatal("No sources configured, exiting...")
+		log.Fatal("No sources configured, exiting...")
 	}
 	for _, source := range sourceConfigs {
 		go files.Initialize(source)
 	}
 	if err := rootCMD(store, &serverConfig); err != nil {
-		logger.Fatal(fmt.Sprintf("Error starting filebrowser: %v", err))
+		log.Fatal("Error starting filebrowser:", err)
 	}
 }
 
 func rootCMD(store *storage.Storage, serverConfig *settings.Server) error {
 	if serverConfig.NumImageProcessors < 1 {
-		logger.Fatal("Image resize workers count could not be < 1")
+		log.Fatal("Image resize workers count could not be < 1")
 	}
 	imgSvc := img.New(serverConfig.NumImageProcessors)
 
@@ -161,7 +160,7 @@ func rootCMD(store *storage.Storage, serverConfig *settings.Server) error {
 		var err error
 		fileCache, err = diskcache.NewFileCache(cacheDir)
 		if err != nil {
-			logger.Fatal(fmt.Sprintf("failed to create file cache: %v", err))
+			log.Fatalf("failed to create file cache: %v", err)
 		}
 	} else {
 		// No-op cache if no cacheDir is specified

backend/cmd/rule_rm.go

@@ -0,0 +1,68 @@
+package cmd
+
+import (
+	"strconv"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/backend/settings"
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func init() {
+	rulesCmd.AddCommand(rulesRmCommand)
+	rulesRmCommand.Flags().Uint("index", 0, "index of rule to remove")
+	_ = rulesRmCommand.MarkFlagRequired("index")
+}
+
+var rulesRmCommand = &cobra.Command{
+	Use:   "rm <index> [index_end]",
+	Short: "Remove a global rule or user rule",
+	Long: `Remove a global rule or user rule. The provided index
+is the same that's printed when you run 'rules ls'. Note
+that after each removal/addition, the index of the
+commands change. So be careful when removing them after each
+other.
+
+You can also specify an optional parameter (index_end) so
+you can remove all commands from 'index' to 'index_end',
+including 'index_end'.`,
+	Args: func(cmd *cobra.Command, args []string) error {
+		if err := cobra.RangeArgs(1, 2)(cmd, args); err != nil { //nolint:gomnd
+			return err
+		}
+
+		for _, arg := range args {
+			if _, err := strconv.Atoi(arg); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	},
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		i, err := strconv.Atoi(args[0])
+		utils.CheckErr("strconv.Atoi", err)
+		f := i
+		if len(args) == 2 { //nolint:gomnd
+			f, err = strconv.Atoi(args[1])
+			utils.CheckErr("strconv.Atoi", err)
+		}
+
+		user := func(u *users.User) {
+			u.Rules = append(u.Rules[:i], u.Rules[f+1:]...)
+			err := store.Users.Save(u)
+			utils.CheckErr("store.Users.Save", err)
+		}
+
+		global := func(s *settings.Settings) {
+			s.Rules = append(s.Rules[:i], s.Rules[f+1:]...)
+			err := store.Settings.Save(s)
+			utils.CheckErr("store.Settings.Save", err)
+		}
+
+		runRules(store, cmd, user, global)
+	}),
+}

backend/cmd/rules.go

@@ -0,0 +1,86 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	"github.com/gtsteffaniak/filebrowser/backend/settings"
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func init() {
+	rulesCmd.PersistentFlags().StringP("username", "u", "", "username of user to which the rules apply")
+	rulesCmd.PersistentFlags().UintP("id", "i", 0, "id of user to which the rules apply")
+}
+
+var rulesCmd = &cobra.Command{
+	Use:   "rules",
+	Short: "Rules management utility",
+	Long: `On each subcommand you'll have available at least two flags:
+"username" and "id". You must either set only one of them
+or none. If you set one of them, the command will apply to
+an user, otherwise it will be applied to the global set or
+rules.`,
+	Args: cobra.NoArgs,
+}
+
+func runRules(st *storage.Storage, cmd *cobra.Command, usersFn func(*users.User), globalFn func(*settings.Settings)) {
+	id := getUserIdentifier(cmd.Flags())
+	if id != nil {
+		user, err := st.Users.Get("", id)
+		utils.CheckErr("st.Users.Get", err)
+
+		if usersFn != nil {
+			usersFn(user)
+		}
+
+		printRules(user.Rules, id)
+		return
+	}
+
+	s, err := st.Settings.Get()
+	utils.CheckErr("st.Settings.Get", err)
+
+	if globalFn != nil {
+		globalFn(s)
+	}
+
+	printRules(s.Rules, id)
+}
+
+func getUserIdentifier(flags *pflag.FlagSet) interface{} {
+	id := mustGetUint(flags, "id")
+	username := mustGetString(flags, "username")
+
+	if id != 0 {
+		return id
+	} else if username != "" {
+		return username
+	}
+
+	return nil
+}
+
+func printRules(rulez []users.Rule, id interface{}) {
+
+	for id, rule := range rulez {
+		fmt.Printf("(%d) ", id)
+		if rule.Regex {
+			if rule.Allow {
+				fmt.Printf("Allow Regex: \t%s\n", rule.Regexp.Raw)
+			} else {
+				fmt.Printf("Disallow Regex: \t%s\n", rule.Regexp.Raw)
+			}
+		} else {
+			if rule.Allow {
+				fmt.Printf("Allow Path: \t%s\n", rule.Path)
+			} else {
+				fmt.Printf("Disallow Path: \t%s\n", rule.Path)
+			}
+		}
+	}
+}

backend/cmd/rules_add.go

@@ -0,0 +1,59 @@
+package cmd
+
+import (
+	"regexp"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/backend/settings"
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func init() {
+	rulesCmd.AddCommand(rulesAddCmd)
+	rulesAddCmd.Flags().BoolP("allow", "a", false, "indicates this is an allow rule")
+	rulesAddCmd.Flags().BoolP("regex", "r", false, "indicates this is a regex rule")
+}
+
+var rulesAddCmd = &cobra.Command{
+	Use:   "add <path|expression>",
+	Short: "Add a global rule or user rule",
+	Long:  `Add a global rule or user rule.`,
+	Args:  cobra.ExactArgs(1),
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		allow := mustGetBool(cmd.Flags(), "allow")
+		regex := mustGetBool(cmd.Flags(), "regex")
+		exp := args[0]
+
+		if regex {
+			regexp.MustCompile(exp)
+		}
+
+		rule := users.Rule{
+			Allow: allow,
+			Regex: regex,
+		}
+
+		if regex {
+			rule.Regexp = &users.Regexp{Raw: exp}
+		} else {
+			rule.Path = exp
+		}
+
+		user := func(u *users.User) {
+			u.Rules = append(u.Rules, rule)
+			err := store.Users.Save(u)
+			utils.CheckErr("store.Users.Save", err)
+		}
+
+		global := func(s *settings.Settings) {
+			s.Rules = append(s.Rules, rule)
+			err := store.Settings.Save(s)
+			utils.CheckErr("store.Settings.Save", err)
+		}
+
+		runRules(store, cmd, user, global)
+	}),
+}

backend/cmd/rules_ls.go

@@ -0,0 +1,20 @@
+package cmd
+
+import (
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rulesCmd.AddCommand(rulesLsCommand)
+}
+
+var rulesLsCommand = &cobra.Command{
+	Use:   "ls",
+	Short: "List global rules or user specific rules",
+	Long:  `List global rules or user specific rules.`,
+	Args:  cobra.NoArgs,
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		runRules(store, cmd, nil, nil)
+	}),
+}

backend/cmd/users.go

@@ -0,0 +1,54 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"text/tabwriter"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+)
+
+var usersCmd = &cobra.Command{
+	Use:   "users",
+	Short: "Users management utility",
+	Long:  `Users management utility.`,
+	Args:  cobra.NoArgs,
+}
+
+func printUsers(usrs []*users.User) {
+	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) //nolint:gomnd
+	fmt.Fprintln(w, "ID\tUsername\tScope\tLocale\tV. Mode\tS.Click\tAdmin\tExecute\tCreate\tRename\tModify\tDelete\tShare\tDownload\tPwd Lock")
+
+	for _, u := range usrs {
+		fmt.Fprintf(w, "%d\t%s\t%s\t%s\t%s\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t%t\t\n",
+			u.ID,
+			u.Username,
+			u.Scope,
+			u.Locale,
+			u.ViewMode,
+			u.SingleClick,
+			u.Perm.Admin,
+			u.Perm.Execute,
+			u.Perm.Create,
+			u.Perm.Rename,
+			u.Perm.Modify,
+			u.Perm.Delete,
+			u.Perm.Share,
+			u.Perm.Download,
+			u.LockPassword,
+		)
+	}
+
+	w.Flush()
+}
+
+func parseUsernameOrID(arg string) (username string, id uint) {
+	id64, err := strconv.ParseUint(arg, 10, 64)
+	if err != nil {
+		return arg, 0
+	}
+	return "", uint(id64)
+}

backend/cmd/users_add.go

@@ -0,0 +1,42 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func init() {
+	usersCmd.AddCommand(usersAddCmd)
+}
+
+var usersAddCmd = &cobra.Command{
+	Use:   "add <username> <password>",
+	Short: "Create a new user",
+	Long:  `Create a new user and add it to the database.`,
+	Args:  cobra.ExactArgs(2), //nolint:gomnd
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		user := &users.User{
+			Username:     args[0],
+			Password:     args[1],
+			LockPassword: mustGetBool(cmd.Flags(), "lockPassword"),
+		}
+		servSettings, err := store.Settings.GetServer()
+		utils.CheckErr("store.Settings.GetServer()", 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 := store.Settings.Get()
+		utils.CheckErr("store.Settings.Get()", err)
+
+		userHome, err := s2.MakeUserDir(user.Username, user.Scope, servSettings.Root)
+		utils.CheckErr("s2.MakeUserDir", err)
+		user.Scope = userHome
+
+		err = store.Users.Save(user)
+		utils.CheckErr("store.Users.Save", err)
+		printUsers([]*users.User{user})
+	}),
+}

backend/cmd/users_export.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	usersCmd.AddCommand(usersExportCmd)
+}
+
+var usersExportCmd = &cobra.Command{
+	Use:   "export <path>",
+	Short: "Export all users to a file.",
+	Long: `Export all users to a json or yaml file. Please indicate the
+path to the file where you want to write the users.`,
+	Args: jsonYamlArg,
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		list, err := store.Users.Gets("")
+		utils.CheckErr("store.Users.Gets", err)
+
+		err = marshal(args[0], list)
+		utils.CheckErr("marshal", err)
+	}),
+}

backend/cmd/users_find.go

@@ -0,0 +1,53 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func init() {
+	usersCmd.AddCommand(usersFindCmd)
+	usersCmd.AddCommand(usersLsCmd)
+}
+
+var usersFindCmd = &cobra.Command{
+	Use:   "find <id|username>",
+	Short: "Find a user by username or id",
+	Long:  `Find a user by username or id. If no flag is set, all users will be printed.`,
+	Args:  cobra.ExactArgs(1),
+	Run:   findUsers,
+}
+
+var usersLsCmd = &cobra.Command{
+	Use:   "ls",
+	Short: "List all users.",
+	Args:  cobra.NoArgs,
+	Run:   findUsers,
+}
+
+var findUsers = cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+	var (
+		list []*users.User
+		user *users.User
+		err  error
+	)
+
+	if len(args) == 1 {
+		username, id := parseUsernameOrID(args[0])
+		if username != "" {
+			user, err = store.Users.Get("", username)
+		} else {
+			user, err = store.Users.Get("", id)
+		}
+
+		list = []*users.User{user}
+	} else {
+		list, err = store.Users.Gets("")
+	}
+
+	utils.CheckErr("findUsers", err)
+	printUsers(list)
+})

backend/cmd/users_import.go

@@ -0,0 +1,88 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"strconv"
+
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func init() {
+	usersCmd.AddCommand(usersImportCmd)
+	usersImportCmd.Flags().Bool("overwrite", false, "overwrite users with the same id/username combo")
+	usersImportCmd.Flags().Bool("replace", false, "replace the entire user base")
+}
+
+var usersImportCmd = &cobra.Command{
+	Use:   "import <path>",
+	Short: "Import users from a file",
+	Long: `Import users from a file. The path must be for a json or yaml
+file. You can use this command to import new users to your
+installation. For that, just don't place their ID on the files
+list or set it to 0.`,
+	Args: jsonYamlArg,
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		fd, err := os.Open(args[0])
+		utils.CheckErr("os.Open", err)
+		defer fd.Close()
+
+		list := []*users.User{}
+		err = unmarshal(args[0], &list)
+		utils.CheckErr("unmarshal", err)
+
+		if mustGetBool(cmd.Flags(), "replace") {
+			oldUsers, err := store.Users.Gets("")
+			utils.CheckErr("store.Users.Gets", err)
+
+			err = marshal("users.backup.json", list)
+			utils.CheckErr("marshal users.backup.json", err)
+
+			for _, user := range oldUsers {
+				err = store.Users.Delete(user.ID)
+				utils.CheckErr("store.Users.Delete", err)
+			}
+		}
+
+		overwrite := mustGetBool(cmd.Flags(), "overwrite")
+
+		for _, user := range list {
+			onDB, err := store.Users.Get("", user.ID)
+
+			// User exists in DB.
+			if err == nil {
+				if !overwrite {
+					newErr := errors.New("user " + strconv.Itoa(int(user.ID)) + " is already registered")
+					utils.CheckErr("", newErr)
+				}
+
+				// If the usernames mismatch, check if there is another one in the DB
+				// with the new username. If there is, print an error and cancel the
+				// operation
+				if user.Username != onDB.Username {
+					if conflictuous, err := store.Users.Get("", user.Username); err == nil { //nolint:govet
+						newErr := usernameConflictError(user.Username, conflictuous.ID, user.ID)
+						utils.CheckErr("usernameConflictError", newErr)
+					}
+				}
+			} else {
+				// If it doesn't exist, set the ID to 0 to automatically get a new
+				// one that make sense in this DB.
+				user.ID = 0
+			}
+
+			err = store.Users.Save(user)
+			utils.CheckErr("store.Users.Save", err)
+		}
+	}),
+}
+
+func usernameConflictError(username string, originalID, newID uint) error {
+	return fmt.Errorf(`can't import user with ID %d and username "%s" because the username is already registred with the user %d`,
+		newID, username, originalID)
+}

backend/cmd/users_rm.go

@@ -0,0 +1,33 @@
+package cmd
+
+import (
+	"log"
+
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	usersCmd.AddCommand(usersRmCmd)
+}
+
+var usersRmCmd = &cobra.Command{
+	Use:   "rm <id|username>",
+	Short: "Delete a user by username or id",
+	Long:  `Delete a user by username or id`,
+	Args:  cobra.ExactArgs(1),
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		username, id := parseUsernameOrID(args[0])
+		var err error
+
+		if username != "" {
+			err = store.Users.Delete(username)
+		} else {
+			err = store.Users.Delete(id)
+		}
+
+		utils.CheckErr("usersRmCmd", err)
+		log.Println("user deleted successfully")
+	}),
+}

backend/cmd/users_update.go

@@ -0,0 +1,40 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/users"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func init() {
+	usersCmd.AddCommand(usersUpdateCmd)
+}
+
+var usersUpdateCmd = &cobra.Command{
+	Use:   "update <id|username>",
+	Short: "Updates an existing user",
+	Long: `Updates an existing user. Set the flags for the
+options you want to change.`,
+	Args: cobra.ExactArgs(1),
+	Run: cobraCmd(func(cmd *cobra.Command, args []string, store *storage.Storage) {
+		username, id := parseUsernameOrID(args[0])
+
+		var (
+			err  error
+			user *users.User
+		)
+
+		if id != 0 {
+			user, err = store.Users.Get("", id)
+		} else {
+			user, err = store.Users.Get("", username)
+		}
+		utils.CheckErr("store.Users.Get", err)
+
+		err = store.Users.Update(user)
+		utils.CheckErr("store.Users.Update", err)
+		printUsers([]*users.User{user})
+	}),
+}

backend/cmd/utils.go

@@ -0,0 +1,88 @@
+package cmd
+
+import (
+	"encoding/json"
+	"errors"
+	"os"
+	"path/filepath"
+
+	"github.com/goccy/go-yaml"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+
+	"github.com/gtsteffaniak/filebrowser/backend/storage"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
+)
+
+func mustGetString(flags *pflag.FlagSet, flag string) string {
+	s, err := flags.GetString(flag)
+	utils.CheckErr("mustGetString", err)
+	return s
+}
+
+func mustGetBool(flags *pflag.FlagSet, flag string) bool {
+	b, err := flags.GetBool(flag)
+	utils.CheckErr("mustGetBool", err)
+	return b
+}
+
+func mustGetUint(flags *pflag.FlagSet, flag string) uint {
+	b, err := flags.GetUint(flag)
+	utils.CheckErr("mustGetUint", err)
+	return b
+}
+
+type cobraFunc func(cmd *cobra.Command, args []string)
+type pythonFunc func(cmd *cobra.Command, args []string, store *storage.Storage)
+
+func marshal(filename string, data interface{}) error {
+	fd, err := os.Create(filename)
+
+	utils.CheckErr("os.Create", err)
+	defer fd.Close()
+
+	switch ext := filepath.Ext(filename); ext {
+	case ".json":
+		encoder := json.NewEncoder(fd)
+		encoder.SetIndent("", "    ")
+		return encoder.Encode(data)
+	case ".yml", ".yaml": //nolint:goconst
+		_, err := yaml.Marshal(fd)
+		return err
+	default:
+		return errors.New("invalid format: " + ext)
+	}
+}
+
+func unmarshal(filename string, data interface{}) error {
+	fd, err := os.Open(filename)
+	utils.CheckErr("os.Open", err)
+	defer fd.Close()
+
+	switch ext := filepath.Ext(filename); ext {
+	case ".json":
+		return json.NewDecoder(fd).Decode(data)
+	case ".yml", ".yaml":
+		return yaml.NewDecoder(fd).Decode(data)
+	default:
+		return errors.New("invalid format: " + ext)
+	}
+}
+
+func jsonYamlArg(cmd *cobra.Command, args []string) error {
+	if err := cobra.ExactArgs(1)(cmd, args); err != nil {
+		return err
+	}
+
+	switch ext := filepath.Ext(args[0]); ext {
+	case ".json", ".yml", ".yaml":
+		return nil
+	default:
+		return errors.New("invalid format: " + ext)
+	}
+}
+
+func cobraCmd(fn pythonFunc) cobraFunc {
+	return func(cmd *cobra.Command, args []string) {
+	}
+}

backend/config.yaml

@@ -9,6 +9,7 @@ userDefaults:
   darkMode: true
   disableSettings: false
   scope: "."
+  hideDotfiles: true
   singleClick: false
   permissions:
     admin: false

backend/docker-config.yaml

@@ -1,2 +0,0 @@
-server:
-  root: "/srv"

backend/filebrowser-playwright.yaml

@@ -1,27 +0,0 @@
-server:
-  port: 80
-  baseURL:  "/"
-  root: "../frontend/tests/playwright-files"
-auth:
-  method: password
-  signup: false
-frontend:
-  name: "Graham's Filebrowser"
-  disableDefaultLinks: true
-  externalLinks:
-    - text: "A playwright test"
-      url: "https://playwright.dev/"
-      title: "Playwright"
-userDefaults:
-  darkMode: true
-  disableSettings: false
-  scope: "."
-  singleClick: false
-  permissions:
-    admin: false
-    create: false
-    rename: false
-    modify: false
-    delete: false
-    share: false
-    download: false

backend/files/checkLinuxStub.go

@@ -1,9 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package files
-
-func checkWindowsHidden(realpath string) bool {
-	// Non-Windows platforms don't support hidden attributes in the same way
-	return false
-}

backend/files/checkWindows.go

@@ -1,33 +0,0 @@
-//go:build windows
-// +build windows
-
-package files
-
-import (
-	"golang.org/x/sys/windows"
-)
-
-func checkWindowsHidden(realpath string) bool {
-	// Convert the realpath to a UTF-16 pointer
-	pointer, err := windows.UTF16PtrFromString(realpath)
-	if err != nil {
-		return false
-	}
-
-	// Get the file attributes
-	attributes, err := windows.GetFileAttributes(pointer)
-	if err != nil {
-		return false
-	}
-
-	// Check if the hidden attribute is set
-	if attributes&windows.FILE_ATTRIBUTE_HIDDEN != 0 {
-		return true
-	}
-
-	// Optional: Check for system attribute
-	if attributes&windows.FILE_ATTRIBUTE_SYSTEM != 0 {
-		return true
-	}
-	return false
-}

backend/files/conditions.go

@@ -2,7 +2,6 @@ package files
 
 import (
 	"mime"
-	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
@@ -53,17 +52,6 @@ var documentTypes = []string{
 	".fb2",  // FictionBook
 }
 
-var onlyOfficeSupported = []string{
-	".doc", ".docm", ".docx", ".dot", ".dotm", ".dotx", ".epub",
-	".fb2", ".fodt", ".htm", ".html", ".mht", ".mhtml", ".odt",
-	".ott", ".rtf", ".stw", ".sxw", ".txt", ".wps", ".wpt", ".xml",
-	".csv", ".et", ".ett", ".fods", ".ods", ".ots", ".sxc", ".xls",
-	".xlsb", ".xlsm", ".xlsx", ".xlt", ".xltm", ".xltx", ".dps",
-	".dpt", ".fodp", ".odp", ".otp", ".pot", ".potm", ".potx",
-	".pps", ".ppsm", ".ppsx", ".ppt", ".pptm", ".pptx", ".sxi",
-	".djvu", ".docxf", ".oform", ".oxps", ".pdf", ".xps",
-}
-
 // Text-based file extensions
 var textTypes = []string{
 	// Common Text Formats
@@ -268,13 +256,3 @@ func isArchive(extension string) bool {
 	}
 	return false
 }
-
-func isOnlyOffice(name string) bool {
-	extention := filepath.Ext(name)
-	for _, typefile := range onlyOfficeSupported {
-		if extention == typefile {
-			return true
-		}
-	}
-	return false
-}

backend/files/file.go

@@ -21,12 +21,9 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/gtsteffaniak/filebrowser/backend/cache"
 	"github.com/gtsteffaniak/filebrowser/backend/errors"
 	"github.com/gtsteffaniak/filebrowser/backend/fileutils"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/users"
-	"github.com/gtsteffaniak/filebrowser/backend/utils"
 )
 
 var (
@@ -35,33 +32,30 @@ var (
 )
 
 type ItemInfo struct {
-	Name    string    `json:"name"`     // name of the file
-	Size    int64     `json:"size"`     // length in bytes for regular files
-	ModTime time.Time `json:"modified"` // modification time
-	Type    string    `json:"type"`     // type of the file, either "directory" or a file mimetype
-	Hidden  bool      `json:"hidden"`   // whether the file is hidden
+	Name    string    `json:"name"`
+	Size    int64     `json:"size"`
+	ModTime time.Time `json:"modified"`
+	Type    string    `json:"type"`
 }
 
 // FileInfo describes a file.
 // reduced item is non-recursive reduced "Items", used to pass flat items array
 type FileInfo struct {
 	ItemInfo
-	Files   []ItemInfo `json:"files"`   // files in the directory
-	Folders []ItemInfo `json:"folders"` // folders in the directory
-	Path    string     `json:"path"`    // path scoped to the associated index
+	Files   []ItemInfo `json:"files"`
+	Folders []ItemInfo `json:"folders"`
+	Path    string     `json:"path"`
 }
 
 // for efficiency, a response will be a pointer to the data
 // extra calculated fields can be added here
 type ExtendedFileInfo struct {
 	*FileInfo
-	Content      string            `json:"content,omitempty"`      // text content of a file, if requested
-	Subtitles    []string          `json:"subtitles,omitempty"`    // subtitles for video files
-	Checksums    map[string]string `json:"checksums,omitempty"`    // checksums for the file
-	Token        string            `json:"token,omitempty"`        // token for the file -- used for sharing
-	OnlyOfficeId string            `json:"onlyOfficeId,omitempty"` // id for onlyoffice files
-	Source       string            `json:"source"`                 // associated index source for the file
-	RealPath     string            `json:"-"`
+	Content   string            `json:"content,omitempty"`
+	Subtitles []string          `json:"subtitles,omitempty"`
+	Checksums map[string]string `json:"checksums,omitempty"`
+	Token     string            `json:"token,omitempty"`
+	RealPath  string            `json:"-"`
 }
 
 // FileOptions are the options when getting a file info.
@@ -140,23 +134,9 @@ func FileInfoFaster(opts FileOptions) (ExtendedFileInfo, error) {
 	}
 	response.FileInfo = info
 	response.RealPath = realPath
-	if settings.Config.Integrations.OnlyOffice.Secret != "" && info.Type != "directory" && isOnlyOffice(info.Name) {
-		response.OnlyOfficeId = generateOfficeId(realPath)
-	}
 	return response, nil
 }
 
-func generateOfficeId(realPath string) string {
-	key, ok := cache.OnlyOffice.Get(realPath).(string)
-	if !ok {
-		timestamp := strconv.FormatInt(time.Now().UnixMilli(), 10)
-		documentKey := utils.HashSHA256(realPath + timestamp)
-		cache.OnlyOffice.Set(realPath, documentKey)
-		return documentKey
-	}
-	return key
-}
-
 // Checksum checksums a given File for a given User, using a specific
 // algorithm. The checksums data is saved on File object.
 func GetChecksum(fullPath, algo string) (map[string]string, error) {
@@ -213,7 +193,7 @@ func MoveResource(source, realsrc, realdst string, isSrcDir bool) error {
 		IsDir: isSrcDir,
 	})
 	if err != nil {
-		return fmt.Errorf("could not refresh index for source: %v", err)
+		return errors.ErrEmptyKey
 	}
 	refreshConfig := FileOptions{Path: realdst, IsDir: true}
 	if !isSrcDir {
@@ -221,7 +201,7 @@ func MoveResource(source, realsrc, realdst string, isSrcDir bool) error {
 	}
 	err = index.RefreshFileInfo(refreshConfig)
 	if err != nil {
-		return fmt.Errorf("could not refresh index for dest: %v", err)
+		return errors.ErrEmptyKey
 	}
 	return nil
 }

backend/files/file_test.go

@@ -1,6 +1,7 @@
 package files
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -73,6 +74,7 @@ func Test_GetRealPath(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			realPath, isDir, _ := idx.GetRealPath(tt.paths...)
+			fmt.Println(realPath, trimPrefix)
 			adjustedRealPath := strings.TrimPrefix(realPath, trimPrefix)
 			if tt.want.path != adjustedRealPath || tt.want.isDir != isDir {
 				t.Errorf("expected %v:%v but got: %v:%v", tt.want.path, tt.want.isDir, adjustedRealPath, isDir)

backend/files/indexingFiles.go

@@ -2,16 +2,14 @@ package files
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
-	"runtime"
 	"slices"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/gtsteffaniak/filebrowser/backend/cache"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/utils"
 )
@@ -54,11 +52,11 @@ func Initialize(source settings.Source) {
 
 	if !newIndex.Source.Config.Disabled {
 		time.Sleep(time.Second)
-		logger.Info("Initializing index and assessing file system complexity")
+		log.Println("Initializing index and assessing file system complexity")
 		newIndex.RunIndexing("/", false)
 		go newIndex.setupIndexingScanners()
 	} else {
-		logger.Debug("Indexing disabled for source: " + newIndex.Source.Name)
+		log.Println("Indexing disabled for source: ", newIndex.Source.Name)
 	}
 }
 
@@ -98,7 +96,7 @@ func (idx *Index) indexDirectory(adjustedPath string, quick, recursive bool) err
 		for _, item := range cacheDirItems {
 			err = idx.indexDirectory(combinedPath+item.Name, quick, true)
 			if err != nil {
-				logger.Error(fmt.Sprintf("error indexing directory %v : %v", combinedPath+item.Name, err))
+				fmt.Printf("error indexing directory %v : %v", combinedPath+item.Name, err)
 			}
 		}
 		return nil
@@ -122,16 +120,15 @@ func (idx *Index) indexDirectory(adjustedPath string, quick, recursive bool) err
 
 	// Process each file and directory in the current directory
 	for _, file := range files {
-		isHidden := isHidden(file, idx.Path+combinedPath)
+
 		isDir := file.IsDir()
 		fullCombined := combinedPath + file.Name()
-		if idx.shouldSkip(isDir, isHidden, fullCombined) {
+		if idx.shouldSkip(isDir, isHidden(file, ""), fullCombined) {
 			continue
 		}
 		itemInfo := &ItemInfo{
 			Name:    file.Name(),
 			ModTime: file.ModTime(),
-			Hidden:  isHidden,
 		}
 
 		// fix for .app files on macos which are technically directories, but we don't want to treat them as such
@@ -150,7 +147,7 @@ func (idx *Index) indexDirectory(adjustedPath string, quick, recursive bool) err
 				// Recursively index the subdirectory
 				err = idx.indexDirectory(dirPath, quick, recursive)
 				if err != nil {
-					logger.Error(fmt.Sprintf("Failed to index directory %s: %v", dirPath, err))
+					log.Printf("Failed to index directory %s: %v", dirPath, err)
 					continue
 				}
 			}
@@ -195,6 +192,7 @@ func (idx *Index) indexDirectory(adjustedPath string, quick, recursive bool) err
 }
 
 func (idx *Index) makeIndexPath(subPath string) string {
+	subPath = strings.ReplaceAll(subPath, "\\", "/")
 	if strings.HasPrefix(subPath, "./") {
 		subPath = strings.TrimPrefix(subPath, ".")
 	}
@@ -205,7 +203,6 @@ func (idx *Index) makeIndexPath(subPath string) string {
 	subPath = strings.TrimSuffix(subPath, "/")
 	// remove index prefix
 	adjustedPath := strings.TrimPrefix(subPath, idx.Source.Path)
-	adjustedPath = strings.ReplaceAll(adjustedPath, "\\", "/")
 	// remove trailing slash
 	adjustedPath = strings.TrimSuffix(adjustedPath, "/")
 	if !strings.HasPrefix(adjustedPath, "/") {
@@ -229,8 +226,8 @@ func (idx *Index) recursiveUpdateDirSizes(childInfo *FileInfo, previousSize int6
 func (idx *Index) GetRealPath(relativePath ...string) (string, bool, error) {
 	combined := append([]string{idx.Source.Path}, relativePath...)
 	joinedPath := filepath.Join(combined...)
-	isDir, _ := cache.RealPath.Get(joinedPath + ":isdir").(bool)
-	cached, ok := cache.RealPath.Get(joinedPath).(string)
+	isDir, _ := utils.RealPathCache.Get(joinedPath + ":isdir").(bool)
+	cached, ok := utils.RealPathCache.Get(joinedPath).(string)
 	if ok && cached != "" {
 		return cached, isDir, nil
 	}
@@ -242,8 +239,8 @@ func (idx *Index) GetRealPath(relativePath ...string) (string, bool, error) {
 	// Resolve symlinks and get the real path
 	realPath, isDir, err := resolveSymlinks(absolutePath)
 	if err == nil {
-		cache.RealPath.Set(joinedPath, realPath)
-		cache.RealPath.Set(joinedPath+":isdir", isDir)
+		utils.RealPathCache.Set(joinedPath, realPath)
+		utils.RealPathCache.Set(joinedPath+":isdir", isDir)
 	}
 	return realPath, isDir, err
 }
@@ -253,6 +250,7 @@ func (idx *Index) RefreshFileInfo(opts FileOptions) error {
 		Path:  opts.Path,
 		IsDir: opts.IsDir,
 	}
+
 	if !refreshOptions.IsDir {
 		refreshOptions.Path = idx.makeIndexPath(filepath.Dir(refreshOptions.Path))
 		refreshOptions.IsDir = true
@@ -284,18 +282,8 @@ func (idx *Index) RefreshFileInfo(opts FileOptions) error {
 	return nil
 }
 
-func isHidden(file os.FileInfo, srcPath string) bool {
-	// Check if the file starts with a dot (common on Unix systems)
-	if file.Name()[0] == '.' {
-		return true
-	}
-
-	if runtime.GOOS == "windows" {
-		return checkWindowsHidden(filepath.Join(srcPath, file.Name()))
-	}
-
-	// Default behavior for non-Windows systems
-	return false
+func isHidden(file os.FileInfo, realpath string) bool {
+	return file.Name()[0] == '.'
 }
 
 func (idx *Index) shouldSkip(isDir bool, isHidden bool, fullCombined string) bool {

backend/files/indexingSchedule.go

@@ -1,10 +1,8 @@
 package files
 
 import (
-	"fmt"
+	"log"
 	"time"
-
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 )
 
 // schedule in minutes
@@ -34,7 +32,7 @@ func (idx *Index) newScanner(origin string) {
 		}
 
 		// Log and sleep before indexing
-		logger.Debug(fmt.Sprintf("Next scan in %v", sleepTime))
+		log.Printf("Next scan in %v\n", sleepTime)
 		time.Sleep(sleepTime)
 
 		idx.scannerMu.Lock()
@@ -76,9 +74,9 @@ func (idx *Index) RunIndexing(origin string, quick bool) {
 	prevNumDirs := idx.NumDirs
 	prevNumFiles := idx.NumFiles
 	if quick {
-		logger.Debug("Starting quick scan")
+		log.Println("Starting quick scan")
 	} else {
-		logger.Debug("Starting full scan")
+		log.Println("Starting full scan")
 		idx.NumDirs = 0
 		idx.NumFiles = 0
 	}
@@ -87,9 +85,8 @@ func (idx *Index) RunIndexing(origin string, quick bool) {
 	// Perform the indexing operation
 	err := idx.indexDirectory("/", quick, true)
 	if err != nil {
-		logger.Error(fmt.Sprintf("Error during indexing: %v", err))
+		log.Printf("Error during indexing: %v", err)
 	}
-	firstRun := idx.LastIndexed == time.Time{}
 	// Update the LastIndexed time
 	idx.LastIndexed = time.Now()
 	idx.indexingTime = int(time.Since(startTime).Seconds())
@@ -105,20 +102,12 @@ func (idx *Index) RunIndexing(origin string, quick bool) {
 		} else {
 			idx.assessment = "normal"
 		}
-		if firstRun {
-			logger.Info(fmt.Sprintf("Index assessment         : complexity=%v directories=%v files=%v", idx.assessment, idx.NumDirs, idx.NumFiles))
-		} else {
-			logger.Debug(fmt.Sprintf("Index assessment         : complexity=%v directories=%v files=%v", idx.assessment, idx.NumDirs, idx.NumFiles))
-		}
+		log.Printf("Index assessment         : complexity=%v directories=%v files=%v \n", idx.assessment, idx.NumDirs, idx.NumFiles)
 		if idx.NumDirs != prevNumDirs || idx.NumFiles != prevNumFiles {
 			idx.FilesChangedDuringIndexing = true
 		}
 	}
-	if firstRun {
-		logger.Info(fmt.Sprintf("Time spent indexing      : %v seconds", idx.indexingTime))
-	} else {
-		logger.Debug(fmt.Sprintf("Time spent indexing      : %v seconds", idx.indexingTime))
-	}
+	log.Printf("Time Spent Indexing      : %v seconds\n", idx.indexingTime)
 }
 
 func (idx *Index) setupIndexingScanners() {

backend/files/indexing_test.go

@@ -91,6 +91,9 @@ func TestMakeIndexPath(t *testing.T) {
 		{"Trailing slash removed", "/test/", "/test"},
 		{"Subpath without root prefix", "/other/test", "/other/test"},
 		{"Complex nested paths", "/nested/path", "/nested/path"},
+		// Windows
+		{"Mixed slash", "/first\\second", "/first/second"},
+		{"Windows slash", "\\first\\second", "/first/second"},
 	}
 
 	for _, tt := range tests {
@@ -102,27 +105,6 @@ func TestMakeIndexPath(t *testing.T) {
 			}
 		})
 	}
-
-	tests = []struct {
-		name     string
-		subPath  string
-		expected string
-	}{
-		// Windows
-		{"Mixed slash", "/first\\second", "/first/second"},
-		{"Windows slash", "\\first\\second", "/first/second"},
-		{"Windows full path", "C:\\Users\\testfolder\\nestedfolder", "/testfolder/nestedfolder"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			idx := &Index{Source: settings.Source{Path: "C:\\Users"}}
-			result := idx.makeIndexPath(tt.subPath)
-			if result != tt.expected {
-				t.Errorf("makeIndexPath(%q)\ngot %q\nwant %q", tt.name, result, tt.expected)
-			}
-		})
-	}
 }
 
 func TestMakeIndexPathRoot(t *testing.T) {

backend/files/search.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/gtsteffaniak/filebrowser/backend/cache"
 	"github.com/gtsteffaniak/filebrowser/backend/utils"
 )
 
@@ -24,18 +23,18 @@ type SearchResult struct {
 func (idx *Index) Search(search string, scope string, sourceSession string) []SearchResult {
 	// Remove slashes
 	scope = idx.makeIndexPath(scope)
-	runningHash := utils.InsecureRandomIdentifier(4)
+	runningHash := utils.GenerateRandomHash(4)
 	sessionInProgress.Store(sourceSession, runningHash) // Store the value in the sync.Map
 	searchOptions := ParseSearch(search)
 	results := make(map[string]SearchResult, 0)
 	count := 0
 	var directories []string
-	cachedDirs, ok := cache.SearchResults.Get(idx.Source.Path + scope).([]string)
+	cachedDirs, ok := utils.SearchResultsCache.Get(idx.Source.Path + scope).([]string)
 	if ok {
 		directories = cachedDirs
 	} else {
 		directories = idx.getDirsInScope(scope)
-		cache.SearchResults.Set(idx.Source.Path+scope, directories)
+		utils.SearchResultsCache.Set(idx.Source.Path+scope, directories)
 	}
 	for _, searchTerm := range searchOptions.Terms {
 		if searchTerm == "" {

backend/fileutils/file.go

@@ -1,7 +1,6 @@
 package fileutils
 
 import (
-	"fmt"
 	"io"
 	"os"
 	"path"
@@ -12,46 +11,24 @@ import (
 // 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 {
-	fmt.Println("moving", src, dst)
 	if os.Rename(src, dst) == nil {
 		return nil
 	}
-	fmt.Println("copyfile instead", src, dst)
-
 	// fallback
 	err := CopyFile(src, dst)
 	if err != nil {
-		fmt.Println("ok it errored too", err)
-
 		_ = os.Remove(dst)
 		return err
 	}
-	fmt.Println("removing", src)
 	if err := os.Remove(src); err != nil {
 		return err
 	}
 	return nil
 }
 
-// CopyFile copies a file or directory from source to dest and returns an error if any.
+// CopyFile copies a file from source to dest and returns
+// an error if any.
 func CopyFile(source, dest string) error {
-	// Check if the source exists and whether it's a file or directory.
-	info, err := os.Stat(source)
-	if err != nil {
-		return err
-	}
-
-	if info.IsDir() {
-		// If the source is a directory, copy it recursively.
-		return copyDirectory(source, dest)
-	}
-
-	// If the source is a file, copy the file.
-	return copySingleFile(source, dest)
-}
-
-// copySingleFile handles copying a single file.
-func copySingleFile(source, dest string) error {
 	// Open the source file.
 	src, err := os.Open(source)
 	if err != nil {
@@ -59,7 +36,7 @@ func copySingleFile(source, dest string) error {
 	}
 	defer src.Close()
 
-	// Create the destination directory if needed.
+	// Makes the directory needed to create the dst file.
 	err = os.MkdirAll(filepath.Dir(dest), 0775) //nolint:gomnd
 	if err != nil {
 		return err
@@ -91,43 +68,6 @@ func copySingleFile(source, dest string) error {
 	return nil
 }
 
-// copyDirectory handles copying directories recursively.
-func copyDirectory(source, dest string) error {
-	// Create the destination directory.
-	err := os.MkdirAll(dest, 0775) //nolint:gomnd
-	if err != nil {
-		return err
-	}
-
-	// Read the contents of the source directory.
-	entries, err := os.ReadDir(source)
-	if err != nil {
-		return err
-	}
-
-	// Iterate over each entry in the directory.
-	for _, entry := range entries {
-		srcPath := filepath.Join(source, entry.Name())
-		destPath := filepath.Join(dest, entry.Name())
-
-		if entry.IsDir() {
-			// Recursively copy subdirectories.
-			err = copyDirectory(srcPath, destPath)
-			if err != nil {
-				return err
-			}
-		} else {
-			// Copy files.
-			err = copySingleFile(srcPath, destPath)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
 // CommonPrefix returns the common directory path of provided files.
 func CommonPrefix(sep byte, paths ...string) string {
 	// Handle special cases.

backend/go.mod

@@ -7,17 +7,18 @@ require (
 	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.15.15
+	github.com/goccy/go-yaml v1.15.13
 	github.com/golang-jwt/jwt/v4 v4.5.1
 	github.com/google/go-cmp v0.6.0
 	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/spf13/afero v1.11.0
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
 	github.com/swaggo/http-swagger v1.3.4
 	github.com/swaggo/swag v1.16.4
-	golang.org/x/crypto v0.32.0
+	golang.org/x/crypto v0.31.0
 	golang.org/x/image v0.23.0
-	golang.org/x/sys v0.29.0
 	golang.org/x/text v0.21.0
 )
 
@@ -34,6 +35,7 @@ require (
 	github.com/go-openapi/swag v0.23.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/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -41,8 +43,9 @@ require (
 	github.com/swaggo/files v1.0.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.etcd.io/bbolt v1.3.11 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/tools v0.29.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

backend/go.sum

@@ -6,6 +6,7 @@ github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863 h1:BRrxwOZBolJN4gIwv
 github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM=
 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/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=
@@ -46,8 +47,8 @@ github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9Z
 github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/goccy/go-yaml v1.15.15 h1:5turdzAlutS2Q7/QR/9R99Z1K0J00qDb4T0pHJcZ5ew=
-github.com/goccy/go-yaml v1.15.15/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/goccy/go-yaml v1.15.13 h1:Xd87Yddmr2rC1SLLTm2MNDcTjeO/GYo0JGiww6gSTDg=
+github.com/goccy/go-yaml v1.15.13/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
 github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
@@ -64,6 +65,8 @@ 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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -83,10 +86,15 @@ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+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/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/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 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=
@@ -106,8 +114,8 @@ go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
 go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
 golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
@@ -125,8 +133,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
@@ -145,8 +153,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/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.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -160,8 +168,8 @@ golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
-golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
+golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
+golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=

backend/http/auth.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	libError "errors"
 	"fmt"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -17,7 +18,6 @@ import (
 
 	"github.com/gtsteffaniak/filebrowser/backend/errors"
 	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/share"
 	"github.com/gtsteffaniak/filebrowser/backend/users"
@@ -46,18 +46,9 @@ func extractToken(r *http.Request) (string, error) {
 		}
 	}
 
-	auth := r.URL.Query().Get("auth")
-	if auth != "" {
-		hasToken = true
-		if strings.Count(auth, ".") == 2 {
-			return auth, nil
-		}
-	}
-
 	// Check for Authorization header
 	authHeader := r.Header.Get("Authorization")
 	if authHeader != "" {
-
 		hasToken = true
 		// Split the header to get "Bearer {token}"
 		parts := strings.Split(authHeader, " ")
@@ -67,6 +58,14 @@ func extractToken(r *http.Request) (string, error) {
 		}
 	}
 
+	auth := r.URL.Query().Get("auth")
+	if auth != "" {
+		hasToken = true
+		if strings.Count(auth, ".") == 2 {
+			return auth, nil
+		}
+	}
+
 	if hasToken {
 		return "", fmt.Errorf("invalid token provided")
 	}
@@ -130,12 +129,12 @@ func signupHandler(w http.ResponseWriter, r *http.Request) {
 
 	userHome, err := config.MakeUserDir(user.Username, user.Scope, files.RootPaths["default"])
 	if err != nil {
-		logger.Error(fmt.Sprintf("create user: failed to mkdir user home dir: [%s]", userHome))
+		log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
 	user.Scope = userHome
-	logger.Debug(fmt.Sprintf("new user: %s, home dir: [%s].", user.Username, userHome))
+	log.Printf("new user: %s, home dir: [%s].", user.Username, userHome)
 	err = store.Users.Save(&user)
 	if err == errors.ErrExist {
 		http.Error(w, http.StatusText(http.StatusConflict), http.StatusConflict)
@@ -152,8 +151,7 @@ func renewHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (in
 }
 
 func printToken(w http.ResponseWriter, _ *http.Request, user *users.User) (int, error) {
-
-	signed, err := makeSignedTokenAPI(user, "WEB_TOKEN_"+utils.InsecureRandomIdentifier(4), time.Hour*time.Duration(config.Auth.TokenExpirationHours), user.Perm)
+	signed, err := makeSignedTokenAPI(user, "WEB_TOKEN_"+utils.GenerateRandomHash(4), time.Hour*2, user.Perm)
 	if err != nil {
 		if strings.Contains(err.Error(), "key already exists with same name") {
 			return http.StatusConflict, err

backend/http/middleware.go

@@ -4,6 +4,7 @@ import (
 	"compress/gzip"
 	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 	"path/filepath"
 	"strings"
@@ -11,16 +12,15 @@ import (
 
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/runner"
+	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/users"
 )
 
 type requestContext struct {
 	user *users.User
 	*runner.Runner
-	raw   interface{}
-	token string
+	raw interface{}
 }
 
 type HttpResponse struct {
@@ -59,10 +59,11 @@ func withHashFileHelper(fn handleFunc) handleFunc {
 
 		// Get file information with options
 		file, err := FileInfoFasterFunc(files.FileOptions{
-			Path:    filepath.Join(user.Scope, link.Path+"/"+path),
-			Modify:  user.Perm.Modify,
-			Expand:  true,
-			Checker: user, // Call your checker function here
+			Path:       filepath.Join(user.Scope, link.Path+"/"+path),
+			Modify:     user.Perm.Modify,
+			Expand:     true,
+			ReadHeader: config.Server.TypeDetectionByHeader,
+			Checker:    user, // Call your checker function here
 		})
 		file.Token = link.Token
 		if err != nil {
@@ -93,7 +94,7 @@ func withAdminHelper(fn handleFunc) handleFunc {
 // Middleware to retrieve and authenticate user
 func withUserHelper(fn handleFunc) handleFunc {
 	return func(w http.ResponseWriter, r *http.Request, data *requestContext) (int, error) {
-		if config.Auth.Method == "noauth" {
+		if settings.Config.Auth.Method == "noauth" {
 			var err error
 			// Retrieve the user from the store and store it in the context
 			data.user, err = store.Users.Get(files.RootPaths["default"], "admin")
@@ -109,7 +110,6 @@ func withUserHelper(fn handleFunc) handleFunc {
 		if err != nil {
 			return http.StatusUnauthorized, err
 		}
-		data.token = tokenString
 
 		var tk users.AuthToken
 		token, err := jwt.ParseWithClaims(tokenString, &tk, keyFunc)
@@ -126,15 +126,11 @@ func withUserHelper(fn handleFunc) handleFunc {
 		if tk.Expires < time.Now().Add(time.Hour).Unix() {
 			w.Header().Add("X-Renew-Token", "true")
 		}
-
 		// Retrieve the user from the store and store it in the context
 		data.user, err = store.Users.Get(files.RootPaths["default"], tk.BelongsTo)
 		if err != nil {
 			return http.StatusInternalServerError, err
 		}
-
-		setUserInResponseWriter(w, data.user)
-
 		// Call the handler function, passing in the context
 		return fn(w, r, data)
 	}
@@ -176,14 +172,14 @@ func wrapHandler(fn handleFunc) http.HandlerFunc {
 			// Marshal the error response to JSON
 			errorBytes, marshalErr := json.Marshal(response)
 			if marshalErr != nil {
-				logger.Error(fmt.Sprintf("Error marshalling error response: %v", marshalErr))
+				log.Printf("Error marshalling error response: %v", marshalErr)
 				http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 				return
 			}
 
 			// Write the JSON error response
 			if _, writeErr := w.Write(errorBytes); writeErr != nil {
-				logger.Error(fmt.Sprintf("Error writing error response: %v", writeErr))
+				log.Printf("Error writing error response: %v", writeErr)
 			}
 			return
 		}
@@ -237,7 +233,6 @@ type ResponseWriterWrapper struct {
 	StatusCode  int
 	wroteHeader bool
 	PayloadSize int
-	User        string
 }
 
 // WriteHeader captures the status code and ensures it's only written once
@@ -260,16 +255,6 @@ func (w *ResponseWriterWrapper) Write(b []byte) (int, error) {
 	return w.ResponseWriter.Write(b)
 }
 
-// Helper function to set the user in the ResponseWriterWrapper
-func setUserInResponseWriter(w http.ResponseWriter, user *users.User) {
-	// Wrap the response writer to set the user field
-	if wrappedWriter, ok := w.(*ResponseWriterWrapper); ok {
-		if user != nil {
-			wrappedWriter.User = user.Username
-		}
-	}
-}
-
 // LoggingMiddleware logs each request and its status code.
 func LoggingMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -282,23 +267,30 @@ func LoggingMiddleware(next http.Handler) http.Handler {
 		// Call the next handler.
 		next.ServeHTTP(wrappedWriter, r)
 
+		// Determine the color based on the status code.
+		color := "\033[32m" // Default green color
+		if wrappedWriter.StatusCode >= 300 && wrappedWriter.StatusCode < 500 {
+			color = "\033[33m" // Yellow for client errors (4xx)
+		} else if wrappedWriter.StatusCode >= 500 {
+			color = "\033[31m" // Red for server errors (5xx)
+		}
+
 		// Capture the full URL path including the query parameters.
 		fullURL := r.URL.Path
 		if r.URL.RawQuery != "" {
 			fullURL += "?" + r.URL.RawQuery
 		}
-		truncUser := wrappedWriter.User
-		if len(truncUser) > 12 {
-			truncUser = truncUser[:10] + ".."
-		}
-		logger.Api(
-			fmt.Sprintf("%-7s | %3d | %-15s | %-12s | %-12s | \"%s\"",
-				r.Method,
-				wrappedWriter.StatusCode, // Captured status code
-				r.RemoteAddr,
-				truncUser,
-				time.Since(start).String(),
-				fullURL), wrappedWriter.StatusCode)
+
+		// Log the request, status code, and response size.
+		log.Printf("%s%-7s | %3d | %-15s | %-12s | \"%s\"%s",
+			color,
+			r.Method,
+			wrappedWriter.StatusCode, // Captured status code
+			r.RemoteAddr,
+			time.Since(start).String(),
+			fullURL,
+			"\033[0m", // Reset color
+		)
 	})
 }
 

backend/http/middleware_test.go

@@ -105,7 +105,7 @@ func TestWithAdminHelper(t *testing.T) {
 			data := &requestContext{
 				user: tc.user,
 			}
-			token, err := makeSignedTokenAPI(tc.user, "WEB_TOKEN_"+utils.InsecureRandomIdentifier(4), time.Hour*2, tc.user.Perm)
+			token, err := makeSignedTokenAPI(tc.user, "WEB_TOKEN_"+utils.GenerateRandomHash(4), time.Hour*2, tc.user.Perm)
 			if err != nil {
 				t.Fatalf("Error making token for request: %v", err)
 			}

backend/http/onlyOffice.go

@@ -1,208 +0,0 @@
-package http
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/golang-jwt/jwt/v4"
-	"github.com/gtsteffaniak/filebrowser/backend/cache"
-	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/settings"
-)
-
-const (
-	onlyOfficeStatusDocumentClosedWithChanges       = 2
-	onlyOfficeStatusDocumentClosedWithNoChanges     = 4
-	onlyOfficeStatusForceSaveWhileDocumentStillOpen = 6
-)
-
-type OnlyOfficeCallback struct {
-	ChangesURL string   `json:"changesurl,omitempty"`
-	Key        string   `json:"key,omitempty"`
-	Status     int      `json:"status,omitempty"`
-	URL        string   `json:"url,omitempty"`
-	Users      []string `json:"users,omitempty"`
-	UserData   string   `json:"userdata,omitempty"`
-}
-
-func onlyofficeClientConfigGetHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	if settings.Config.Integrations.OnlyOffice.Url == "" {
-		return http.StatusInternalServerError, errors.New("only-office integration must be configured in settings")
-	}
-
-	if !d.user.Perm.Modify {
-		return http.StatusForbidden, nil
-	}
-	encodedUrl := r.URL.Query().Get("url")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	// Decode the URL-encoded path
-	url, err := url.QueryUnescape(encodedUrl)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
-	}
-
-	// get path from url
-	pathParts := strings.Split(url, "/api/raw?files=/")
-	path := pathParts[len(pathParts)-1]
-	urlFirst := pathParts[0]
-	if settings.Config.Server.InternalUrl != "" {
-		urlFirst = settings.Config.Server.InternalUrl
-		replacement := strings.Split(url, "/api/raw")[0]
-		url = strings.Replace(url, replacement, settings.Config.Server.InternalUrl, 1)
-	}
-	fileInfo, err := files.FileInfoFaster(files.FileOptions{
-		Path:    filepath.Join(d.user.Scope, path),
-		Modify:  d.user.Perm.Modify,
-		Source:  source,
-		Expand:  false,
-		Checker: d.user,
-	})
-
-	if err != nil {
-		return errToStatus(err), err
-	}
-
-	id, err := getOnlyOfficeId(source, fileInfo.Path)
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	split := strings.Split(fileInfo.Name, ".")
-	fileType := split[len(split)-1]
-
-	theme := "light"
-	if d.user.DarkMode {
-		theme = "dark"
-	}
-
-	clientConfig := map[string]interface{}{
-		"document": map[string]interface{}{
-			"fileType": fileType,
-			"key":      id,
-			"title":    fileInfo.Name,
-			"url":      url + "&auth=" + d.token,
-			"permissions": map[string]interface{}{
-				"edit":     d.user.Perm.Modify,
-				"download": d.user.Perm.Download,
-				"print":    d.user.Perm.Download,
-			},
-		},
-		"editorConfig": map[string]interface{}{
-			"callbackUrl": fmt.Sprintf("%v/api/onlyoffice/callback?path=%v&auth=%v", urlFirst, path, d.token),
-			"user": map[string]interface{}{
-				"id":   strconv.FormatUint(uint64(d.user.ID), 10),
-				"name": d.user.Username,
-			},
-			"customization": map[string]interface{}{
-				"autosave":  true,
-				"forcesave": true,
-				"uiTheme":   theme,
-			},
-			"lang": d.user.Locale,
-			"mode": "edit",
-		},
-	}
-	if settings.Config.Integrations.OnlyOffice.Secret != "" {
-		token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims(clientConfig))
-		signature, err := token.SignedString([]byte(settings.Config.Integrations.OnlyOffice.Secret))
-		if err != nil {
-			return http.StatusInternalServerError, fmt.Errorf("failed to sign JWT")
-		}
-		clientConfig["token"] = signature
-	}
-	return renderJSON(w, r, clientConfig)
-}
-
-func onlyofficeCallbackHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
-	body, err := io.ReadAll(r.Body)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-
-	var data OnlyOfficeCallback
-	err = json.Unmarshal(body, &data)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-
-	encodedPath := r.URL.Query().Get("path")
-	source := r.URL.Query().Get("source")
-	if source == "" {
-		source = "default"
-	}
-	// Decode the URL-encoded path
-	path, err := url.QueryUnescape(encodedPath)
-	if err != nil {
-		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
-	}
-	if data.Status == onlyOfficeStatusDocumentClosedWithChanges ||
-		data.Status == onlyOfficeStatusDocumentClosedWithNoChanges {
-		// Refer to only-office documentation
-		// - https://api.onlyoffice.com/editors/coedit
-		// - https://api.onlyoffice.com/editors/callback
-		//
-		// When the document is fully closed by all editors,
-		// then the document key should no longer be re-used.
-		deleteOfficeId(source, path)
-	}
-
-	if data.Status == onlyOfficeStatusDocumentClosedWithChanges ||
-		data.Status == onlyOfficeStatusForceSaveWhileDocumentStillOpen {
-		if !d.user.Perm.Modify {
-			return http.StatusForbidden, nil
-		}
-
-		doc, err := http.Get(data.URL)
-		if err != nil {
-			return http.StatusInternalServerError, err
-		}
-		defer doc.Body.Close()
-
-		err = d.Runner.RunHook(func() error {
-			fileOpts := files.FileOptions{
-				Path:   path,
-				Source: source,
-			}
-			writeErr := files.WriteFile(fileOpts, doc.Body)
-			if writeErr != nil {
-				return writeErr
-			}
-			return nil
-		}, "save", path, "", d.user)
-
-		if err != nil {
-			return http.StatusInternalServerError, err
-		}
-	}
-
-	resp := map[string]int{
-		"error": 0,
-	}
-	return renderJSON(w, r, resp)
-}
-
-func getOnlyOfficeId(source, path string) (string, error) {
-	idx := files.GetIndex(source)
-	realpath, _, _ := idx.GetRealPath(path)
-	// error is intentionally ignored in order treat errors
-	// the same as a cache-miss
-	cachedDocumentKey, ok := cache.OnlyOffice.Get(realpath).(string)
-	if ok {
-		return cachedDocumentKey, nil
-	}
-	return "", fmt.Errorf("document key not found")
-}
-func deleteOfficeId(source, path string) {
-	idx := files.GetIndex(source)
-	realpath, _, _ := idx.GetRealPath(path)
-	cache.OnlyOffice.Delete(realpath)
-}

backend/http/preview.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/gtsteffaniak/filebrowser/backend/files"
 	"github.com/gtsteffaniak/filebrowser/backend/img"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 )
 
 type ImgService interface {
@@ -53,11 +52,12 @@ func previewHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (
 		return http.StatusBadRequest, fmt.Errorf("invalid request path")
 	}
 	response, err := files.FileInfoFaster(files.FileOptions{
-		Path:    filepath.Join(d.user.Scope, path),
-		Modify:  d.user.Perm.Modify,
-		Source:  source,
-		Expand:  true,
-		Checker: d.user,
+		Path:       filepath.Join(d.user.Scope, path),
+		Modify:     d.user.Perm.Modify,
+		Source:     source,
+		Expand:     true,
+		ReadHeader: config.Server.TypeDetectionByHeader,
+		Checker:    d.user,
 	})
 	fileInfo := response.FileInfo
 	if err != nil {
@@ -141,7 +141,7 @@ func createPreview(imgSvc ImgService, fileCache FileCache, file files.ExtendedFi
 	go func() {
 		cacheKey := previewCacheKey(file.RealPath, previewSize, file.FileInfo.ModTime)
 		if err := fileCache.Store(context.Background(), cacheKey, buf.Bytes()); err != nil {
-			logger.Error(fmt.Sprintf("failed to cache resized image: %v", err))
+			fmt.Printf("failed to cache resized image: %v", err)
 		}
 	}()
 

backend/http/public.go

@@ -15,7 +15,7 @@ import (
 func publicShareHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
 	file, ok := d.raw.(files.ExtendedFileInfo)
 	if !ok {
-		return http.StatusInternalServerError, fmt.Errorf("failed to assert type files.FileInfo")
+		return http.StatusInternalServerError, fmt.Errorf("failed to assert type *files.FileInfo")
 	}
 	file.Path = strings.TrimPrefix(file.Path, files.RootPaths["default"])
 	return renderJSON(w, r, file)
@@ -28,6 +28,23 @@ func publicUserGetHandler(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		http.Error(w, http.StatusText(status), status)
 	}
+
+}
+
+func publicDlHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int, error) {
+	file, ok := d.raw.(files.ExtendedFileInfo)
+	if !ok {
+		return http.StatusInternalServerError, fmt.Errorf("failed to assert type files.FileInfo")
+	}
+	if d.user == nil {
+		return http.StatusUnauthorized, fmt.Errorf("failed to get user")
+	}
+
+	if file.Type == "directory" {
+		return rawFilesHandler(w, r, d, []string{file.Path})
+	}
+
+	return rawFileHandler(w, r, file.FileInfo)
 }
 
 // health godoc

backend/http/raw.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
@@ -14,7 +15,6 @@ import (
 	"strings"
 
 	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 )
 
 func setContentDisposition(w http.ResponseWriter, r *http.Request, fileName string) {
@@ -45,25 +45,16 @@ func rawHandler(w http.ResponseWriter, r *http.Request, d *requestContext) (int,
 	if !d.user.Perm.Download {
 		return http.StatusAccepted, nil
 	}
-
-	filePrefix := ""
-	file, ok := d.raw.(files.ExtendedFileInfo)
-	if ok {
-		filePrefix = file.Path
-	}
 	encodedFiles := r.URL.Query().Get("files")
 	// Decode the URL-encoded path
 	files, err := url.QueryUnescape(encodedFiles)
 	if err != nil {
 		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
 	}
-	fileList := strings.Split(files, ",")
-	for i, f := range fileList {
-		fileList[i] = filepath.Join(filePrefix, f)
-	}
-	return rawFilesHandler(w, r, d, fileList)
+	return rawFilesHandler(w, r, d, strings.Split(files, ","))
 }
-func addFile(path string, d *requestContext, tarWriter *tar.Writer, zipWriter *zip.Writer, flatten bool) error {
+
+func addFile(path string, d *requestContext, tarWriter *tar.Writer, zipWriter *zip.Writer) error {
 	idx := files.GetIndex("default")
 	realPath, _, _ := idx.GetRealPath(d.user.Scope, path)
 	if !d.user.Check(realPath) {
@@ -74,36 +65,16 @@ func addFile(path string, d *requestContext, tarWriter *tar.Writer, zipWriter *z
 		return err
 	}
 
-	// Get the base name of the top-level folder or file
-	baseName := filepath.Base(realPath)
-
 	if info.IsDir() {
 		// Walk through directory contents
 		return filepath.Walk(realPath, func(filePath string, fileInfo os.FileInfo, err error) error {
 			if err != nil {
 				return err
 			}
-
-			// Calculate the relative path
-			relPath, err := filepath.Rel(realPath, filePath) // Use realPath directly
+			relPath, err := filepath.Rel(filepath.Dir(realPath), filePath) // Relative path including base dir
 			if err != nil {
 				return err
 			}
-
-			// Normalize for tar: convert \ to /
-			relPath = filepath.ToSlash(relPath)
-
-			// Skip adding `.` (current directory)
-			if relPath == "." {
-				return nil
-			}
-
-			// Prepend base folder name unless flatten is true
-			if !flatten {
-				relPath = filepath.Join(baseName, relPath)
-				relPath = filepath.ToSlash(relPath) // Ensure normalized separators
-			}
-
 			if fileInfo.IsDir() {
 				if tarWriter != nil {
 					header := &tar.Header{
@@ -124,8 +95,8 @@ func addFile(path string, d *requestContext, tarWriter *tar.Writer, zipWriter *z
 		})
 	}
 
-	// For a single file, use the base name as the archive path
-	return addSingleFile(realPath, baseName, zipWriter, tarWriter)
+	// Add a single file if it's not a directory
+	return addSingleFile(realPath, filepath.Base(realPath), zipWriter, tarWriter)
 }
 
 func addSingleFile(realPath, archivePath string, zipWriter *zip.Writer, tarWriter *tar.Writer) error {
@@ -141,12 +112,11 @@ func addSingleFile(realPath, archivePath string, zipWriter *zip.Writer, tarWrite
 	}
 
 	if tarWriter != nil {
-		header, err := tar.FileInfoHeader(info, "")
+		header, err := tar.FileInfoHeader(info, realPath)
 		if err != nil {
 			return err
 		}
-		// Ensure correct relative path
-		header.Name = filepath.ToSlash(archivePath)
+		header.Name = archivePath
 		if err = tarWriter.WriteHeader(header); err != nil {
 			return err
 		}
@@ -211,14 +181,12 @@ func rawFilesHandler(w http.ResponseWriter, r *http.Request, d *requestContext,
 	default:
 		return http.StatusInternalServerError, errors.New("format not implemented")
 	}
+
 	baseDirName := filepath.Base(filepath.Dir(realPath))
 	if baseDirName == "" || baseDirName == "/" {
 		baseDirName = "download"
 	}
-	if len(fileList) == 1 && isDir {
-		baseDirName = filepath.Base(realPath)
-	}
-	downloadFileName := url.PathEscape(baseDirName + extension)
+	downloadFileName := url.PathEscape(baseDirName + "." + algo)
 	w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+downloadFileName)
 	// Create the archive and stream it directly to the response
 	if extension == ".zip" {
@@ -238,12 +206,10 @@ func createZip(w io.Writer, d *requestContext, filenames ...string) error {
 	zipWriter := zip.NewWriter(w)
 	defer zipWriter.Close()
 
-	// Check if we have exactly one directory
-	//flatten := len(filenames) == 1
 	for _, fname := range filenames {
-		err := addFile(fname, d, nil, zipWriter, false)
+		err := addFile(fname, d, nil, zipWriter)
 		if err != nil {
-			logger.Error(fmt.Sprintf("Failed to add %s to ZIP: %v", fname, err))
+			log.Printf("Failed to add %s to ZIP: %v", fname, err)
 		}
 	}
 
@@ -257,12 +223,10 @@ func createTarGz(w io.Writer, d *requestContext, filenames ...string) error {
 	tarWriter := tar.NewWriter(gzWriter)
 	defer tarWriter.Close()
 
-	// Check if we have exactly one directory
-	//flatten := len(filenames) == 1
 	for _, fname := range filenames {
-		err := addFile(fname, d, tarWriter, nil, false)
+		err := addFile(fname, d, tarWriter, nil)
 		if err != nil {
-			logger.Error(fmt.Sprintf("Failed to add %s to TAR.GZ: %v", fname, err))
+			log.Printf("Failed to add %s to TAR.GZ: %v", fname, err)
 		}
 	}
 

backend/http/resource.go

@@ -13,10 +13,9 @@ import (
 
 	"github.com/shirou/gopsutil/v3/disk"
 
-	"github.com/gtsteffaniak/filebrowser/backend/cache"
 	"github.com/gtsteffaniak/filebrowser/backend/errors"
 	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
+	"github.com/gtsteffaniak/filebrowser/backend/utils"
 )
 
 // resourceGetHandler retrieves information about a resource.
@@ -46,12 +45,13 @@ func resourceGetHandler(w http.ResponseWriter, r *http.Request, d *requestContex
 		return http.StatusBadRequest, fmt.Errorf("invalid path encoding: %v", err)
 	}
 	fileInfo, err := files.FileInfoFaster(files.FileOptions{
-		Path:    filepath.Join(d.user.Scope, path),
-		Modify:  d.user.Perm.Modify,
-		Source:  source,
-		Expand:  true,
-		Checker: d.user,
-		Content: r.URL.Query().Get("content") == "true",
+		Path:       filepath.Join(d.user.Scope, path),
+		Modify:     d.user.Perm.Modify,
+		Source:     source,
+		Expand:     true,
+		ReadHeader: config.Server.TypeDetectionByHeader,
+		Checker:    d.user,
+		Content:    r.URL.Query().Get("content") == "true",
 	})
 	if err != nil {
 		return errToStatus(err), err
@@ -60,9 +60,7 @@ func resourceGetHandler(w http.ResponseWriter, r *http.Request, d *requestContex
 		return renderJSON(w, r, fileInfo)
 	}
 	if algo := r.URL.Query().Get("checksum"); algo != "" {
-		idx := files.GetIndex(source)
-		realPath, _, _ := idx.GetRealPath(d.user.Scope, path)
-		checksums, err := files.GetChecksum(realPath, algo)
+		checksums, err := files.GetChecksum(fileInfo.Path, algo)
 		if err == errors.ErrInvalidOption {
 			return http.StatusBadRequest, nil
 		} else if err != nil {
@@ -104,11 +102,12 @@ func resourceDeleteHandler(w http.ResponseWriter, r *http.Request, d *requestCon
 		return http.StatusForbidden, nil
 	}
 	fileOpts := files.FileOptions{
-		Path:    filepath.Join(d.user.Scope, path),
-		Source:  source,
-		Modify:  d.user.Perm.Modify,
-		Expand:  false,
-		Checker: d.user,
+		Path:       filepath.Join(d.user.Scope, path),
+		Source:     source,
+		Modify:     d.user.Perm.Modify,
+		Expand:     false,
+		ReadHeader: config.Server.TypeDetectionByHeader,
+		Checker:    d.user,
 	}
 	fileInfo, err := files.FileInfoFaster(fileOpts)
 	if err != nil {
@@ -116,7 +115,10 @@ func resourceDeleteHandler(w http.ResponseWriter, r *http.Request, d *requestCon
 	}
 
 	// delete thumbnails
-	delThumbs(r.Context(), fileCache, fileInfo)
+	err = delThumbs(r.Context(), fileCache, fileInfo)
+	if err != nil {
+		return errToStatus(err), err
+	}
 
 	err = files.DeleteFiles(source, fileInfo.RealPath, filepath.Dir(fileInfo.RealPath))
 	if err != nil {
@@ -182,7 +184,10 @@ func resourcePostHandler(w http.ResponseWriter, r *http.Request, d *requestConte
 			return http.StatusForbidden, nil
 		}
 
-		delThumbs(r.Context(), fileCache, fileInfo)
+		err = delThumbs(r.Context(), fileCache, fileInfo)
+		if err != nil {
+			return errToStatus(err), err
+		}
 	}
 	err = files.WriteFile(fileOpts, r.Body)
 	if err != nil {
@@ -230,11 +235,12 @@ func resourcePutHandler(w http.ResponseWriter, r *http.Request, d *requestContex
 	}
 
 	fileOpts := files.FileOptions{
-		Path:    filepath.Join(d.user.Scope, path),
-		Source:  source,
-		Modify:  d.user.Perm.Modify,
-		Expand:  false,
-		Checker: d.user,
+		Path:       filepath.Join(d.user.Scope, path),
+		Source:     source,
+		Modify:     d.user.Perm.Modify,
+		Expand:     false,
+		ReadHeader: config.Server.TypeDetectionByHeader,
+		Checker:    d.user,
 	}
 	err = files.WriteFile(fileOpts, r.Body)
 	return errToStatus(err), err
@@ -277,10 +283,10 @@ func resourcePatchHandler(w http.ResponseWriter, r *http.Request, d *requestCont
 		return errToStatus(err), err
 	}
 	if !d.user.Check(src) || !d.user.Check(dst) {
-		return http.StatusForbidden, fmt.Errorf("forbidden: user rules deny access to source or destination")
+		return http.StatusForbidden, nil
 	}
 	if dst == "/" || src == "/" {
-		return http.StatusForbidden, fmt.Errorf("forbidden: source or destination is attempting to modify root")
+		return http.StatusForbidden, nil
 	}
 
 	idx := files.GetIndex(source)
@@ -301,14 +307,12 @@ func resourcePatchHandler(w http.ResponseWriter, r *http.Request, d *requestCont
 	}
 	// Permission for overwriting the file
 	if overwrite && !d.user.Perm.Modify {
-		return http.StatusForbidden, fmt.Errorf("forbidden: user does not have permission to overwrite file")
+		return http.StatusForbidden, nil
 	}
-	err = d.Runner.RunHook(func() error {
+	err = d.RunHook(func() error {
 		return patchAction(r.Context(), action, realSrc, realDest, d, fileCache, isSrcDir, source)
 	}, action, realSrc, realDest, d.user)
-	if err != nil {
-		logger.Debug(fmt.Sprintf("Could not run patch action. src=%v dst=%v err=%v", realSrc, realDest, err))
-	}
+
 	return errToStatus(err), err
 }
 
@@ -328,11 +332,11 @@ func addVersionSuffix(source string) string {
 	return source
 }
 
-func delThumbs(ctx context.Context, fileCache FileCache, file files.ExtendedFileInfo) {
-	err := fileCache.Delete(ctx, previewCacheKey(file.RealPath, "small", file.FileInfo.ModTime))
-	if err != nil {
-		logger.Debug(fmt.Sprintf("Could not delete small thumbnail: %v", err))
+func delThumbs(ctx context.Context, fileCache FileCache, file files.ExtendedFileInfo) error {
+	if err := fileCache.Delete(ctx, previewCacheKey(file.RealPath, "small", file.FileInfo.ModTime)); err != nil {
+		return err
 	}
+	return nil
 }
 
 func patchAction(ctx context.Context, action, src, dst string, d *requestContext, fileCache FileCache, isSrcDir bool, index string) error {
@@ -344,6 +348,7 @@ func patchAction(ctx context.Context, action, src, dst string, d *requestContext
 		err := files.CopyResource(index, src, dst, isSrcDir)
 		return err
 	case "rename", "move":
+
 		if !d.user.Perm.Rename {
 			return errors.ErrPermissionDenied
 		}
@@ -361,7 +366,10 @@ func patchAction(ctx context.Context, action, src, dst string, d *requestContext
 		}
 
 		// delete thumbnails
-		delThumbs(ctx, fileCache, fileInfo)
+		err = delThumbs(ctx, fileCache, fileInfo)
+		if err != nil {
+			return err
+		}
 		return files.MoveResource(index, src, dst, isSrcDir)
 	default:
 		return fmt.Errorf("unsupported action %s: %w", action, errors.ErrInvalidRequestParams)
@@ -389,7 +397,7 @@ func diskUsage(w http.ResponseWriter, r *http.Request, d *requestContext) (int,
 	if source == "" {
 		source = "default"
 	}
-	value, ok := cache.DiskUsage.Get(source).(DiskUsageResponse)
+	value, ok := utils.DiskUsageCache.Get(source).(DiskUsageResponse)
 	if ok {
 		return renderJSON(w, r, &value)
 	}
@@ -407,7 +415,7 @@ func diskUsage(w http.ResponseWriter, r *http.Request, d *requestContext) (int,
 		Total: usage.Total,
 		Used:  usage.Used,
 	}
-	cache.DiskUsage.Set(source, latestUsage)
+	utils.DiskUsageCache.Set(source, latestUsage)
 	return renderJSON(w, r, &latestUsage)
 }
 

backend/http/router.go

@@ -5,11 +5,11 @@ import (
 	"embed"
 	"fmt"
 	"io/fs"
+	"log"
 	"net/http"
 	"os"
 	"text/template"
 
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/storage"
 	"github.com/gtsteffaniak/filebrowser/backend/version"
@@ -56,7 +56,7 @@ func StartHttp(Service ImgService, storage *storage.Storage, cache FileCache) {
 		// Embedded mode: Serve files from the embedded assets
 		assetFs, err = fs.Sub(assets, "embed")
 		if err != nil {
-			logger.Fatal("Could not embed frontend. Does dist exist?")
+			log.Fatal("Could not embed frontend. Does dist exist?")
 		}
 	} else {
 		assetFs = dirFS{Dir: http.Dir("http/dist")}
@@ -107,16 +107,13 @@ func StartHttp(Service ImgService, storage *storage.Storage, cache FileCache) {
 
 	// Public routes
 	api.HandleFunc("GET /public/publicUser", publicUserGetHandler)
-	api.HandleFunc("GET /public/dl", withHashFile(rawHandler))
+	api.HandleFunc("GET /public/dl", withHashFile(publicDlHandler))
 	api.HandleFunc("GET /public/share", withHashFile(publicShareHandler))
 
 	// Settings routes
 	api.HandleFunc("GET /settings", withAdmin(settingsGetHandler))
 	api.HandleFunc("PUT /settings", withAdmin(settingsPutHandler))
 
-	api.HandleFunc("GET /onlyoffice/config", withUser(onlyofficeClientConfigGetHandler))
-	api.HandleFunc("POST /onlyoffice/callback", withUser(onlyofficeCallbackHandler))
-
 	api.HandleFunc("GET /search", withUser(searchHandler))
 	apiPath := config.Server.BaseURL + "api"
 	router.Handle(apiPath+"/", http.StripPrefix(apiPath, api))
@@ -146,7 +143,7 @@ func StartHttp(Service ImgService, storage *storage.Storage, cache FileCache) {
 		// Load the TLS certificate and key
 		cer, err := tls.LoadX509KeyPair(config.Server.TLSCert, config.Server.TLSKey)
 		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not load certificate: %v", err))
+			log.Fatalf("could not load certificate: %v", err)
 		}
 
 		// Create a custom TLS listener
@@ -161,17 +158,17 @@ func StartHttp(Service ImgService, storage *storage.Storage, cache FileCache) {
 		// Listen on TCP and wrap with TLS
 		listener, err := tls.Listen("tcp", fmt.Sprintf(":%v", config.Server.Port), tlsConfig)
 		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not start TLS server: %v", err))
+			log.Fatalf("could not start TLS server: %v", err)
 		}
 		if config.Server.Port != 443 {
 			port = fmt.Sprintf(":%d", config.Server.Port)
 		}
 		// Build the full URL with host and port
 		fullURL := fmt.Sprintf("%s://localhost%s%s", scheme, port, config.Server.BaseURL)
-		logger.Info(fmt.Sprintf("Running at               : %s", fullURL))
+		log.Printf("Running at               : %s", fullURL)
 		err = http.Serve(listener, muxWithMiddleware(router))
 		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not start server: %v", err))
+			log.Fatalf("could not start server: %v", err)
 		}
 	} else {
 		// Set HTTP scheme and the default port for HTTP
@@ -181,10 +178,10 @@ func StartHttp(Service ImgService, storage *storage.Storage, cache FileCache) {
 		}
 		// Build the full URL with host and port
 		fullURL := fmt.Sprintf("%s://localhost%s%s", scheme, port, config.Server.BaseURL)
-		logger.Info(fmt.Sprintf("Running at               : %s", fullURL))
+		log.Printf("Running at               : %s", fullURL)
 		err := http.ListenAndServe(fmt.Sprintf(":%v", config.Server.Port), muxWithMiddleware(router))
 		if err != nil {
-			logger.Fatal(fmt.Sprintf("could not start server: %v", err))
+			log.Fatalf("could not start server: %v", err)
 		}
 	}
 }

backend/http/static.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/fs"
+	"log"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -11,7 +12,6 @@ import (
 	"text/template"
 
 	"github.com/gtsteffaniak/filebrowser/backend/auth"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/version"
 )
@@ -63,8 +63,6 @@ func handleWithStaticData(w http.ResponseWriter, r *http.Request, file, contentT
 		"EnableExec":            config.Server.EnableExec,
 		"ReCaptchaHost":         config.Auth.Recaptcha.Host,
 		"ExternalLinks":         config.Frontend.ExternalLinks,
-		"ExternalUrl":           strings.TrimSuffix(config.Server.ExternalUrl, "/"),
-		"OnlyOfficeUrl":         settings.Config.Integrations.OnlyOffice.Url,
 	}
 
 	if config.Frontend.Files != "" {
@@ -72,7 +70,7 @@ func handleWithStaticData(w http.ResponseWriter, r *http.Request, file, contentT
 		_, err := os.Stat(fPath) //nolint:govet
 
 		if err != nil && !os.IsNotExist(err) {
-			logger.Error(fmt.Sprintf("couldn't load custom styles: %v", err))
+			log.Printf("couldn't load custom styles: %v", err)
 		}
 
 		if err == nil {

backend/img/testdata

@@ -1 +0,0 @@
-../../frontend/tests/playwright-files/myfolder/testdata/

backend/logger/setup.go

@@ -1,141 +0,0 @@
-package logger
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"slices"
-	"strings"
-)
-
-// Logger wraps the standard log.Logger with log level functionality
-type Logger struct {
-	logger       *log.Logger
-	levels       []LogLevel
-	apiLevels    []LogLevel
-	stdout       bool
-	disabled     bool
-	debugEnabled bool
-	disabledAPI  bool
-	colors       bool
-}
-
-var stdOutLoggerExists bool
-
-// NewLogger creates a new Logger instance with separate file and stdout loggers
-func NewLogger(filepath string, levels, apiLevels []LogLevel, noColors bool) (*Logger, error) {
-	var fileWriter io.Writer = io.Discard
-	stdout := filepath == ""
-	// Configure file logging
-	if !stdout {
-		file, err := os.OpenFile(filepath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-		if err != nil {
-			return nil, fmt.Errorf("failed to open log file: %v", err)
-		}
-		fileWriter = file
-	}
-	var flags int
-	if slices.Contains(levels, DEBUG) {
-		flags |= log.Lshortfile
-	}
-	logger := log.New(os.Stdout, "", flags)
-	if filepath != "" {
-		logger = log.New(fileWriter, "", flags)
-	}
-	if stdout {
-		stdOutLoggerExists = true
-	}
-	return &Logger{
-		logger:       logger,
-		levels:       levels,
-		apiLevels:    apiLevels,
-		disabled:     slices.Contains(levels, DISABLED),
-		debugEnabled: slices.Contains(levels, DEBUG),
-		disabledAPI:  slices.Contains(apiLevels, DISABLED),
-		colors:       !noColors,
-		stdout:       stdout,
-	}, nil
-}
-
-// SetupLogger configures the logger with file and stdout options and their respective log levels
-func SetupLogger(output, levels, apiLevels string, noColors bool) error {
-	upperLevels := []LogLevel{}
-	for _, level := range SplitByMultiple(levels) {
-		if level == "" {
-			break
-		}
-		upperLevel := strings.ToUpper(level)
-		if upperLevel == "WARNING" || upperLevel == "WARN" {
-			upperLevel = "WARN "
-		}
-		if upperLevel == "INFO" {
-			upperLevel = "INFO "
-		}
-		// Convert level strings to LogLevel
-		level, ok := stringToLevel[upperLevel]
-		if !ok {
-			loggers = []*Logger{}
-			return fmt.Errorf("invalid file log level: %s", upperLevel)
-		}
-		upperLevels = append(upperLevels, level)
-	}
-	if len(upperLevels) == 0 {
-		upperLevels = []LogLevel{INFO, ERROR, WARNING}
-	}
-	upperApiLevels := []LogLevel{}
-	for _, level := range SplitByMultiple(apiLevels) {
-		if level == "" {
-			break
-		}
-		upperLevel := strings.ToUpper(level)
-		if upperLevel == "WARNING" || upperLevel == "WARN" {
-			upperLevel = "WARN "
-		}
-		if upperLevel == "INFO" {
-			upperLevel = "INFO "
-		}
-		// Convert level strings to LogLevel
-		level, ok := stringToLevel[strings.ToUpper(upperLevel)]
-		if !ok {
-			return fmt.Errorf("invalid api log level: %s", upperLevel)
-		}
-		upperApiLevels = append(upperApiLevels, level)
-	}
-	if len(upperApiLevels) == 0 {
-		upperApiLevels = []LogLevel{INFO, ERROR, WARNING}
-	}
-	if slices.Contains(upperLevels, DISABLED) && slices.Contains(upperApiLevels, DISABLED) {
-		// both disabled, not creating a logger
-		loggers = []*Logger{}
-		return nil
-	}
-	outputStdout := strings.ToUpper(output)
-	if outputStdout == "STDOUT" {
-		output = ""
-	}
-	if output == "" && stdOutLoggerExists {
-		// stdout logger already exists... don't create another
-		return fmt.Errorf("stdout logger already exists, could not set config levels=[%v] apiLevels=[%v] noColors=[%v]", levels, apiLevels, noColors)
-	}
-	// Create the logger
-	logger, err := NewLogger(output, upperLevels, upperApiLevels, noColors)
-	if err != nil {
-		loggers = []*Logger{}
-		return err
-	}
-	loggers = append(loggers, logger)
-	return nil
-}
-
-func SplitByMultiple(str string) []string {
-	delimiters := []rune{'|', ',', ' '}
-	return strings.FieldsFunc(str, func(r rune) bool {
-		for _, d := range delimiters {
-			if r == d {
-				return true
-			}
-		}
-		return false
-	})
-}

backend/logger/write.go

@@ -1,146 +0,0 @@
-package logger
-
-import (
-	"fmt"
-	"log"
-	"slices"
-	"time"
-)
-
-type LogLevel int
-
-const (
-	DISABLED LogLevel = 0
-	ERROR    LogLevel = 1
-	FATAL    LogLevel = 1
-	WARNING  LogLevel = 2
-	INFO     LogLevel = 3
-	DEBUG    LogLevel = 4
-	API      LogLevel = 10
-	// COLORS
-	RED    = "\033[31m"
-	GREEN  = "\033[32m"
-	YELLOW = "\033[33m"
-	GRAY   = "\033[37m"
-)
-
-var (
-	loggers []*Logger
-)
-
-type levelConsts struct {
-	INFO     string
-	FATAL    string
-	ERROR    string
-	WARNING  string
-	DEBUG    string
-	API      string
-	DISABLED string
-}
-
-var levels = levelConsts{
-	INFO:     "INFO ", // with consistent space padding
-	FATAL:    "FATAL",
-	ERROR:    "ERROR",
-	WARNING:  "WARN ", // with consistent space padding
-	DEBUG:    "DEBUG",
-	DISABLED: "DISABLED",
-	API:      "API",
-}
-
-// stringToLevel maps string representation to LogLevel
-var stringToLevel = map[string]LogLevel{
-	"DEBUG":    DEBUG,
-	"INFO ":    INFO, // with consistent space padding
-	"ERROR":    ERROR,
-	"DISABLED": DISABLED,
-	"WARN ":    WARNING, // with consistent space padding
-	"FATAL":    FATAL,
-	"API":      API,
-}
-
-// Log prints a log message if its level is greater than or equal to the logger's levels
-func Log(level string, msg string, prefix, api bool, color string) {
-	LEVEL := stringToLevel[level]
-	for _, logger := range loggers {
-		if api {
-			if logger.disabledAPI || !slices.Contains(logger.apiLevels, LEVEL) {
-				continue
-			}
-		} else {
-			if logger.disabled || !slices.Contains(logger.levels, LEVEL) {
-				continue
-			}
-		}
-		if logger.stdout && level == "FATAL" {
-			continue
-		}
-		writeOut := msg
-		formattedTime := time.Now().Format("2006/01/02 15:04:05")
-		if logger.colors && color != "" {
-			formattedTime = formattedTime + color
-		}
-		if prefix || logger.debugEnabled {
-			logger.logger.SetPrefix(fmt.Sprintf("%s [%s] ", formattedTime, level))
-		} else {
-			logger.logger.SetPrefix(formattedTime + " ")
-		}
-		if logger.colors && color != "" {
-			writeOut = writeOut + "\033[0m"
-		}
-		err := logger.logger.Output(3, writeOut) // 3 skips this function for correct file:line
-		if err != nil {
-			log.Printf("failed to log message '%v' with error `%v`", msg, err)
-		}
-	}
-}
-
-func Api(msg string, statusCode int) {
-	if statusCode >= 300 && statusCode < 500 {
-		Log(levels.WARNING, msg, false, true, YELLOW)
-	} else if statusCode >= 500 {
-		Log(levels.ERROR, msg, false, true, RED)
-	} else {
-		Log(levels.INFO, msg, false, true, GREEN)
-	}
-}
-
-// Helper methods for specific log levels
-func Debug(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.DEBUG, msg, true, false, GRAY)
-	} else {
-		log.Println("[DEBUG]: " + msg)
-	}
-}
-
-func Info(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.INFO, msg, false, false, "")
-	} else {
-		log.Println(msg)
-	}
-}
-
-func Warning(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.WARNING, msg, true, false, YELLOW)
-	} else {
-		log.Println("[WARN ]: " + msg)
-	}
-}
-
-func Error(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.ERROR, msg, true, false, RED)
-	} else {
-		log.Println("[ERROR] : ", msg)
-	}
-}
-
-func Fatal(msg string) {
-	if len(loggers) > 0 {
-		Log(levels.FATAL, msg, true, false, RED)
-	}
-	log.Fatal("[FATAL] : ", msg)
-}

backend/run_tests.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+## TEST file used by docker testing containers
+checkExit() {
+    if [ "$?" -ne 0 ];then
+        exit 1
+    fi
+}
+
+if command -v go &> /dev/null
+then
+    printf "\n == Running tests == \n"
+    go test -race -parallel -v ./...
+    checkExit
+else
+    echo "ERROR: unable to perform tests"
+    exit 1
+fi

backend/scripts/bump_version.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+
+if ! [ -x "$(command -v standard-version)" ]; then
+  echo "standard-version is not installed. please run 'npm i -g standard-version'"
+  exit 1
+fi
+
+standard-version --dry-run --skip
+read -p "Continue (y/n)? " -n 1 -r
+echo ;
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+	standard-version -s ;
+fi

backend/scripts/commitlint.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+
+if ! [ -x "$(command -v commitlint)" ]; then
+  echo "commitlint is not installed. please run 'npm i -g commitlint'"
+  exit 1
+fi
+
+for commit_hash in $(git log --pretty=format:%H origin/master..HEAD); do
+  commitlint -f ${commit_hash}~1 -t ${commit_hash}
+done

backend/settings/config.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	"github.com/goccy/go-yaml"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/users"
 	"github.com/gtsteffaniak/filebrowser/backend/version"
 )
@@ -16,66 +15,37 @@ import (
 var Config Settings
 
 func Initialize(configFile string) {
-	yamlData, err := loadConfigFile(configFile)
-	if err != nil && configFile != "config.yaml" {
-		logger.Fatal("Could not load specified config file: " + err.Error())
-	}
-	if err != nil {
-		logger.Warning(fmt.Sprintf("Could not load config file '%v', using default settings: %v", configFile, err))
-	}
+	yamlData := loadConfigFile(configFile)
 	Config = setDefaults()
-	err = yaml.Unmarshal(yamlData, &Config)
+	err := yaml.Unmarshal(yamlData, &Config)
 	if err != nil {
-		logger.Fatal(fmt.Sprintf("Error unmarshaling YAML data: %v", err))
+		log.Fatalf("Error unmarshaling YAML data: %v", err)
 	}
-	if len(Config.Server.Logging) == 0 {
-		Config.Server.Logging = []LogConfig{
-			{
-				Output: "stdout",
-			},
-		}
-	}
-	for _, logConfig := range Config.Server.Logging {
-		err = logger.SetupLogger(
-			logConfig.Output,
-			logConfig.Levels,
-			logConfig.ApiLevels,
-			logConfig.NoColors,
-		)
-		if err != nil {
-			log.Println("[ERROR] Failed to set up logger:", err)
-		}
-	}
-
 	Config.UserDefaults.Perm = Config.UserDefaults.Permissions
 	// Convert relative path to absolute path
 	if len(Config.Server.Sources) > 0 {
-		if Config.Server.Root != "" {
-			logger.Warning("`server.root` is configured but will be ignored in favor of `server.sources`")
-		}
-		// TODO allow multiple sources not named default
+		// TODO allow multipe sources not named default
 		for _, source := range Config.Server.Sources {
-			realPath, err2 := filepath.Abs(source.Path)
-			if err2 != nil {
-				logger.Fatal(fmt.Sprintf("Error getting source path: %v", err2))
+			realPath, err := filepath.Abs(source.Path)
+			if err != nil {
+				log.Fatalf("Error getting source path: %v", err)
 			}
 			source.Path = realPath
-			source.Name = "default"
-			Config.Server.Sources = []Source{source} // temporary set only one source
+			source.Name = "default"                   // Modify the local copy of the map value
+			Config.Server.Sources["default"] = source // Assign the modified value back to the map
 		}
 	} else {
-		realPath, err2 := filepath.Abs(Config.Server.Root)
-		if err2 != nil {
-			logger.Fatal(fmt.Sprintf("Error getting source path: %v", err2))
+		realPath, err := filepath.Abs(Config.Server.Root)
+		if err != nil {
+			log.Fatalf("Error getting source path: %v", err)
 		}
-		Config.Server.Sources = []Source{
-			{
+		Config.Server.Sources = map[string]Source{
+			"default": {
 				Name: "default",
 				Path: realPath,
 			},
 		}
 	}
-
 	baseurl := strings.Trim(Config.Server.BaseURL, "/")
 	if baseurl == "" {
 		Config.Server.BaseURL = "/"
@@ -83,6 +53,10 @@ func Initialize(configFile string) {
 		Config.Server.BaseURL = "/" + baseurl + "/"
 	}
 	if !Config.Frontend.DisableDefaultLinks {
+		Config.Frontend.ExternalLinks = append(Config.Frontend.ExternalLinks, ExternalLink{
+			Text: "FileBrowser Quantum",
+			Url:  "https://github.com/gtsteffaniak/filebrowser",
+		})
 		Config.Frontend.ExternalLinks = append(Config.Frontend.ExternalLinks, ExternalLink{
 			Text:  fmt.Sprintf("(%v)", version.Version),
 			Title: version.CommitSHA,
@@ -95,25 +69,26 @@ func Initialize(configFile string) {
 	}
 }
 
-func loadConfigFile(configFile string) ([]byte, error) {
+func loadConfigFile(configFile string) []byte {
 	// Open and read the YAML file
 	yamlFile, err := os.Open(configFile)
 	if err != nil {
-		return nil, err
+		log.Println(err)
+		os.Exit(1)
 	}
 	defer yamlFile.Close()
 
 	stat, err := yamlFile.Stat()
 	if err != nil {
-		return nil, err
+		log.Fatalf("error getting file information: %s", err.Error())
 	}
 
 	yamlData := make([]byte, stat.Size())
 	_, err = yamlFile.Read(yamlData)
 	if err != nil {
-		return nil, err
+		log.Fatalf("Error reading YAML data: %v", err)
 	}
-	return yamlData, nil
+	return yamlData
 }
 
 func setDefaults() Settings {
@@ -126,26 +101,24 @@ func setDefaults() Settings {
 			NumImageProcessors: 4,
 			BaseURL:            "",
 			Database:           "database.db",
+			Log:                "stdout",
 			Root:               ".",
 		},
 		Auth: Auth{
-			TokenExpirationHours: 2,
-			AdminUsername:        "admin",
-			AdminPassword:        "admin",
-			Method:               "password",
-			Signup:               false,
+			TokenExpirationTime: "2h",
+			AdminUsername:       "admin",
+			AdminPassword:       "admin",
+			Method:              "password",
+			Signup:              false,
 			Recaptcha: Recaptcha{
 				Host: "",
 			},
 		},
-		Frontend: Frontend{
-			Name: "FileBrowser Quantum",
-		},
 		UserDefaults: UserDefaults{
 			StickySidebar:   true,
 			Scope:           ".",
 			LockPassword:    false,
-			ShowHidden:      true,
+			HideDotfiles:    true,
 			DarkMode:        false,
 			DisableSettings: false,
 			ViewMode:        "normal",

backend/settings/config_test.go

@@ -35,7 +35,7 @@ func Test_loadConfigFile(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got, _ := loadConfigFile(tt.args.configFile); !reflect.DeepEqual(got, tt.want) {
+			if got := loadConfigFile(tt.args.configFile); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("loadConfigFile() = %v, want %v", got, tt.want)
 			}
 		})

backend/settings/dir.go

@@ -3,13 +3,12 @@ package settings
 import (
 	"errors"
 	"fmt"
+	"log"
 	"os"
 	"path"
 	"path/filepath"
 	"regexp"
 	"strings"
-
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 )
 
 var (
@@ -23,7 +22,7 @@ func (s *Settings) MakeUserDir(username, userScope, serverRoot string) (string,
 	if userScope == "" && s.Server.CreateUserDir {
 		username = cleanUsername(username)
 		if username == "" || username == "-" || username == "." {
-			logger.Error(fmt.Sprintf("create user: invalid user for home dir creation: [%s]", username))
+			log.Printf("create user: invalid user for home dir creation: [%s]", username)
 			return "", errors.New("invalid user for home dir creation")
 		}
 		userScope = path.Join(s.Server.UserHomeBasePath, username)

backend/settings/settings.go

@@ -52,7 +52,7 @@ func ApplyUserDefaults(u users.User) users.User {
 	u.Perm = Config.UserDefaults.Perm
 	u.Sorting = Config.UserDefaults.Sorting
 	u.Commands = Config.UserDefaults.Commands
-	u.ShowHidden = Config.UserDefaults.ShowHidden
+	u.HideDotfiles = Config.UserDefaults.HideDotfiles
 	u.DateFormat = Config.UserDefaults.DateFormat
 	return u
 }

backend/settings/settings_test.go

@@ -1,23 +1,22 @@
 package settings
 
 import (
-	"fmt"
+	"log"
 	"testing"
 
 	"github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 )
 
 func TestConfigLoadChanged(t *testing.T) {
-	yamlData, _ := loadConfigFile("./testingConfig.yaml")
+	yamlData := loadConfigFile("./testingConfig.yaml")
 	// Marshal the YAML data to a more human-readable format
 	newConfig := setDefaults()
 	Config := setDefaults()
 
 	err := yaml.Unmarshal(yamlData, &newConfig)
 	if err != nil {
-		logger.Fatal(fmt.Sprintf("Error unmarshaling YAML data: %v", err))
+		log.Fatalf("Error unmarshaling YAML data: %v", err)
 	}
 	// Use go-cmp to compare the two structs
 	if diff := cmp.Diff(newConfig, Config); diff == "" {
@@ -26,14 +25,14 @@ func TestConfigLoadChanged(t *testing.T) {
 }
 
 func TestConfigLoadSpecificValues(t *testing.T) {
-	yamlData, _ := loadConfigFile("./testingConfig.yaml")
+	yamlData := loadConfigFile("./testingConfig.yaml")
 	// Marshal the YAML data to a more human-readable format
 	newConfig := setDefaults()
 	Config := setDefaults()
 
 	err := yaml.Unmarshal(yamlData, &newConfig)
 	if err != nil {
-		logger.Fatal(fmt.Sprintf("Error unmarshaling YAML data: %v", err))
+		log.Fatalf("Error unmarshaling YAML data: %v", err)
 	}
 	testCases := []struct {
 		fieldName string
@@ -42,6 +41,7 @@ func TestConfigLoadSpecificValues(t *testing.T) {
 	}{
 		{"Auth.Method", Config.Auth.Method, newConfig.Auth.Method},
 		{"Auth.Method", Config.Auth.Method, newConfig.Auth.Method},
+		{"UserDefaults.HideDotfiles", Config.UserDefaults.HideDotfiles, newConfig.UserDefaults.HideDotfiles},
 		{"Server.Database", Config.Server.Database, newConfig.Server.Database},
 	}
 

backend/settings/structs.go

@@ -13,20 +13,19 @@ type Settings struct {
 	Frontend     Frontend            `json:"frontend"`
 	Users        []UserDefaults      `json:"users,omitempty"`
 	UserDefaults UserDefaults        `json:"userDefaults"`
-	Integrations Integrations        `json:"integrations"`
 }
 
 type Auth struct {
-	TokenExpirationHours int       `json:"tokenExpirationHours"`
-	Recaptcha            Recaptcha `json:"recaptcha"`
-	Header               string    `json:"header"`
-	Method               string    `json:"method"`
-	Command              string    `json:"command"`
-	Signup               bool      `json:"signup"`
-	Shell                string    `json:"shell"`
-	AdminUsername        string    `json:"adminUsername"`
-	AdminPassword        string    `json:"adminPassword"`
-	Key                  []byte    `json:"key"`
+	TokenExpirationTime string    `json:"tokenExpirationTime"`
+	Recaptcha           Recaptcha `json:"recaptcha"`
+	Header              string    `json:"header"`
+	Method              string    `json:"method"`
+	Command             string    `json:"command"`
+	Signup              bool      `json:"signup"`
+	Shell               string    `json:"shell"`
+	AdminUsername       string    `json:"adminUsername"`
+	AdminPassword       string    `json:"adminPassword"`
+	Key                 []byte    `json:"key"`
 }
 
 type Recaptcha struct {
@@ -36,48 +35,29 @@ type Recaptcha struct {
 }
 
 type Server struct {
-	NumImageProcessors int         `json:"numImageProcessors"`
-	Socket             string      `json:"socket"`
-	TLSKey             string      `json:"tlsKey"`
-	TLSCert            string      `json:"tlsCert"`
-	EnableThumbnails   bool        `json:"enableThumbnails"`
-	ResizePreview      bool        `json:"resizePreview"`
-	EnableExec         bool        `json:"enableExec"`
-	AuthHook           string      `json:"authHook"`
-	Port               int         `json:"port"`
-	BaseURL            string      `json:"baseURL"`
-	Logging            []LogConfig `json:"logging"`
-	Database           string      `json:"database"`
-	Root               string      `json:"root"`
-	UserHomeBasePath   string      `json:"userHomeBasePath"`
-	CreateUserDir      bool        `json:"createUserDir"`
-	Sources            []Source    `json:"sources"`
-	ExternalUrl        string      `json:"externalUrl"`
-	InternalUrl        string      `json:"internalUrl"` // used by integrations
-}
-
-type Integrations struct {
-	OnlyOffice OnlyOffice `json:"office"`
-}
-
-// onlyoffice secret is stored in the local.json file
-// docker exec <containerID> /var/www/onlyoffice/documentserver/npm/json -f /etc/onlyoffice/documentserver/local.json 'services.CoAuthoring.secret.session.string'
-type OnlyOffice struct {
-	Url    string `json:"url"`
-	Secret string `json:"secret"`
-}
-
-type LogConfig struct {
-	Levels    string `json:"levels"`
-	ApiLevels string `json:"apiLevels"`
-	Output    string `json:"output"`
-	NoColors  bool   `json:"noColors"`
-	Json      bool   `json:"json"`
+	NumImageProcessors    int               `json:"numImageProcessors"`
+	Socket                string            `json:"socket"`
+	TLSKey                string            `json:"tlsKey"`
+	TLSCert               string            `json:"tlsCert"`
+	EnableThumbnails      bool              `json:"enableThumbnails"`
+	ResizePreview         bool              `json:"resizePreview"`
+	EnableExec            bool              `json:"enableExec"`
+	TypeDetectionByHeader bool              `json:"typeDetectionByHeader"`
+	AuthHook              string            `json:"authHook"`
+	Port                  int               `json:"port"`
+	BaseURL               string            `json:"baseURL"`
+	Address               string            `json:"address"`
+	Log                   string            `json:"log"`
+	Database              string            `json:"database"`
+	Root                  string            `json:"root"`
+	UserHomeBasePath      string            `json:"userHomeBasePath"`
+	CreateUserDir         bool              `json:"createUserDir"`
+	Sources               map[string]Source `json:"sources"`
 }
 
 type Source struct {
-	Path   string      `json:"path"`
-	Name   string      `json:"name"`
+	Path   string `json:"path"`
+	Name   string
 	Config IndexConfig `json:"config"`
 }
 
@@ -130,10 +110,10 @@ type UserDefaults struct {
 		By  string `json:"by"`
 		Asc bool   `json:"asc"`
 	} `json:"sorting"`
-	Perm        users.Permissions `json:"perm"`
-	Permissions users.Permissions `json:"permissions"`
-	Commands    []string          `json:"commands,omitempty"`
-	ShowHidden  bool              `json:"showHidden"`
-	DateFormat  bool              `json:"dateFormat"`
-	ThemeColor  string            `json:"themeColor"`
+	Perm         users.Permissions `json:"perm"`
+	Permissions  users.Permissions `json:"permissions"`
+	Commands     []string          `json:"commands,omitempty"`
+	HideDotfiles bool              `json:"hideDotfiles"`
+	DateFormat   bool              `json:"dateFormat"`
+	ThemeColor   string            `json:"themeColor"`
 }

backend/settings/testingConfig.yaml

@@ -6,10 +6,13 @@ server:
   tlsCert: ""
   enableThumbnails: false
   resizePreview: true
+  typeDetectionByHeader: true
   port: 80
   baseURL: "/"
+  address: ""
+  log: "stdout"
   database: "mydb.db"
-  root: "."
+  root: "/srv"
 auth:
   recaptcha:
     host: ""
@@ -45,4 +48,5 @@ userDefaults:
     delete: true
     share: true
     download: true
+  hideDotfiles: false
   dateFormat: false

backend/storage/bolt/share.go

@@ -1,14 +1,13 @@
 package bolt
 
 import (
-	"fmt"
+	"log"
 	"time"
 
 	"github.com/asdine/storm/v3"
 	"github.com/asdine/storm/v3/q"
 
 	"github.com/gtsteffaniak/filebrowser/backend/errors"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/share"
 )
 
@@ -69,7 +68,7 @@ func (s shareBackend) Gets(path string, id uint) ([]*share.Link, error) {
 		if v[i].Expire < time.Now().Unix() {
 			err = s.Delete(v[i].PasswordHash)
 			if err != nil {
-				logger.Error(fmt.Sprintf("expired share could not be deleted: %v", err.Error()))
+				log.Println("expired share could not be deleted: ", err.Error())
 			}
 		} else {
 			filteredList = append(filteredList, v[i])

backend/storage/storage.go

@@ -2,6 +2,7 @@ package storage
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 
@@ -9,7 +10,6 @@ import (
 	"github.com/gtsteffaniak/filebrowser/backend/auth"
 	"github.com/gtsteffaniak/filebrowser/backend/errors"
 	"github.com/gtsteffaniak/filebrowser/backend/files"
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 	"github.com/gtsteffaniak/filebrowser/backend/settings"
 	"github.com/gtsteffaniak/filebrowser/backend/share"
 	"github.com/gtsteffaniak/filebrowser/backend/storage/bolt"
@@ -118,15 +118,15 @@ func CreateUser(userInfo users.User, asAdmin bool) error {
 	// create new home directory
 	userHome, err := settings.Config.MakeUserDir(newUser.Username, newUser.Scope, files.RootPaths["default"])
 	if err != nil {
-		logger.Error(fmt.Sprintf("create user: failed to mkdir user home dir: [%s]", userHome))
+		log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)
 		return err
 	}
 	newUser.Scope = userHome
-	logger.Debug(fmt.Sprintf("user: %s, home dir: [%s].", newUser.Username, userHome))
+	log.Printf("user: %s, home dir: [%s].", newUser.Username, userHome)
 	idx := files.GetIndex("default")
 	_, _, err = idx.GetRealPath(newUser.Scope)
 	if err != nil {
-		logger.Error(fmt.Sprintf("user path is not valid: %v", newUser.Scope))
+		log.Println("user path is not valid", newUser.Scope)
 		return nil
 	}
 	err = store.Users.Save(&newUser)

backend/swagger/docs/docs.go

@@ -1171,37 +1171,30 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "files": {
-                    "description": "files in the directory",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/files.ItemInfo"
                     }
                 },
                 "folders": {
-                    "description": "folders in the directory",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/files.ItemInfo"
                     }
                 },
                 "modified": {
-                    "description": "modification time",
                     "type": "string"
                 },
                 "name": {
-                    "description": "name of the file",
                     "type": "string"
                 },
                 "path": {
-                    "description": "path scoped to the associated index",
                     "type": "string"
                 },
                 "size": {
-                    "description": "length in bytes for regular files",
                     "type": "integer"
                 },
                 "type": {
-                    "description": "type of the file, either \"directory\" or a file mimetype",
                     "type": "string"
                 }
             }
@@ -1210,19 +1203,15 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "modified": {
-                    "description": "modification time",
                     "type": "string"
                 },
                 "name": {
-                    "description": "name of the file",
                     "type": "string"
                 },
                 "size": {
-                    "description": "length in bytes for regular files",
                     "type": "integer"
                 },
                 "type": {
-                    "description": "type of the file, either \"directory\" or a file mimetype",
                     "type": "string"
                 }
             }

backend/swagger/docs/swagger.json

@@ -1160,37 +1160,30 @@
             "type": "object",
             "properties": {
                 "files": {
-                    "description": "files in the directory",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/files.ItemInfo"
                     }
                 },
                 "folders": {
-                    "description": "folders in the directory",
                     "type": "array",
                     "items": {
                         "$ref": "#/definitions/files.ItemInfo"
                     }
                 },
                 "modified": {
-                    "description": "modification time",
                     "type": "string"
                 },
                 "name": {
-                    "description": "name of the file",
                     "type": "string"
                 },
                 "path": {
-                    "description": "path scoped to the associated index",
                     "type": "string"
                 },
                 "size": {
-                    "description": "length in bytes for regular files",
                     "type": "integer"
                 },
                 "type": {
-                    "description": "type of the file, either \"directory\" or a file mimetype",
                     "type": "string"
                 }
             }
@@ -1199,19 +1192,15 @@
             "type": "object",
             "properties": {
                 "modified": {
-                    "description": "modification time",
                     "type": "string"
                 },
                 "name": {
-                    "description": "name of the file",
                     "type": "string"
                 },
                 "size": {
-                    "description": "length in bytes for regular files",
                     "type": "integer"
                 },
                 "type": {
-                    "description": "type of the file, either \"directory\" or a file mimetype",
                     "type": "string"
                 }
             }

backend/swagger/docs/swagger.yaml

@@ -2,44 +2,33 @@ definitions:
   files.FileInfo:
     properties:
       files:
-        description: files in the directory
         items:
           $ref: '#/definitions/files.ItemInfo'
         type: array
       folders:
-        description: folders in the directory
         items:
           $ref: '#/definitions/files.ItemInfo'
         type: array
       modified:
-        description: modification time
         type: string
       name:
-        description: name of the file
         type: string
       path:
-        description: path scoped to the associated index
         type: string
       size:
-        description: length in bytes for regular files
         type: integer
       type:
-        description: type of the file, either "directory" or a file mimetype
         type: string
     type: object
   files.ItemInfo:
     properties:
       modified:
-        description: modification time
         type: string
       name:
-        description: name of the file
         type: string
       size:
-        description: length in bytes for regular files
         type: integer
       type:
-        description: type of the file, either "directory" or a file mimetype
         type: string
     type: object
   files.SearchResult:

backend/users/users.go

@@ -52,7 +52,7 @@ type User struct {
 	Commands        []string             `json:"commands"`
 	Rules           []Rule               `json:"rules"`
 	ApiKeys         map[string]AuthToken `json:"apiKeys,omitempty"`
-	ShowHidden      bool                 `json:"showHidden"`
+	HideDotfiles    bool                 `json:"hideDotfiles"`
 	DateFormat      bool                 `json:"dateFormat"`
 	GallerySize     int                  `json:"gallerySize"`
 	ThemeColor      string               `json:"themeColor"`

backend/utils/cache.go

@@ -1,4 +1,4 @@
-package cache
+package utils
 
 import (
 	"sync"
@@ -6,13 +6,12 @@ import (
 )
 
 var (
-	DiskUsage     = NewCache(30*time.Second, 24*time.Hour)
-	RealPath      = NewCache(48*time.Hour, 72*time.Hour)
-	SearchResults = NewCache(15*time.Second, time.Hour)
-	OnlyOffice    = NewCache(48*time.Hour, 1*time.Hour)
+	DiskUsageCache     = newCache(30*time.Second, 24*time.Hour)
+	RealPathCache      = newCache(48*time.Hour, 72*time.Hour)
+	SearchResultsCache = newCache(15*time.Second, time.Hour)
 )
 
-func NewCache(expires time.Duration, cleanup time.Duration) *KeyCache {
+func newCache(expires time.Duration, cleanup time.Duration) *KeyCache {
 	newCache := KeyCache{
 		data:         make(map[string]cachedValue),
 		expiresAfter: expires, // default
@@ -41,12 +40,6 @@ func (c *KeyCache) Set(key string, value interface{}) {
 	}
 }
 
-func (c *KeyCache) Delete(key string) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	delete(c.data, key)
-}
-
 func (c *KeyCache) SetWithExp(key string, value interface{}, exp time.Duration) {
 	c.mu.Lock()
 	defer c.mu.Unlock()

backend/utils/main.go

@@ -2,20 +2,17 @@ package utils
 
 import (
 	"crypto/rand"
-	"crypto/sha256"
-	"encoding/hex"
 	"fmt"
+	"log"
 	math "math/rand"
 	"reflect"
 	"strings"
 	"time"
-
-	"github.com/gtsteffaniak/filebrowser/backend/logger"
 )
 
 func CheckErr(source string, err error) {
 	if err != nil {
-		logger.Fatal(fmt.Sprintf("%s: %v", source, err))
+		log.Fatalf("%s: %v", source, err)
 	}
 }
 
@@ -36,7 +33,7 @@ func CapitalizeFirst(s string) string {
 	return strings.ToUpper(string(s[0])) + s[1:]
 }
 
-func InsecureRandomIdentifier(length int) string {
+func GenerateRandomHash(length int) string {
 	const charset = "abcdefghijklmnopqrstuvwxyz0123456789"
 	math.New(math.NewSource(time.Now().UnixNano()))
 	result := make([]byte, length)
@@ -52,7 +49,7 @@ func PrintStructFields(v interface{}) {
 
 	// Ensure the input is a struct
 	if val.Kind() != reflect.Struct {
-		logger.Debug("Provided value is not a struct")
+		fmt.Println("Provided value is not a struct")
 		return
 	}
 
@@ -69,7 +66,7 @@ func PrintStructFields(v interface{}) {
 			fieldValue = fieldValue[:100] + "..."
 		}
 
-		logger.Debug(fmt.Sprintf("Field: %s, %s\n", fieldType.Name, fieldValue))
+		fmt.Printf("Field: %s, %s\n", fieldType.Name, fieldValue)
 	}
 }
 
@@ -87,8 +84,3 @@ func GetParentDirectoryPath(path string) string {
 	}
 	return path[:lastSlash]
 }
-
-func HashSHA256(data string) string {
-	bytes := sha256.Sum256([]byte(data))
-	return hex.EncodeToString(bytes[:])
-}

frontend/global-setup.ts

@@ -1,20 +0,0 @@
-import { Browser, firefox, expect, Page } from "@playwright/test";
-
-
-async function globalSetup() {
-    const browser: Browser = await firefox.launch();
-    const context = await browser.newContext();
-    const page: Page = await context.newPage();
-    await page.goto("http://127.0.0.1/login");
-    await page.getByPlaceholder("Username").fill("admin");
-    await page.getByPlaceholder("Password").fill("admin");
-    await page.getByRole("button", { name: "Login" }).click();
-    await page.waitForURL("**/files/", { timeout: 100 });
-    let cookies = await context.cookies();
-    expect(cookies.find((c) => c.name == "auth")?.value).toBeDefined();
-    await expect(page).toHaveTitle("Graham's Filebrowser - Files - playwright-files");
-    await page.context().storageState({ path: "./loginAuth.json" });
-    await browser.close();
-}
-
-export default globalSetup

frontend/package.json

@@ -17,10 +17,10 @@
     "lint": "eslint --ext .js,.vue,ts src",
     "lint:fix": "eslint --fix src/",
     "format": "prettier --write .",
+    "integration-test": "npx playwright test",
     "test": "vitest run "
   },
   "dependencies": {
-    "@onlyoffice/document-editor-vue": "^1.4.0",
     "ace-builds": "^1.24.2",
     "clipboard": "^2.0.4",
     "css-vars-ponyfill": "^2.4.3",
@@ -33,8 +33,8 @@
     "vue-router": "^4.3.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.49.1",
     "@intlify/unplugin-vue-i18n": "^4.0.0",
+    "@playwright/test": "^1.42.1",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vue/eslint-config-typescript": "^13.0.0",
     "eslint": "^8.57.0",

frontend/playwright.config.ts

@@ -10,23 +10,19 @@ import { defineConfig, devices } from "@playwright/test";
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-  globalSetup: "./global-setup",
-  timeout: 6000,
   testDir: "./tests",
   /* Run tests in files in parallel */
-  fullyParallel: false,
+  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: Boolean(process.env.CI),
   /* Retry on CI only */
-  retries: 2,
+  retries: process.env.CI ? 2 : 0,
   /* Opt out of parallel tests on CI. */
-  workers: 1, // required for now! todo parallel some tests
+  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: {
-    actionTimeout: 5000,
-    storageState: "loginAuth.json",
     /* Base URL to use in actions like `await page.goto('/')`. */
     baseURL: "http://127.0.0.1",
 
@@ -44,4 +40,4 @@ export default defineConfig({
       use: { ...devices["Desktop Firefox"] },
     },
   ],
-});
+});

frontend/public/index.html

@@ -13,7 +13,7 @@
 
   <link rel="icon" type="image/png" sizes="256x256" href="{{ .StaticURL }}/img/icons/favicon-256x256.png">
 
-  <!--<link href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Symbols+Outlined" rel="stylesheet">-->
+  <link href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Symbols+Outlined" rel="stylesheet">
 
   <!-- Add to home screen for Android and modern mobile browsers -->
   <link rel="manifest" id="manifestPlaceholder" crossorigin="use-credentials">
@@ -32,7 +32,7 @@
   <script>
     window.FileBrowser = JSON.parse('{{ .globalVars }}');
     var dynamicManifest = {
-      "name": window.FileBrowser.Name || 'FileBrowser Quantum',
+      "name": window.FileBrowser.Name || '',
       "icons": [
         {
           "src": window.location.origin + "{{ .StaticURL }}/img/icons/android-chrome-256x256.png",

frontend/src/api/files.js

@@ -2,7 +2,6 @@ import { fetchURL, adjustedData } from "./utils";
 import { removePrefix, getApiPath } from "@/utils/url.js";
 import { state } from "@/store";
 import { notify } from "@/notify";
-import { externalUrl } from "@/utils/constants";
 
 // Notify if errors occur
 export async function fetchFiles(url, content = false) {
@@ -126,64 +125,47 @@ export async function post(url, content = "", overwrite = false, onupload) {
 }
 
 export async function moveCopy(items, action = "copy", overwrite = false, rename = false) {
+  let promises = [];
   let params = {
     overwrite: overwrite,
     action: action,
     rename: rename,
-  };
+  }
   try {
-    // Create an array of fetch calls
-    let promises = items.map((item) => {
+    for (let item of items) {
       let toPath = encodeURIComponent(removePrefix(decodeURI(item.to), "files"));
       let fromPath = encodeURIComponent(removePrefix(decodeURI(item.from), "files"));
-      let localParams = { ...params, destination: toPath, from: fromPath };
+      let localParams = { ...params };
+      localParams.destination = toPath;
+      localParams.from = fromPath;
       const apiPath = getApiPath("api/resources", localParams);
-      return fetch(apiPath, { method: "PATCH" }).then((response) => {
-        if (!response.ok) {
-          // Throw an error if the fetch fails
-          return response.text().then((text) => {
-            throw new Error(`Failed to move/copy: ${text || response.statusText}`);
-          });
-        }
-        return response;
-      });
-    });
+      promises.push(fetch(apiPath, { method: "PATCH" }));
+    }
+    return promises;
 
-    // Await all promises and ensure errors propagate
-    await Promise.all(promises);
   } catch (err) {
     notify.showError(err.message || "Error moving/copying resources");
-    throw err; // Re-throw the error to propagate it back to the caller
+    throw err;
   }
 }
 
-
-export async function checksum(path, algo) {
+export async function checksum(url, algo) {
   try {
-    const params = {
-      path: encodeURIComponent(removePrefix(path, "files")),
-      checksum: algo,
-    };
-    const apiPath = getApiPath("api/resources", params);
-    const res = await fetchURL(apiPath);
-    const data = await res.json();
-    return data.checksums[algo];
+    const data = await resourceAction(`${url}?checksum=${algo}`, "GET");
+    return (await data.json()).checksums[algo];
   } catch (err) {
     notify.showError(err.message || "Error fetching checksum");
     throw err;
   }
 }
 
-export function getDownloadURL(path, inline, useExternal) {
+export function getDownloadURL(path, inline) {
   try {
     const params = {
       files: encodeURIComponent(removePrefix(decodeURI(path),"files")),
       ...(inline && { inline: "true" }),
     };
     const apiPath = getApiPath("api/raw", params);
-    if (externalUrl && useExternal) {
-      return externalUrl+apiPath
-    }
     return window.origin+apiPath
   } catch (err) {
     notify.showError(err.message || "Error getting download URL");

frontend/src/api/share.js

@@ -1,7 +1,6 @@
 import { fetchURL, fetchJSON, adjustedData } from "./utils";
 import { notify } from "@/notify";
 import { getApiPath } from "@/utils/url.js";
-import { externalUrl } from "@/utils/constants";
 
 export async function list() {
   const apiPath = getApiPath("api/shares");
@@ -42,8 +41,5 @@ export async function create(path, password = "", expires = "", unit = "hours")
 }
 
 export function getShareURL(share) {
-  if (externalUrl) {
-    return externalUrl+getApiPath(`share/${share.hash}`);
-  }
   return window.origin+getApiPath(`share/${share.hash}`);
 }

frontend/src/api/utils.js

@@ -67,7 +67,8 @@ export function adjustedData(data, url) {
     // Combine folders and files into items
     data.items = [...(data.folders || []), ...(data.files || [])];
 
-    data.items = data.items.map((item) => {
+    data.items = data.items.map((item, index) => {
+      item.index = index;
       item.url = `${data.url}${item.name}`;
       if (item.type === "directory") {
         item.url += "/";

frontend/src/api/utils.test.js

@@ -23,10 +23,10 @@ describe('adjustedData', () => {
       folders: [],
       files: [],
       items: [
-        { name: "folder1", type: "directory", url: "http://example.com/unit-testing/files/path/to/directory/folder1/" },
-        { name: "folder2", type: "directory", url: "http://example.com/unit-testing/files/path/to/directory/folder2/" },
-        { name: "file1.txt", type: "file", url: "http://example.com/unit-testing/files/path/to/directory/file1.txt" },
-        { name: "file2.txt", type: "file", url: "http://example.com/unit-testing/files/path/to/directory/file2.txt" },
+        { name: "folder1", type: "directory", index: 0, url: "http://example.com/unit-testing/files/path/to/directory/folder1/" },
+        { name: "folder2", type: "directory", index: 1, url: "http://example.com/unit-testing/files/path/to/directory/folder2/" },
+        { name: "file1.txt", type: "file", index: 2, url: "http://example.com/unit-testing/files/path/to/directory/file1.txt" },
+        { name: "file2.txt", type: "file", index: 3, url: "http://example.com/unit-testing/files/path/to/directory/file2.txt" },
       ],
     };
 

frontend/src/components/ContextMenu.vue

@@ -13,20 +13,21 @@
     <div v-if="selectedCount > 0" class="button selected-count-header">
       <span>{{ selectedCount }} selected</span>
     </div>
+
     <action
-      v-if="!isSearchActive"
+      v-if="!headerButtons.select"
       icon="create_new_folder"
       :label="$t('sidebar.newFolder')"
       @action="showHover('newDir')"
     />
     <action
-      v-if="!headerButtons.select && !isSearchActive"
+      v-if="!headerButtons.select"
       icon="note_add"
       :label="$t('sidebar.newFile')"
       @action="showHover('newFile')"
     />
     <action
-      v-if="!headerButtons.select && !isSearchActive"
+      v-if="!headerButtons.select"
       icon="file_upload"
       :label="$t('buttons.upload')"
       @action="uploadFunc"
@@ -39,7 +40,7 @@
       show="info"
     />
     <action
-      v-if="!isMultiple && !isSearchActive"
+      v-if="!isMultiple"
       icon="check_circle"
       :label="$t('buttons.selectMultiple')"
       @action="toggleMultipleSelection"
@@ -58,7 +59,7 @@
       show="share"
     />
     <action
-      v-if="headerButtons.rename && !isSearchActive"
+      v-if="headerButtons.rename"
       icon="mode_edit"
       :label="$t('buttons.rename')"
       show="rename"
@@ -101,9 +102,6 @@ export default {
     };
   },
   computed: {
-    isSearchActive() {
-      return state.isSearchActive;
-    },
     isMultiple() {
       return state.multiple;
     },
@@ -111,7 +109,7 @@ export default {
       return state.user;
     },
     centered() {
-      return getters.isMobile() || !this.posX || !this.posY;
+      return getters.isMobile() || ( !this.posX || !this.posY );
     },
     showContext() {
       if (getters.currentPromptName() == "ContextMenu" && state.prompts != []) {

frontend/src/components/Search.vue

@@ -1,9 +1,5 @@
 <template>
-  <div
-    id="search"
-    :class="{ active, ongoing, 'dark-mode': isDarkMode }"
-    @click="clearContext"
-  >
+  <div id="search" :class="{ active, ongoing, 'dark-mode': isDarkMode }">
     <!-- Search input section -->
     <div id="input" @click="open">
       <!-- Close button visible when search is active -->
@@ -119,18 +115,11 @@
         </div>
         <!-- List of search results -->
         <ul v-show="results.length > 0">
-          <li
-            v-for="(s, k) in results"
-            :key="k"
-            class="search-entry"
-            :class="{ active: activeStates[k] }"
-            :aria-label="baseName(s.path)"
-          >
-            <a :href="getRelative(s.path)" @contextmenu="addSelected(event, s)">
+          <li v-for="(s, k) in results" :key="k" class="search-entry">
+            <a :href="getRelative(s.path)">
               <Icon :mimetype="s.type" />
               <span class="text-container">
-                {{ basePath(s.path, s.type === "directory")
-                }}<b>{{ baseName(s.path) }}</b>
+                {{ basePath(s.path, s.type === "directory")}}<b>{{ baseName(s.path) }}</b>
               </span>
               <div class="filesize">{{ humanSize(s.size) }}</div>
             </a>
@@ -147,7 +136,6 @@ import { search } from "@/api";
 import { getters, mutations, state } from "@/store";
 import { getHumanReadableFilesize } from "@/utils/filesizes";
 import { removeTrailingSlash, removeLeadingSlash } from "@/utils/url";
-import { removePrefix } from "@/utils/url.js";
 
 import Icon from "@/components/Icon.vue";
 
@@ -238,7 +226,7 @@ export default {
       return this.isTypeSelectDisabled;
     },
     active() {
-      return state.isSearchActive;
+      return getters.currentPromptName() == "search";
     },
     isDarkMode() {
       return getters.isDarkMode();
@@ -267,22 +255,17 @@ export default {
       return this.showHelp;
     },
     getContext() {
-      return this.getRelativeContext();
-    },
-    activeStates() {
-      // Create a Set of combined `name` and `type` keys for efficient lookup
-      const selectedSet = new Set(
-        state.selected.map((item) => `${item.name}:${item.type}`)
-      );
-      const result = this.results.map((s) => selectedSet.has(`${s.name}:${s.type}`));
-      // Build a map of active states for the `results` array
-      return result;
+      let path = state.route.path;
+      path = path.slice(1);
+      path = "./" + path.substring(path.indexOf("/") + 1);
+      path = path.replace(/\/+$/, "") + "/";
+      if (path == "./files/") {
+        path = "./";
+      }
+      return path;
     },
   },
   methods: {
-    getRelativeContext() {
-      return removePrefix(decodeURIComponent(state.route.path), "files");
-    },
     getRelative(path) {
       return removeTrailingSlash(window.location.href) + "/" + removeLeadingSlash(path);
     },
@@ -321,18 +304,15 @@ export default {
       return parts.pop();
     },
     open() {
-      if (!state.isSearchActive) {
-        mutations.closeHovers();
-        mutations.closeSidebar();
-        mutations.resetSelected();
+      if (!this.active) {
         this.resetSearchFilters();
-        mutations.setSearch(true);
+        mutations.showHover("search");
       }
     },
     close(event) {
       this.value = "";
       event.stopPropagation();
-      mutations.setSearch(false);
+      mutations.closeHovers();
     },
     keyup(event) {
       if (event.keyCode === 27) {
@@ -401,24 +381,6 @@ export default {
     toggleHelp() {
       this.showHelp = !this.showHelp;
     },
-    clearContext() {
-      mutations.closeHovers();
-    },
-    addSelected(event, s) {
-      const pathParts = s.path.split("/");
-      const path = removePrefix(decodeURIComponent(state.route.path), "files") + s.path;
-      const modifiedItem = {
-        name: pathParts.pop(),
-        path: path,
-        size: s.size,
-        type: s.type,
-        source: "",
-        url: path,
-        fullPath: path,
-      };
-      mutations.resetSelected();
-      mutations.addSelected(modifiedItem);
-    },
   },
 };
 </script>
@@ -549,10 +511,6 @@ export default {
   border-radius: 0.25em;
 }
 
-.search-entry.active {
-  background-color: var(--surfacePrimary);
-}
-
 .search-entry:hover {
   background-color: var(--surfacePrimary);
 }

frontend/src/components/files/ListingItem.vue

@@ -5,7 +5,6 @@
       item: true,
       'no-select': true,
       activebutton: isMaximized && isSelected,
-      hiddenFile: isHiddenNotSelected
     }"
     :id="getID"
     role="button"
@@ -113,12 +112,8 @@ export default {
     "index",
     "readOnly",
     "path",
-    "hidden"
   ],
   computed: {
-    isHiddenNotSelected() {
-      return !this.isSelected && this.hidden
-    },
     getID() {
       return url.base64Encode(encodeURIComponent(this.name));
     },
@@ -184,7 +179,7 @@ export default {
   },
   methods: {
     handleTouchMove(event) {
-      if (!state.isSafari) return;
+      if (!state.isSafari) return
       const touch = event.touches[0];
       const deltaX = Math.abs(touch.clientX - this.touchStartX);
       const deltaY = Math.abs(touch.clientY - this.touchStartY);
@@ -196,7 +191,7 @@ export default {
       }
     },
     handleTouchEnd() {
-      if (!state.isSafari) return;
+      if (!state.isSafari) return
       this.cancelContext(); // Clear timeout
       this.isSwipe = false; // Reset swipe state
     },
@@ -219,8 +214,8 @@ export default {
     },
     onRightClick(event) {
       event.preventDefault(); // Prevent default context menu
-      // If one or fewer items are selected, reset the selection
-      if (!state.multiple && getters.selectedCount() < 2) {
+      // If no items are selected, select the right-clicked item
+      if (!state.multiple) {
         mutations.resetSelected();
         mutations.addSelected(this.index);
       }
@@ -252,9 +247,7 @@ export default {
     getTime() {
       if (state.user.dateFormat) {
         // Truncate the fractional seconds to 3 digits (milliseconds)
-        const sanitizedString = this.modified.replace(/\.\d+/, (match) =>
-          match.slice(0, 4)
-        );
+        const sanitizedString = this.modified.replace(/\.\d+/, (match) => match.slice(0, 4));
         // Parse the sanitized string into a Date object
         const date = new Date(sanitizedString);
         return date.toLocaleString();
@@ -340,7 +333,7 @@ export default {
       action(overwrite, rename);
     },
     addSelected(event) {
-      if (!state.isSafari) return;
+      if (!state.isSafari) return
       const touch = event.touches[0];
       this.touchStartX = touch.clientX;
       this.touchStartY = touch.clientY;
@@ -364,11 +357,7 @@ export default {
         }
       }
 
-      if (
-        !state.user.singleClick &&
-        getters.selectedCount() !== 0 &&
-        event.button === 0
-      ) {
+      if (!state.user.singleClick && getters.selectedCount() !== 0 && event.button === 0) {
         event.preventDefault();
       }
       setTimeout(() => {
@@ -404,12 +393,7 @@ export default {
 
         return;
       }
-      if (
-        !state.user.singleClick &&
-        !event.ctrlKey &&
-        !event.metaKey &&
-        !state.multiple
-      ) {
+      if (!state.user.singleClick && !event.ctrlKey && !event.metaKey && !state.multiple) {
         mutations.resetSelected();
       }
       mutations.addSelected(this.index);
@@ -427,8 +411,4 @@ export default {
 .item {
   -webkit-touch-callout: none; /* Disable the default long press preview */
 }
-
-.hiddenFile {
-  opacity: 0.5;
-}
-</style>
+</style>

frontend/src/components/prompts/Copy.vue

@@ -52,7 +52,7 @@ import FileList from "./FileList.vue";
 import { filesApi } from "@/api";
 import buttons from "@/utils/buttons";
 import * as upload from "@/utils/upload";
-import { notify } from "@/notify";
+//import { notify } from "@/notify";
 
 export default {
   name: "copy",
@@ -61,7 +61,6 @@ export default {
     return {
       current: window.location.pathname,
       dest: null,
-      items: [],
     };
   },
   computed: {
@@ -72,72 +71,57 @@ export default {
       return mutations.closeHovers();
     },
   },
-  mounted() {
-    if (state.isSearchActive) {
-      this.items = [
-        {
-          from: "/files" + state.selected[0].url,
-          name: state.selected[0].name,
-        },
-      ];
-    } else {
-      for (let item of state.selected) {
-        this.items.push({
-          from: state.req.items[item].url,
-          // add to: dest
-          name: state.req.items[item].name,
-        });
-      }
-    }
-  },
   methods: {
     copy: async function (event) {
       event.preventDefault();
-      try {
-        // Define the action function
-        let action = async (overwrite, rename) => {
-          for (let item of this.items) {
-            item.to = this.dest + item.name;
-          }
-          buttons.loading("copy");
-          await filesApi.moveCopy(this.items, "copy", overwrite, rename);
-        };
-        // Fetch destination files
-        let dstResp = await filesApi.fetchFiles(this.dest);
-        let conflict = upload.checkConflict(this.items, dstResp.items);
-        let overwrite = false;
-        let rename = false;
+      let items = [];
 
-        if (conflict) {
-          await new Promise((resolve, reject) => {
-            mutations.showHover({
-              name: "replace-rename",
-              confirm: async (event, option) => {
-                overwrite = option == "overwrite";
-                rename = option == "rename";
-                event.preventDefault();
-                try {
-                  await action(overwrite, rename);
-                  resolve(); // Resolve the promise if action succeeds
-                } catch (e) {
-                  reject(e); // Reject the promise if an error occurs
-                }
-              },
-            });
-          });
-        } else {
-          // Await the action call for non-conflicting cases
-          await action(overwrite, rename);
-        }
-        mutations.closeHovers();
-        mutations.setSearch(false);
-        notify.showSuccess("Successfully copied file/folder, redirecting...");
-        setTimeout(() => {
-          this.$router.push(this.dest);
-        }, 1000);
-      } catch (error) {
-        notify.showError(error);
+      // Create a new promise for each file.
+      for (let item of state.selected) {
+        items.push({
+          from: state.req.items[item].url,
+          to: this.dest + encodeURIComponent(state.req.items[item].name),
+          name: state.req.items[item].name,
+        });
       }
+
+      let action = async (overwrite, rename) => {
+        buttons.loading("copy");
+        await filesApi.moveCopy(items, "copy", overwrite, rename);
+        this.$router.push({ path: this.dest });
+        mutations.setReload(true);
+      };
+
+      if (state.route.path === this.dest) {
+        mutations.closeHovers();
+        action(false, true);
+
+        return;
+      }
+
+      let dstItems = (await filesApi.fetchFiles(this.dest)).items;
+      let conflict = upload.checkConflict(items, dstItems);
+
+      let overwrite = false;
+      let rename = false;
+
+      if (conflict) {
+        mutations.showHover({
+          name: "replace-rename",
+          confirm: (event, option) => {
+            overwrite = option == "overwrite";
+            rename = option == "rename";
+
+            event.preventDefault();
+            mutations.closeHovers();
+            action(overwrite, rename);
+          },
+        });
+
+        return;
+      }
+
+      action(overwrite, rename);
     },
   },
 };

frontend/src/components/prompts/Delete.vue

@@ -7,9 +7,6 @@
       <p v-else>
         {{ $t("prompts.deleteMessageMultiple", { count: selectedCount }) }}
       </p>
-      <div style="display: grid" class="searchContext">
-        <span v-for="(item, index) in nav" :key="index"> {{ item }} </span>
-      </div>
     </div>
     <div class="card-action">
       <button
@@ -37,7 +34,6 @@ import { filesApi } from "@/api";
 import buttons from "@/utils/buttons";
 import { state, getters, mutations } from "@/store";
 import { notify } from "@/notify";
-import { removePrefix } from "@/utils/url";
 
 export default {
   name: "delete",
@@ -51,16 +47,6 @@ export default {
     currentPrompt() {
       return getters.currentPrompt();
     },
-    nav() {
-      if (state.isSearchActive) {
-        return [state.selected[0].path];
-      }
-      let paths = [];
-      for (let index of state.selected) {
-        paths.push(removePrefix(state.req.items[index].url, "files"));
-      }
-      return paths;
-    },
   },
   methods: {
     closeHovers() {
@@ -70,24 +56,17 @@ export default {
       buttons.loading("delete");
 
       try {
-        if (state.isSearchActive) {
-          await filesApi.remove(state.selected[0].url);
-          buttons.success("delete");
-          notify.showSuccess("Deleted item successfully");
-          mutations.closeHovers();
-          return;
-        }
         if (!this.isListing) {
           await filesApi.remove(state.route.path);
           buttons.success("delete");
           notify.showSuccess("Deleted item successfully");
 
           this.currentPrompt?.confirm();
-          mutations.closeHovers();
+          this.closeHovers();
           return;
         }
 
-        mutations.closeHovers();
+        this.closeHovers();
 
         if (getters.selectedCount() === 0) {
           return;

frontend/src/components/prompts/FileList.vue

@@ -23,7 +23,6 @@
 <script>
 import { state, mutations } from "@/store";
 import url from "@/utils/url.js";
-import { removePrefix } from "@/utils/url.js";
 import { filesApi } from "@/api";
 
 export default {
@@ -41,7 +40,7 @@ export default {
   },
   computed: {
     nav() {
-      return removePrefix(decodeURIComponent(this.current), "files");
+      return decodeURIComponent(this.current);
     },
   },
   mounted() {

frontend/src/components/prompts/Info.vue

@@ -99,9 +99,6 @@ export default {
       return getters.isListing();
     },
     humanSize() {
-      if (state.isSearchActive) {
-        return getHumanReadableFilesize(state.selected[0].size);
-      }
       if (getters.selectedCount() === 0 || !this.isListing) {
         return getHumanReadableFilesize(state.req.size);
       }
@@ -115,9 +112,6 @@ export default {
       return getHumanReadableFilesize(sum);
     },
     humanTime() {
-      if (state.isSearchActive) {
-        return "unknown";
-      }
       if (getters.selectedCount() === 0) {
         return formatTimestamp(state.req.modified, state.user.locale);
       }
@@ -127,31 +121,19 @@ export default {
       );
     },
     modTime() {
-      if (state.isSearchActive) {
-        return "";
-      }
       return new Date(Date.parse(state.req.modified)).toLocaleString();
     },
     name() {
-      if (state.isSearchActive) {
-        return state.selected[0].name;
-      }
       return getters.selectedCount() === 0
         ? state.req.name
         : state.req.items[this.selected[0]].name;
     },
     type() {
-      if (state.isSearchActive) {
-        return state.selected[0].type;
-      }
       return getters.selectedCount() === 0
         ? state.req.type
         : state.req.items[this.selected[0]].type;
     },
     dir() {
-      if (state.isSearchActive) {
-        return state.selected[0].type === "directory";
-      }
       return (
         getters.selectedCount() > 1 ||
         (getters.selectedCount() === 0
@@ -163,12 +145,9 @@ export default {
   methods: {
     async checksum(event, algo) {
       event.preventDefault();
+
       let link;
-      if (state.isSearchActive) {
-        const hash = await filesApi.checksum(state.selected[0].url, algo);
-        event.target.innerHTML = hash;
-        return;
-      }
+
       if (getters.selectedCount()) {
         link = state.req.items[this.selected[0]].url;
       } else {

frontend/src/components/prompts/Move.vue

@@ -35,6 +35,7 @@
         <button
           class="button button--flat"
           @click="move"
+          :disabled="$route.path === dest"
           :aria-label="$t('buttons.move')"
           :title="$t('buttons.move')"
         >
@@ -60,7 +61,6 @@ export default {
     return {
       current: window.location.pathname,
       dest: null,
-      items: [],
     };
   },
   computed: {
@@ -71,72 +71,50 @@ export default {
       return mutations.closeHovers();
     },
   },
-  mounted() {
-    if (state.isSearchActive) {
-      this.items = [
-        {
-          from: "/files" + state.selected[0].url,
-          name: state.selected[0].name,
-        },
-      ];
-    } else {
-      for (let item of state.selected) {
-        this.items.push({
-          from: state.req.items[item].url,
-          // add to: dest
-          name: state.req.items[item].name,
-        });
-      }
-    }
-  },
   methods: {
     move: async function (event) {
       event.preventDefault();
-      try {
-        // Define the action function
-        let action = async (overwrite, rename) => {
-          for (let item of this.items) {
-            item.to = this.dest + item.name;
-          }
-          buttons.loading("move");
-          await filesApi.moveCopy(this.items, "move", overwrite, rename);
-        };
-        // Fetch destination files
-        let dstResp = await filesApi.fetchFiles(this.dest);
-        let conflict = upload.checkConflict(this.items, dstResp.items);
-        let overwrite = false;
-        let rename = false;
+      let items = [];
 
-        if (conflict) {
-          await new Promise((resolve, reject) => {
-            mutations.showHover({
-              name: "replace-rename",
-              confirm: async (event, option) => {
-                overwrite = option == "overwrite";
-                rename = option == "rename";
-                event.preventDefault();
-                try {
-                  await action(overwrite, rename);
-                  resolve(); // Resolve the promise if action succeeds
-                } catch (e) {
-                  reject(e); // Reject the promise if an error occurs
-                }
-              },
-            });
-          });
-        } else {
-          // Await the action call for non-conflicting cases
-          await action(overwrite, rename);
-        }
-        mutations.closeHovers();
-        mutations.setSearch(false);
-        notify.showSuccess("Successfully moved file/folder, redirecting...");
-        setTimeout(() => {
-          this.$router.push(this.dest);
-        }, 1000);
-      } catch (error) {
-        notify.showError(error);
+      for (let item of state.selected) {
+        items.push({
+          from: state.req.items[item].url,
+          to: this.dest + state.req.items[item].name,
+          name: state.req.items[item].name,
+        });
       }
+      let action = async (overwrite, rename) => {
+        buttons.loading("move");
+        await filesApi.moveCopy(items, "move", overwrite, rename);
+        buttons.success("move");
+        this.$router.push({ path: this.dest });
+        mutations.closeHovers();
+      };
+
+      let dstItems = (await filesApi.fetchFiles(this.dest)).items;
+      let conflict = upload.checkConflict(items, dstItems);
+
+      let overwrite = false;
+      let rename = false;
+
+      try {
+        if (conflict) {
+          mutations.showHover({
+            name: "replace-rename",
+            confirm: (event, option) => {
+              overwrite = option == "overwrite";
+              rename = option == "rename";
+              event.preventDefault();
+              action(overwrite, rename);
+            },
+          });
+          return;
+        }
+        action(overwrite, rename);
+      } catch (e) {
+        notify.showError(e);
+      }
+      return;
     },
   },
 };

frontend/src/components/prompts/NewDir.vue

@@ -93,13 +93,14 @@ export default {
           this.$router.push({ path: uri });
         } else if (!this.base) {
           const res = await filesApi.fetchFiles(url.removeLastDir(uri) + "/");
-          mutations.replaceRequest(res);
+          mutations.updateRequest(res);
         }
 
         mutations.closeHovers();
       } catch (error) {
         notify.showError(error);
       }
+
     },
   },
 };

frontend/src/components/prompts/Share.vue

@@ -158,9 +158,6 @@ export default {
       return getters.isListing(); // Access getter directly from the store
     },
     url() {
-      if (state.isSearchActive) {
-        return state.selected[0].url;
-      }
       if (!this.isListing) {
         return state.route.path;
       }
@@ -173,15 +170,11 @@ export default {
   },
   async beforeMount() {
     try {
-      if (state.isSearchActive) {
-        this.subpath = state.selected[0].path;
-      } else {
-        let path = "." + getters.routePath("files");
-        if (getters.selectedCount() === 1) {
-          path = path + state.req.items[this.selected[0]].name;
-        }
-        this.subpath = decodeURIComponent(path);
+      let path = "." + getters.routePath("files");
+      if (getters.selectedCount() === 1) {
+        path = path + state.req.items[this.selected[0]].name;
       }
+      this.subpath = decodeURIComponent(path);
       // get last element of the path
       const links = await shareApi.get(this.subpath);
       this.links = links;
@@ -213,12 +206,7 @@ export default {
       if (isPermanent) {
         res = await shareApi.create(this.subpath, this.password);
       } else {
-        res = await shareApi.create(
-          this.subpath,
-          this.password,
-          this.time.toString(),
-          this.unit
-        );
+        res = await shareApi.create(this.subpath, this.password, this.time.toString(), this.unit);
       }
 
       this.links.push(res);
@@ -245,9 +233,6 @@ export default {
       return shareApi.getShareURL(share);
     },
     hasDownloadLink() {
-      if (state.isSearchActive) {
-        return state.selected[0].type != "directory";
-      }
       return this.selected.length === 1 && !state.req.items[this.selected[0]].isDir;
     },
     buildDownloadLink(share) {

frontend/src/components/sidebar/General.vue

@@ -4,11 +4,11 @@
       <div @click="navigateTo('/settings#profile-main')" class="inner-card">
         <i class="material-icons">person</i>
         {{ user.username }}
-        <i aria-label="settings" class="material-icons">settings</i>
+        <i class="material-icons">settings</i>
       </div>
 
-      <div class="inner-card logout-button" @click="logout">
-        <i v-if="canLogout" class="material-icons">exit_to_app</i>
+      <div class="inner-card">
+        <i v-if="canLogout" @click="logout" class="material-icons">exit_to_app</i>
       </div>
     </div>
   </div>
@@ -94,7 +94,7 @@ export default {
     };
   },
   mounted() {
-    this.updateUsage();
+      this.updateUsage();
   },
   computed: {
     isSettings: () => getters.isSettings(),