From 6a23e30235e5b81e9b44e3c9149074aa2d801bbf Mon Sep 17 00:00:00 2001
From: xushiwei <x@goplus.org>
Date: Wed, 1 Dec 2021 13:10:14 +0800
Subject: [PATCH] fs/util => fs/fsutil

---
 fs/fsutil/file_android.go        | 11 +++++++++++
 fs/{util => fsutil}/file_js.go   |  5 +++--
 fs/{util => fsutil}/file_nojs.go |  5 +++--
 fs/local/localfs.go              |  4 ++--
 fs/util/file.go                  |  9 ---------
 fs/util/file_android.go          |  9 ---------
 internal/gdi/font.go             |  4 ++--
 7 files changed, 21 insertions(+), 26 deletions(-)
 create mode 100644 fs/fsutil/file_android.go
 rename fs/{util => fsutil}/file_js.go (80%)
 rename fs/{util => fsutil}/file_nojs.go (84%)
 delete mode 100644 fs/util/file.go
 delete mode 100644 fs/util/file_android.go

diff --git a/fs/fsutil/file_android.go b/fs/fsutil/file_android.go
new file mode 100644
index 00000000..4dce5e98
--- /dev/null
+++ 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 b/fs/fsutil/file_js.go
similarity index 80%
rename from fs/util/file_js.go
rename to fs/fsutil/file_js.go
index 567348f5..12c72a38 100644
--- a/fs/util/file_js.go
+++ b/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 b/fs/fsutil/file_nojs.go
similarity index 84%
rename from fs/util/file_nojs.go
rename to fs/fsutil/file_nojs.go
index 63f873d5..5195151a 100644
--- a/fs/util/file_nojs.go
+++ b/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
index d5f71a1b..9e0294db 100644
--- 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
deleted file mode 100644
index 8eaa0a5e..00000000
--- a/fs/util/file.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package util
-
-import "io"
-
-// ReadSeekCloser is io.ReadSeeker and io.Closer.
-type ReadSeekCloser interface {
-	io.ReadSeeker
-	io.Closer
-}
diff --git a/fs/util/file_android.go b/fs/util/file_android.go
deleted file mode 100644
index bb5ab4fa..00000000
--- a/fs/util/file_android.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package util
-
-import (
-	"golang.org/x/mobile/asset"
-)
-
-func OpenFile(path string) (ReadSeekCloser, error) {
-	return asset.Open(path)
-}
diff --git a/internal/gdi/font.go b/internal/gdi/font.go
index a53a2fc6..9e67cd8e 100644
--- 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
 	}