Various bug fixes (#2935)

* Sort scene/image/gallery tags by name
* Calculate md5 if missing
* Prevent multiple folder create logs

pkg/file/scan.go

@@ -482,7 +482,14 @@ func (s *scanJob) onNewFolder(ctx context.Context, file scanFile) (*Folder, erro
 		}
 	}
 
-	logger.Infof("%s doesn't exist. Creating new folder entry...", file.Path)
+	txn.AddPostCommitHook(ctx, func(ctx context.Context) error {
+		// log at the end so that if anything fails above due to a locked database
+		// error and the transaction must be retried, then we shouldn't get multiple
+		// logs of the same thing.
+		logger.Infof("%s doesn't exist. Creating new folder entry...", file.Path)
+		return nil
+	})
+
 	if err := s.Repository.FolderStore.Create(ctx, toCreate); err != nil {
 		return nil, fmt.Errorf("creating folder %q: %w", file.Path, err)
 	}
@@ -513,6 +520,8 @@ func modTime(info fs.FileInfo) time.Time {
 }
 
 func (s *scanJob) handleFile(ctx context.Context, f scanFile) error {
+	defer s.incrementProgress(f)
+
 	var ff File
 	// don't use a transaction to check if new or existing
 	if err := s.withDB(ctx, func(ctx context.Context) error {
@@ -581,7 +590,6 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (File, error) {
 		// add this file to the queue to be created later
 		if s.retrying {
 			// if we're retrying and the folder still doesn't exist, then it's a problem
-			s.incrementProgress(f)
 			return nil, fmt.Errorf("parent folder for %q doesn't exist", path)
 		}
 
@@ -593,7 +601,6 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (File, error) {
 
 	zipFileID, err := s.getZipFileID(ctx, f.zipFile)
 	if err != nil {
-		s.incrementProgress(f)
 		return nil, err
 	}
 
@@ -601,9 +608,9 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (File, error) {
 		baseFile.ZipFileID = zipFileID
 	}
 
-	fp, err := s.calculateFingerprints(f.fs, baseFile, path)
+	const useExisting = false
+	fp, err := s.calculateFingerprints(f.fs, baseFile, path, useExisting)
 	if err != nil {
-		s.incrementProgress(f)
 		return nil, err
 	}
 
@@ -611,7 +618,6 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (File, error) {
 
 	file, err := s.fireDecorators(ctx, f.fs, baseFile)
 	if err != nil {
-		s.incrementProgress(f)
 		return nil, err
 	}
 
@@ -619,7 +625,6 @@ func (s *scanJob) onNewFile(ctx context.Context, f scanFile) (File, error) {
 	// do this after decoration so that missing fields can be populated
 	renamed, err := s.handleRename(ctx, file, fp)
 	if err != nil {
-		s.incrementProgress(f)
 		return nil, err
 	}
 
@@ -667,14 +672,17 @@ func (s *scanJob) fireHandlers(ctx context.Context, f File) error {
 	return nil
 }
 
-func (s *scanJob) calculateFingerprints(fs FS, f *BaseFile, path string) ([]Fingerprint, error) {
-	logger.Infof("Calculating fingerprints for %s ...", path)
+func (s *scanJob) calculateFingerprints(fs FS, f *BaseFile, path string, useExisting bool) (Fingerprints, error) {
+	// only log if we're (re)calculating fingerprints
+	if !useExisting {
+		logger.Infof("Calculating fingerprints for %s ...", path)
+	}
 
 	// calculate primary fingerprint for the file
 	fp, err := s.FingerprintCalculator.CalculateFingerprints(f, &fsOpener{
 		fs:   fs,
 		name: path,
-	})
+	}, useExisting)
 	if err != nil {
 		return nil, fmt.Errorf("calculating fingerprint for file %q: %w", path, err)
 	}
@@ -844,6 +852,30 @@ func (s *scanJob) setMissingMetadata(ctx context.Context, f scanFile, existing F
 	return existing, nil
 }
 
+func (s *scanJob) setMissingFingerprints(ctx context.Context, f scanFile, existing File) (File, error) {
+	const useExisting = true
+	fp, err := s.calculateFingerprints(f.fs, existing.Base(), f.Path, useExisting)
+	if err != nil {
+		return nil, err
+	}
+
+	if !fp.Equals(existing.Base().Fingerprints) {
+		existing.SetFingerprints(fp)
+
+		if err := s.withTxn(ctx, func(ctx context.Context) error {
+			if err := s.Repository.Update(ctx, existing); err != nil {
+				return fmt.Errorf("updating file %q: %w", f.Path, err)
+			}
+
+			return nil
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	return existing, nil
+}
+
 // returns a file only if it was updated
 func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing File) (File, error) {
 	base := existing.Base()
@@ -853,16 +885,23 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing File)
 	updated := !fileModTime.Equal(base.ModTime)
 
 	if !updated {
+		var err error
+
 		isMissingMetdata := s.isMissingMetadata(existing)
 		// set missing information
 		if isMissingMetdata {
-			var err error
 			existing, err = s.setMissingMetadata(ctx, f, existing)
 			if err != nil {
 				return nil, err
 			}
 		}
 
+		// calculate missing fingerprints
+		existing, err = s.setMissingFingerprints(ctx, f, existing)
+		if err != nil {
+			return nil, err
+		}
+
 		handlerRequired := false
 		if err := s.withDB(ctx, func(ctx context.Context) error {
 			// check if the handler needs to be run
@@ -873,8 +912,6 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing File)
 		}
 
 		if !handlerRequired {
-			s.incrementProgress(f)
-
 			// if this file is a zip file, then we need to rescan the contents
 			// as well. We do this by returning the file, instead of nil.
 			if isMissingMetdata {
@@ -889,7 +926,6 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing File)
 				return err
 			}
 
-			s.incrementProgress(f)
 			return nil
 		}); err != nil {
 			return nil, err
@@ -910,9 +946,9 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing File)
 	base.UpdatedAt = time.Now()
 
 	// calculate and update fingerprints for the file
-	fp, err := s.calculateFingerprints(f.fs, base, path)
+	const useExisting = false
+	fp, err := s.calculateFingerprints(f.fs, base, path, useExisting)
 	if err != nil {
-		s.incrementProgress(f)
 		return nil, err
 	}
 
@@ -920,7 +956,6 @@ func (s *scanJob) onExistingFile(ctx context.Context, f scanFile, existing File)
 
 	existing, err = s.fireDecorators(ctx, f.fs, existing)
 	if err != nil {
-		s.incrementProgress(f)
 		return nil, err
 	}