lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

Fix: geodata reader for multi-platform compatibility (#964)

Browse Source
This commit is contained in:
rurirei 2021-05-04 00:12:47 +08:00 committed by GitHub
parent 1822504ed8
commit 238b87d26a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/geodata/decode.go
View File

@ -11,13 +11,13 @@ package geodata
import ( import (
"io" "io"
"os"
"runtime" "runtime"
"strings" "strings"
"google.golang.org/protobuf/encoding/protowire" "google.golang.org/protobuf/encoding/protowire"
"github.com/v2fly/v2ray-core/v4/common/errors" "github.com/v2fly/v2ray-core/v4/common/errors"
"github.com/v2fly/v2ray-core/v4/common/platform/filesystem"
) )
//go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen //go:generate go run github.com/v2fly/v2ray-core/v4/common/errors/errorgen
@ -30,7 +30,7 @@ var (
errCodeNotFound = errors.New("code not found") errCodeNotFound = errors.New("code not found")
) )
func emitBytes(f *os.File, code string) ([]byte, error) { func emitBytes(f io.ReadSeeker, code string) ([]byte, error) {
count := 1 count := 1
isInner := false isInner := false
tempContainer := make([]byte, 0, 5) tempContainer := make([]byte, 0, 5)
@ -107,7 +107,7 @@ Loop:
} }
func Decode(filename, code string) ([]byte, error) { func Decode(filename, code string) ([]byte, error) {
f, err := os.Open(filename) f, err := filesystem.NewFileSeeker(filename)
if err != nil { if err != nil {
return nil, newError("failed to open file: ", filename).Base(err) return nil, newError("failed to open file: ", filename).Base(err)
} }

6
common/platform/filesystem/file.go
View File

@ -8,10 +8,16 @@ import (
"github.com/v2fly/v2ray-core/v4/common/platform" "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 FileReaderFunc func(path string) (io.ReadCloser, error)
type FileWriterFunc func(path string) (io.WriteCloser, error) type FileWriterFunc func(path string) (io.WriteCloser, error)
var NewFileSeeker FileSeekerFunc = func(path string) (io.ReadSeekCloser, error) {
return os.Open(path)
}
var NewFileReader FileReaderFunc = func(path string) (io.ReadCloser, error) { var NewFileReader FileReaderFunc = func(path string) (io.ReadCloser, error) {
return os.Open(path) return os.Open(path)
} }