Merge pull request #107 from xushiwei/q

fs/util => fs/fsutil
goplus · Dec 1, 2021 · 5625eff · 5625eff
2 parents 2b070e4 + 6a23e30
commit 5625eff
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 26 deletions.
diff --git a/fs/fsutil/file_android.go b/fs/fsutil/file_android.go
@@ -0,0 +1,11 @@
+package fsutil
+
+import (
+ "io"
+
+ "golang.org/x/mobile/asset"
+)
+
+func OpenFile(path string) (io.ReadSeekCloser, error) {
+ return asset.Open(path)
+}
diff --git a/fs/util/file_js.go → fs/fsutil/file_js.go b/fs/util/file_js.go → fs/fsutil/file_js.go
@@ -1,7 +1,8 @@
-package util
+package fsutil
 
 import (
  "bytes"
+ "io"
  "io/ioutil"
  "net/http"
 )
@@ -14,7 +15,7 @@ func (f *file) Close() error {
  return nil
 }
 
-func OpenFile(path string) (ReadSeekCloser, error) {
+func OpenFile(path string) (io.ReadSeekCloser, error) {
  res, err := http.Get(path)
  if err != nil {
  return nil, err

diff --git a/fs/util/file_nojs.go → fs/fsutil/file_nojs.go b/fs/util/file_nojs.go → fs/fsutil/file_nojs.go
@@ -4,9 +4,10 @@
 // +build !android
 // +build !ios
 
-package util
+package fsutil
 
 import (
+ "io"
  "os"
  "path/filepath"
 )
@@ -16,6 +17,6 @@ import (
 // The path parts should be separated with slash '/' on any environments.
 //
 // Note that this doesn't work on mobiles.
-func OpenFile(path string) (ReadSeekCloser, error) {
+func OpenFile(path string) (io.ReadSeekCloser, error) {
  return os.Open(filepath.FromSlash(path))
 }
diff --git a/fs/local/localfs.go b/fs/local/localfs.go
@@ -4,7 +4,7 @@ import (
  "io"
 
  "github.com/goplus/spx/fs"
- "github.com/goplus/spx/fs/util"
+ "github.com/goplus/spx/fs/fsutil"
 )
 
 // -------------------------------------------------------------------------------------
@@ -20,7 +20,7 @@ func Open(base string) (fs.Dir, error) {
 
 // Open opens a zipped file object.
 func (p *FS) Open(name string) (io.ReadCloser, error) {
- f, err := util.OpenFile(p.base + name)
+ f, err := fsutil.OpenFile(p.base + name)
  return f, err
 }
 

diff --git a/fs/util/file.go b/fs/util/file.go
diff --git a/fs/util/file_android.go b/fs/util/file_android.go
diff --git a/internal/gdi/font.go b/internal/gdi/font.go
@@ -11,7 +11,7 @@ import (
  "sync"
 
  "github.com/golang/freetype/truetype"
- "github.com/goplus/spx/fs/util"
+ "github.com/goplus/spx/fs/fsutil"
  "golang.org/x/image/font"
  "golang.org/x/image/math/fixed"
 )
@@ -90,7 +90,7 @@ func (p *DefaultFont) findFontAtPath(
 }
 
 func (p *DefaultFont) tryFontFile(name, tryFile string, options *truetype.Options) bool {
- fp, err := util.OpenFile(tryFile)
+ fp, err := fsutil.OpenFile(tryFile)
  if err != nil {
  return false
  }