blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

os/gres: fix #3611 add custom prefix / support for resource packing (#3621)

Browse Source
This commit is contained in:
海亮 2024-06-04 20:38:59 +08:00 committed by GitHub
parent 59a775aad4
commit 4d916ae73e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/gres/gres_func_zip.go
View File

@ -62,7 +62,10 @@ func doZipPathWriter(srcPath string, zipWriter *zip.Writer, option ...Option) er
} else {
files = []string{absolutePath}
}
headerPrefix := strings.TrimRight(usedOption.Prefix, `\/`)
headerPrefix := usedOption.Prefix
if !(headerPrefix == "/") {
headerPrefix = strings.TrimRight(headerPrefix, `\/`)
}
if headerPrefix != "" && gfile.IsDir(absolutePath) {
headerPrefix += "/"
}

25
os/gres/gres_z_unit_test.go
View File

@ -63,6 +63,19 @@ func Test_Pack(t *testing.T) {
t.AssertNil(err)
t.Assert(r.Contains("files/"), true)
})
gtest.C(t, func(t *gtest.T) {
var (
srcPath = gtest.DataPath("files")
data, err = gres.Pack(srcPath, "/")
)
t.AssertNil(err)
r := gres.New()
err = r.Add(string(data))
t.AssertNil(err)
t.Assert(r.Contains("/root/"), true)
})
}
func Test_PackToFile(t *testing.T) {
@ -121,7 +134,7 @@ func Test_Unpack(t *testing.T) {
}
func Test_Basic(t *testing.T) {
gres.Dump()
// gres.Dump()
gtest.C(t, func(t *gtest.T) {
t.Assert(gres.Get("none"), nil)
t.Assert(gres.Contains("none"), false)
@ -180,7 +193,7 @@ func Test_Basic(t *testing.T) {
}
func Test_Get(t *testing.T) {
gres.Dump()
// gres.Dump()
gtest.C(t, func(t *gtest.T) {
t.AssertNE(gres.Get("dir1/test1"), nil)
})
@ -196,7 +209,7 @@ func Test_Get(t *testing.T) {
}
func Test_ScanDir(t *testing.T) {
gres.Dump()
// gres.Dump()
gtest.C(t, func(t *gtest.T) {
path := "dir1"
files := gres.ScanDir(path, "*", false)
@ -221,7 +234,7 @@ func Test_ScanDir(t *testing.T) {
}
func Test_ScanDirFile(t *testing.T) {
gres.Dump()
// gres.Dump()
gtest.C(t, func(t *gtest.T) {
path := "dir2"
files := gres.ScanDirFile(path, "*", false)
@ -246,7 +259,7 @@ func Test_ScanDirFile(t *testing.T) {
}
func Test_Export(t *testing.T) {
gres.Dump()
// gres.Dump()
gtest.C(t, func(t *gtest.T) {
var (
src = `template-res`
@ -312,7 +325,7 @@ func TestFile_Name(t *testing.T) {
}
func TestFile_Export(t *testing.T) {
gres.Dump()
// gres.Dump()
gtest.C(t, func(t *gtest.T) {
var (
src = `template-res`