Replaced concrete filesystem dependency with interface

Author: Galaco

filesystem.go

@@ -2,7 +2,7 @@ package vmt
 
 import (
 	keyvalues "github.com/galaco/KeyValues"
-	"github.com/golang-source-engine/filesystem"
+	"io"
 	"strings"
 )
 
@@ -11,10 +11,14 @@ const (
 	vmtExtension    = ".vmt"
 )
 
+type virtualFilesystem interface {
+	GetFile(string) (io.Reader, error)
+}
+
 // FromFilesystem loads a material from filesystem
 // Its important to note this is the ONLY way to automatically
 // resolve `import` properties present in a vmt
-func FromFilesystem(filePath string, fs *filesystem.FileSystem, definition Material) (Material, error) {
+func FromFilesystem(filePath string, fs virtualFilesystem, definition Material) (Material, error) {
 	// ensure proper file path
 	validatedPath := sanitizeFilePath(filePath)
 
@@ -38,7 +42,7 @@ func sanitizeFilePath(filePath string) string {
 	return filePath
 }
 
-func readVmtFromFilesystem(path string, fs *filesystem.FileSystem) (*keyvalues.KeyValue, error) {
+func readVmtFromFilesystem(path string, fs virtualFilesystem) (*keyvalues.KeyValue, error) {
 	root, err := readKeyValuesFromFilesystem(path, fs)
 	if err != nil {
 		return nil, err
@@ -56,7 +60,7 @@ func readVmtFromFilesystem(path string, fs *filesystem.FileSystem) (*keyvalues.K
 	return root, nil
 }
 
-func mergeIncludedVmtRecursive(base *keyvalues.KeyValue, includePath string, fs *filesystem.FileSystem) (*keyvalues.KeyValue, error) {
+func mergeIncludedVmtRecursive(base *keyvalues.KeyValue, includePath string, fs virtualFilesystem) (*keyvalues.KeyValue, error) {
 	parent, err := readKeyValuesFromFilesystem(includePath, fs)
 	if err != nil {
 		return base, err
@@ -80,7 +84,7 @@ func mergeIncludedVmtRecursive(base *keyvalues.KeyValue, includePath string, fs
 // ReadKeyValues loads a keyvalues file.
 // Its just a simple wrapper that combines the KeyValues library and
 // the filesystem module.
-func readKeyValuesFromFilesystem(filePath string, fs *filesystem.FileSystem) (*keyvalues.KeyValue, error) {
+func readKeyValuesFromFilesystem(filePath string, fs virtualFilesystem) (*keyvalues.KeyValue, error) {
 	stream, err := fs.GetFile(filePath)
 	if err != nil {
 		return nil, err

go.mod

@@ -2,7 +2,4 @@ module github.com/golang-source-engine/vmt
 
 go 1.13
 
-require (
-	github.com/galaco/KeyValues v1.4.1
-	github.com/golang-source-engine/filesystem v0.1.2
-)
+require github.com/galaco/KeyValues v1.4.1

go.sum

@@ -10,12 +10,6 @@ github.com/galaco/vpk2 v0.0.0-20181012095330-21e4d1f6c888 h1:QCMt6AZ5gwsJ3SNsvTU
 github.com/galaco/vpk2 v0.0.0-20181012095330-21e4d1f6c888/go.mod h1:jL22XAWuUlYUmONuamxDdbDlGJhuOFkqNRPJwuBA3X8=
 github.com/go-gl/mathgl v0.0.0-20190713194549-592312d8590a h1:yoAEv7yeWqfL/l9A/J5QOndXIJCldv+uuQB1DSNQbS0=
 github.com/go-gl/mathgl v0.0.0-20190713194549-592312d8590a/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ=
-github.com/golang-source-engine/filesystem v0.1.0 h1:KyOT6ibo5k6UpLg3JfVRRpwVSX6k2AgQEARNDjDFUIA=
-github.com/golang-source-engine/filesystem v0.1.0/go.mod h1:yWGjkMHmaX6NvpUKueRi7/QubJDFp2dxyHKhEWZRwcM=
-github.com/golang-source-engine/filesystem v0.1.1 h1:MbvhLir27h+nppmV6OjN1nSsSf/bcxijzR73Yr+YDX0=
-github.com/golang-source-engine/filesystem v0.1.1/go.mod h1:39q6MJzPeePmSiCdb1esQRNrdalKnz2UAe/bNmNtz3k=
-github.com/golang-source-engine/filesystem v0.1.2 h1:6e+E71FSrohJlcbTNmOh1cVnPDP04/V4Gkfno/5VdGI=
-github.com/golang-source-engine/filesystem v0.1.2/go.mod h1:HKc/2NsiY0wj9uRSM6s5AQIt/8J9T7qx2nITY8JBKEU=
 golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a h1:gHevYm0pO4QUbwy8Dmdr01R5r1BuKtfYqRqF0h/Cbh0=
 golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=