Commit9981619

committed

fix embed

1 parent3574b87 commit9981619Copy full SHA for 9981619

File tree

+24

-6

lines changed

+24

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,23 +118,23 @@ func initEmbeddedExtractor(c *cli.Command) error {`
`118`	`118`
`119`	`119`	`funcrunList(_ context.Context,c*cli.Command)error {`
`120`	`120`	`iferr:=runListDo(c);err!=nil {`
`121`		`-fmt.Fprintf(os.Stderr,"%v\n",err)`
	`121`	`+_,_=fmt.Fprintf(os.Stderr,"%v\n",err)`
`122`	`122`	`returnerr`
`123`	`123`	`}`
`124`	`124`	`returnnil`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`funcrunView(_ context.Context,c*cli.Command)error {`
`128`	`128`	`iferr:=runViewDo(c);err!=nil {`
`129`		`-fmt.Fprintf(os.Stderr,"%v\n",err)`
	`129`	`+_,_=fmt.Fprintf(os.Stderr,"%v\n",err)`
`130`	`130`	`returnerr`
`131`	`131`	`}`
`132`	`132`	`returnnil`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`funcrunExtract(_ context.Context,c*cli.Command)error {`
`136`	`136`	`iferr:=runExtractDo(c);err!=nil {`
`137`		`-fmt.Fprintf(os.Stderr,"%v\n",err)`
	`137`	`+_,_=fmt.Fprintf(os.Stderr,"%v\n",err)`
`138`	`138`	`returnerr`
`139`	`139`	`}`
`140`	`140`	`returnnil`
`@@ -217,7 +217,7 @@ func runExtractDo(c *cli.Command) error {`
`217`	`217`	`for_,a:=rangematchedAssetFiles {`
`218`	`218`	`iferr:=extractAsset(destdir,a,overwrite,rename);err!=nil {`
`219`	`219`	`// Non-fatal error`
`220`		`-fmt.Fprintf(os.Stderr,"%s: %v",a.path,err)`
	`220`	`+_,_=fmt.Fprintf(os.Stderr,"%s: %v\n",a.path,err)`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,21 @@ func (e *embeddedFS) ReadDir(name string) (l []fs.DirEntry, err error) {`
`126`	`126`	`}`
`127`	`127`	`l=make([]fs.DirEntry,len(fi.Children))`
`128`	`128`	`fori,child:=rangefi.Children {`
`129`		`-l[i]=child`
	`129`	`+l[i],err=e.getFileInfo(name+"/"+child.BaseName)`
	`130`	`+iferr!=nil {`
	`131`	`+returnnil,err`
	`132`	`+}`
`130`	`133`	`}`
`131`	`134`	`returnl,nil`
`132`	`135`	`}`
`133`	`136`
`134`	`137`	`func (eembeddedFS)getFileInfo(fullNamestring) (embeddedFileInfo,error) {`
	`138`	`+// no need to do heavy "path.Clean()" because we don't want to support "foo/../bar" or absolute paths`
	`139`	`+fullName=strings.TrimPrefix(fullName,"./")`
	`140`	`+iffullName=="" {`
	`141`	`+fullName="."`
	`142`	`+}`
	`143`	`+`
`135`	`144`	`e.filesMu.RLock()`
`136`	`145`	`fi:=e.files[fullName]`
`137`	`146`	`e.filesMu.RUnlock()`
`@@ -247,7 +256,7 @@ func (fi *embeddedFileInfo) Size() int64 {`
`247`	`256`	`}`
`248`	`257`
`249`	`258`	`func (fi*embeddedFileInfo)Mode() fs.FileMode {`
`250`		`-returnutil.Iif[fs.FileMode](fi.IsDir(),0o555,0o444)`
	`259`	`+returnutil.Iif[fs.FileMode](fi.IsDir(),fs.ModeDir\|0o555,0o444)`
`251`	`260`	`}`
`252`	`261`
`253`	`262`	`func (fi*embeddedFileInfo)ModTime() time.Time {`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ func TestEmbed(t *testing.T) {`
`46`	`46`	`assert.Equal(t,bytes.Repeat([]byte("a"),1000),content)`
`47`	`47`	`fi,err=fs.Stat(efs,"foo/bar/b.txt")`
`48`	`48`	`require.NoError(t,err)`
	`49`	`+assert.False(t,fi.Mode().IsDir())`
	`50`	`+assert.True(t,fi.Mode().IsRegular())`
`49`	`51`	`gzipContent,ok:=fi.(EmbeddedFileInfo).GetGzipContent()`
`50`	`52`	`assert.True(t,ok)`
`51`	`53`	`assert.Greater(t,len(gzipContent),1)`
`@@ -67,6 +69,13 @@ func TestEmbed(t *testing.T) {`
`67`	`69`	`assert.Equal(t,"c.txt",entries[1].Name())`
`68`	`70`	`assert.False(t,entries[1].IsDir())`
`69`	`71`
	`72`	`+// test directory mode`
	`73`	`+fi,err=fs.Stat(efs,"foo")`
	`74`	`+require.NoError(t,err)`
	`75`	`+assert.True(t,fi.IsDir())`
	`76`	`+assert.True(t,fi.Mode().IsDir())`
	`77`	`+assert.False(t,fi.Mode().IsRegular())`
	`78`	`+`
`70`	`79`	`// test httpfs`
`71`	`80`	`hfs:=http.FS(efs)`
`72`	`81`	`hf,err:=hfs.Open("foo/bar/b.txt")`

Comments

(0)