FIX: multizip archives are now full parsed

simulot · Aug 10, 2023 · e8038e3 · e8038e3
1 parent b0401ec
commit e8038e3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ immich-go
 main.go
 
 dist/
+DATA
diff --git a/go.mod b/go.mod
@@ -9,4 +9,7 @@ require (
 	github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31
 )
 
-require golang.org/x/net v0.12.0 // indirect
+require (
+	github.com/yalue/merged_fs v1.2.3 // indirect
+	golang.org/x/net v0.12.0 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -6,5 +6,7 @@ github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 h1:OXcKh35JaYsGMRzpvFkLv/MEyPuL49CThT1pZ8aSml4=
 github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
+github.com/yalue/merged_fs v1.2.3 h1:lJ32O+ZiVF4h+4SD8e7IfG8+V2Em4LPcT3Z7h2n2TrY=
+github.com/yalue/merged_fs v1.2.3/go.mod h1:WqqchfVYQyclV2tnR7wtRhBddzBvLVR83Cjw9BKQw0M=
 golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
 golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
diff --git a/main.go b/main.go
@@ -14,6 +14,7 @@ import (
 	"strings"
 
 	"github.com/google/uuid"
+	"github.com/yalue/merged_fs"
 )
 
 func main() {
@@ -304,7 +305,9 @@ func (a *Application) OpenFSs() (fs.FS, error) {
 			fss = append(fss, fsys)
 		}
 	}
-	return assets.NewMergedFS(fss), nil
+	return merged_fs.MergeMultiple(fss...), nil
+
+	// assets.NewMergedFS(fss), nil
 }
 
 func (app *Application) DeleteLocalAssets() error {