Browse Source

isolate filesystem interface package

Shelikhoo 4 years ago
parent
commit
70c66853f9

+ 4 - 4
common/environment/base.go

@@ -2,7 +2,7 @@ package environment
 
 import (
 	"github.com/v2fly/v2ray-core/v4/common/log"
-	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
+	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem/fsifce"
 	"github.com/v2fly/v2ray-core/v4/transport/internet"
 	"github.com/v2fly/v2ray-core/v4/transport/internet/tagged"
 )
@@ -35,7 +35,7 @@ type LogCapabilitySet interface {
 }
 
 type FileSystemCapabilitySet interface {
-	OpenFileForReadSeek() filesystem.FileSeekerFunc
-	OpenFileForRead() filesystem.FileReaderFunc
-	OpenFileForWrite() filesystem.FileWriterFunc
+	OpenFileForReadSeek() fsifce.FileSeekerFunc
+	OpenFileForRead() fsifce.FileReaderFunc
+	OpenFileForWrite() fsifce.FileWriterFunc
 }

+ 4 - 9
common/platform/filesystem/file.go

@@ -1,6 +1,7 @@
 package filesystem
 
 import (
+	"github.com/v2fly/v2ray-core/v4/common/platform/filesystem/fsifce"
 	"io"
 	"os"
 
@@ -8,21 +9,15 @@ import (
 	"github.com/v2fly/v2ray-core/v4/common/platform"
 )
 
-type FileSeekerFunc func(path string) (io.ReadSeekCloser, error)
-
-type FileReaderFunc func(path string) (io.ReadCloser, error)
-
-type FileWriterFunc func(path string) (io.WriteCloser, error)
-
-var NewFileSeeker FileSeekerFunc = func(path string) (io.ReadSeekCloser, error) {
+var NewFileSeeker fsifce.FileSeekerFunc = func(path string) (io.ReadSeekCloser, error) {
 	return os.Open(path)
 }
 
-var NewFileReader FileReaderFunc = func(path string) (io.ReadCloser, error) {
+var NewFileReader fsifce.FileReaderFunc = func(path string) (io.ReadCloser, error) {
 	return os.Open(path)
 }
 
-var NewFileWriter FileWriterFunc = func(path string) (io.WriteCloser, error) {
+var NewFileWriter fsifce.FileWriterFunc = func(path string) (io.WriteCloser, error) {
 	return os.Create(path)
 }
 

+ 9 - 0
common/platform/filesystem/fsifce/ifce.go

@@ -0,0 +1,9 @@
+package fsifce
+
+import "io"
+
+type FileSeekerFunc func(path string) (io.ReadSeekCloser, error)
+
+type FileReaderFunc func(path string) (io.ReadCloser, error)
+
+type FileWriterFunc func(path string) (io.WriteCloser, error)