Returning the first directory folder always.

Changed the archive.FindFile to always return the first directory found in the pacakge. Fixes #3
ronoaldo · Oct 1, 2021 · a080338 · a080338
1 parent c4f1af8
commit a080338
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/api/contentdb/archive.go b/api/contentdb/archive.go
@@ -82,7 +82,9 @@ func (p *PackageArchive) Contents() []string {
 func (p *PackageArchive) FindFile(name string, max int) (count int, dir string) {
 	for _, f := range p.Contents() {
 		if strings.HasSuffix(f, "/"+name) || f == name {
-			dir, _ = path.Split(f)
+			if dir == "" {
+				dir, _ = path.Split(f)
+			}
 			count++
 		}
 		if max > 0 && count >= max {

diff --git a/api/contentdb/archive_test.go b/api/contentdb/archive_test.go
@@ -29,6 +29,9 @@ var (
 
 	bytesInvalidModpack []byte      = mustReadFile("testdata/invalidmodpack.zip")
 	zipInvalidModpack   *zip.Reader = mustZip(bytesInvalidModpack)
+
+	bytesMoreblocks []byte      = mustReadFile("testdata/moreblocks.zip")
+	zipMoreblocks   *zip.Reader = mustZip(bytesMoreblocks)
 )
 
 func mustReadFile(f string) []byte {
@@ -76,7 +79,7 @@ func TestPackageArchive_FindFile(t *testing.T) {
 			fields:    fields{z: zip3darmor},
 			args:      args{"init.lua", 0},
 			wantCount: 7,
-			wantDir:   "3d_armor/wieldview/",
+			wantDir:   "3d_armor/3d_armor/",
 		},
 		{
 			name:      "should find only first init.lua when max is 1",
@@ -85,6 +88,13 @@ func TestPackageArchive_FindFile(t *testing.T) {
 			wantCount: 1,
 			wantDir:   "3d_armor/3d_armor/",
 		},
+		{
+			name:      "should find init.lua in root directory if available",
+			fields:    fields{z: zipMoreblocks},
+			args:      args{"init.lua", 0},
+			wantCount: 2,
+			wantDir:   "moreblocks/",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/api/contentdb/testdata/moreblocks.zip b/api/contentdb/testdata/moreblocks.zip
diff --git a/cmd/contentdb/main.go b/cmd/contentdb/main.go
@@ -151,8 +151,8 @@ func installMod(mods []string) error {
 		var modconf *ini.File
 
 		modconfFilename := "mod.conf"
-		// mod root dir is where init.lua is
-		_, stripPrefix := archive.FindFile("init.lua", 0)
+		// mod root dir is where the first init.lua is
+		_, stripPrefix := archive.FindFile("init.lua", 1)
 		if pkgType == contentdb.Modpack {
 			var found = 0
 			// For modpack, load a diferent config name and adjust the stripPrefix