v0.23.0-RC7 panic: tempFile: Close() called on a closed file (#644)

Fixes #643
simulot · Jan 19, 2025 · 42bb9eb · 42bb9eb
1 parent bde0cee
commit 42bb9eb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/adapters/folder/writeFolder.go b/adapters/folder/writeFolder.go
@@ -106,7 +106,6 @@ func (w *LocalAssetWriter) WriteAsset(ctx context.Context, a *assets.Asset) erro
 
 			// write the asset
 			err = fshelper.WriteFile(w.WriteToFS, path.Join(dir, base), r)
-			r.Close()
 			if err != nil {
 				return err
 			}

diff --git a/internal/e2eTests/archive/e2e_archive_test.go b/internal/e2eTests/archive/e2e_archive_test.go
@@ -28,6 +28,7 @@ func TestArchiveFromGooglePhotos(t *testing.T) {
 	c, a := cmd.RootImmichGoCommand(ctx)
 	c.SetArgs([]string{
 		"archive", "from-google-photos",
+		"--log-level=debug",
 		"--write-to-folder=" + tmpDir,
 		e2e.MyEnv("IMMICHGO_TESTFILES") + "/demo takeout/Takeout",
 	})

diff --git a/internal/fshelper/cachereader/cachereader.go b/internal/fshelper/cachereader/cachereader.go
@@ -91,7 +91,7 @@ type tempFile struct {
 
 func (t *tempFile) Close() error {
 	refs := atomic.AddInt64(&t.cr.references, -1)
-	loghelper.Debug("tempFile:", "close file", t.File.Name(), "references", refs+1)
+	loghelper.Debug("tempFile:", "assetName", t.cr.name, "close file", t.File.Name(), "references", refs+1)
 	if refs < 0 {
 		panic("tempFile: Close() called on a closed file")
 	}