updated other changes

Author: gtsteffaniak

CHANGELOG.md

@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file. For commit
  - better support for running with disabled index.
  - small indexing behavior tweaks.
  - markdown viewer hides sidebar https://github.com/gtsteffaniak/filebrowser/issues/744
+ - quick download only applies to files
 
  **BugFixes**:
  - subtitles filename issue https://github.com/gtsteffaniak/filebrowser/issues/678

_docker/Dockerfile

@@ -24,7 +24,6 @@ COPY --from=ffmpeg [ "/ffmpeg", "/ffprobe", "/usr/local/bin/" ]
 ENV FILEBROWSER_FFMPEG_PATH="/usr/local/bin/"
 ENV FILEBROWSER_CONFIG="/home/filebrowser/data/config.yaml"
 ENV FILEBROWSER_DATABASE="/home/filebrowser/data/database.db"
-ENV FILEBROWSER_CONFIG_DOCKER_COMPAT="true"
 ENV FILEBROWSER_NO_EMBEDED="true"
 ENV PATH="$PATH:/home/filebrowser"
 RUN apk --no-cache add ca-certificates mailcap tzdata

_docker/Dockerfile.slim

@@ -21,7 +21,6 @@ FROM alpine:latest
 ENV FILEBROWSER_NO_EMBEDED="true"
 ENV FILEBROWSER_CONFIG="/home/filebrowser/data/config.yaml"
 ENV FILEBROWSER_DATABASE="/home/filebrowser/data/database.db"
-ENV FILEBROWSER_CONFIG_DOCKER_COMPAT="true"
 ENV PATH="$PATH:/home/filebrowser"
 RUN apk --no-cache add ca-certificates mailcap tzdata
 RUN adduser -D -s /bin/true -u 1000 filebrowser

backend/adapters/fs/files/files.go

@@ -45,11 +45,13 @@ func FileInfoFaster(opts iteminfo.FileOptions) (iteminfo.ExtendedFileInfo, error
 	var exists bool
 	err = index.RefreshFileInfo(opts)
 	if err != nil {
-		if err == errors.ErrNotIndexed {
+		if err == errors.ErrNotIndexed && index.Config.DisableIndexing {
 			info, err = index.GetFsDirInfo(opts.Path)
 			if err != nil {
 				return response, err
 			}
+		} else {
+			return response, fmt.Errorf("could not refresh file info: %v", err)
 		}
 	} else {
 		info, exists = index.GetReducedMetadata(opts.Path, opts.IsDir)

backend/cmd/cli.go

@@ -36,20 +36,15 @@ func runCLI() bool {
 
 	if configPath == "" {
 		configPath = os.Getenv("FILEBROWSER_CONFIG")
-		compatibility := os.Getenv("FILEBROWSER_CONFIG_DOCKER_COMPAT") == "true"
 		// backwards compatibility in docker, prefer config.yaml if it exists
-		if configPath != "" && compatibility {
-			_, err := os.Stat("config.yaml")
-			if err == nil {
-				logger.Warning("config.yaml exists, using that instead of FILEBROWSER_CONFIG due to compatibility mode, if you want to use FILEBROWSER_CONFIG, don't mount /home/filebrowser/config.yaml")
-				configPath = "config.yaml"
+		if configPath != "" {
+			_, err := os.Stat(configPath)
+			if err != nil {
+				logger.Fatalf("config file %v does not exist, please create it or set the FILEBROWSER_CONFIG environment variable to a valid config file path", configPath)
 			}
+		} else {
+			configPath = "config.yaml"
 		}
-
-	}
-
-	if configPath == "" {
-		configPath = "config.yaml"
 	}
 
 	// Parse global flags (before subcommands)

backend/indexing/indexingFiles.go

@@ -109,7 +109,8 @@ func (idx *Index) indexDirectory(adjustedPath string, quick, recursive bool) err
 
 	// check if excluded from indexing
 	hidden := isHidden(dirInfo, idx.Path+adjustedPath)
-	if !recursive && idx.shouldSkip(true, hidden, adjustedPath) {
+	if idx.shouldSkip(dirInfo.IsDir(), hidden, adjustedPath) {
+		logger.Debugf("skipping directory %s due to exclusion rules", adjustedPath)
 		return errors.ErrNotIndexed
 	}
 
@@ -368,6 +369,9 @@ func isHidden(file os.FileInfo, srcPath string) bool {
 }
 
 func (idx *Index) shouldSkip(isDir bool, isHidden bool, fullCombined string) bool {
+	if idx.Config.DisableIndexing {
+		return true
+	}
 	// check inclusions first
 	if isDir && len(idx.Config.Include.Folders) > 0 {
 		if !slices.Contains(idx.Config.Include.Folders, fullCombined) {

frontend/src/components/files/ListingItem.vue

@@ -101,7 +101,7 @@ export default {
       return state.user.viewMode === "gallery";
     },
     quickDownloadEnabled() {
-      return state.user?.quickDownload;
+      return state.user?.quickDownload && !this.galleryView && !this.isDir;
     },
     isHiddenNotSelected() {
       return !this.isSelected && this.reducedOpacity;