Add filestorage, update interface, fix typo error (#46)

* Add filestorage, update interface, fix typo error

config/instance.go

@@ -64,6 +64,9 @@ const (
 )
 
 func EmbedDefaults(cfgInstance *Instance) {
+	if cfgInstance.StorageCnf.StorageType == "" {
+		cfgInstance.StorageCnf.StorageType = "s3"
+	}
 	if cfgInstance.StorageCnf.StorageConcurrency == 0 {
 		cfgInstance.StorageCnf.StorageConcurrency = DefaultStorageConcurrency
 	}

config/proxy.go

@@ -1,5 +1,5 @@
 package config
 
 type Proxy struct {
-	ConsolePort string `json:"console_port" toml:"console+port" yaml:"console_port"`
+	ConsolePort string `json:"console_port" toml:"console_port" yaml:"console_port"`
 }

config/storage.go

@@ -16,4 +16,7 @@ type Storage struct {
 	StorageConcurrency int64 `json:"storage_concurrency" toml:"storage_concurrency" yaml:"storage_concurrency"`
 
 	StorageRegion string `json:"storage_region" toml:"storage_region" yaml:"storage_region"`
+
+	// File storage default s3. Available: s3, fs
+	StorageType string `json:"storage_type" toml:"storage_type" yaml:"storage_type"`
 }

pkg/core/core.go

@@ -116,10 +116,12 @@ func (i *Instance) Run(instanceCnf *config.Instance) error {
 		return err
 	}
 
-	s := storage.NewStorage(
+	s, err := storage.NewStorage(
 		&instanceCnf.StorageCnf,
 	)
-
+	if err != nil {
+		return err
+	}
 	var cr crypt.Crypter = nil
 	if instanceCnf.CryptoCnf.GPGKeyPath != "" {
 		cr, err = crypt.NewCrypto(&instanceCnf.CryptoCnf)

pkg/proc/interaction.go

@@ -211,7 +211,10 @@ func ProcConn(s storage.StorageInteractor, cr crypt.Crypter, ycl client.YproxyCl
 			return nil
 		}
 		config.EmbedDefaults(&instanceCnf)
-		oldStorage := storage.NewStorage(&instanceCnf.StorageCnf)
+		oldStorage, err := storage.NewStorage(&instanceCnf.StorageCnf)
+		if err != nil {
+			return err
+		}
 		fmt.Printf("ok new conf: %v\n", instanceCnf)
 
 		//list objects

pkg/storage/filestorage.go

@@ -0,0 +1,71 @@
+package storage
+
+import (
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"path/filepath"
+
+	"github.com/yezzey-gp/yproxy/config"
+)
+
+// Storage prefix uses as path to folder.
+// "/path/to/folder/" + "path/to/file.txt"
+type FileStorageInteractor struct {
+	StorageInteractor
+	cnf *config.Storage
+}
+
+func (s *FileStorageInteractor) CatFileFromStorage(name string, offset int64) (io.ReadCloser, error) {
+	file, err := os.Open(s.cnf.StoragePrefix + name)
+	if err != nil {
+		return nil, err
+	}
+	_, err = io.CopyN(io.Discard, file, offset)
+	return file, err
+}
+func (s *FileStorageInteractor) ListPath(prefix string) ([]*ObjectInfo, error) {
+	var data []*ObjectInfo
+	err := filepath.WalkDir(s.cnf.StoragePrefix+prefix, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if d.IsDir() {
+			return nil
+		}
+		file, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		fileinfo, err := file.Stat()
+		if err != nil {
+			return err
+		}
+		data = append(data, &ObjectInfo{fileinfo.Name(), fileinfo.Size()})
+		return nil
+	})
+	return data, err
+}
+
+func (s *FileStorageInteractor) PutFileToDest(name string, r io.Reader) error {
+	file, err := os.Create(s.cnf.StoragePrefix + name)
+	if err != nil {
+		return err
+	}
+	_, err = io.Copy(file, r)
+	return err
+}
+
+func (s *FileStorageInteractor) PatchFile(name string, r io.ReadSeeker, startOffset int64) error {
+	//UNUSED TODO
+	return fmt.Errorf("TODO")
+}
+
+func (s *FileStorageInteractor) MoveObject(from string, to string) error {
+	return os.Rename(s.cnf.StoragePrefix+from, s.cnf.StoragePrefix+to)
+}
+
+func (s *FileStorageInteractor) DeleteObject(key string) error {
+	return os.Remove(s.cnf.StoragePrefix + key)
+}

pkg/storage/s3storage.go

@@ -69,7 +69,7 @@ func (s *S3StorageInteractor) PutFileToDest(name string, r io.Reader) error {
 	return err
 }
 
-func (s *S3StorageInteractor) PatchFile(name string, r io.ReadSeeker, startOffste int64) error {
+func (s *S3StorageInteractor) PatchFile(name string, r io.ReadSeeker, startOffset int64) error {
 	sess, err := s.pool.GetSession(context.TODO())
 	if err != nil {
 		ylogger.Zero.Err(err).Msg("failed to acquire s3 session")
@@ -82,7 +82,7 @@ func (s *S3StorageInteractor) PatchFile(name string, r io.ReadSeeker, startOffst
 		Bucket:       &s.cnf.StorageBucket,
 		Key:          aws.String(objectPath),
 		Body:         r,
-		ContentRange: aws.String(fmt.Sprintf("bytes %d-18446744073709551615", startOffste)),
+		ContentRange: aws.String(fmt.Sprintf("bytes %d-18446744073709551615", startOffset)),
 	}
 
 	_, err = sess.PatchObject(input)

pkg/storage/storage.go

@@ -1,6 +1,7 @@
 package storage
 
 import (
+	"fmt"
 	"io"
 
 	"github.com/yezzey-gp/yproxy/config"
@@ -12,22 +13,36 @@ type StorageReader interface {
 
 type StorageWriter interface {
 	PutFileToDest(name string, r io.Reader) error
-	PatchFile(name string, r io.ReadSeeker, startOffste int64) error
+	PatchFile(name string, r io.ReadSeeker, startOffset int64) error
 }
 
 type StorageLister interface {
 	ListPath(prefix string) ([]*ObjectInfo, error)
 }
 
+type StorageMover interface {
+	MoveObject(from string, to string) error
+	DeleteObject(key string) error
+}
 type StorageInteractor interface {
 	StorageReader
 	StorageWriter
 	StorageLister
+	StorageMover
 }
 
-func NewStorage(cnf *config.Storage) StorageInteractor {
-	return &S3StorageInteractor{
-		pool: NewSessionPool(cnf),
-		cnf:  cnf,
+func NewStorage(cnf *config.Storage) (StorageInteractor, error) {
+	switch cnf.StorageType {
+	case "fs":
+		return &FileStorageInteractor{
+			cnf: cnf,
+		}, nil
+	case "s3":
+		return &S3StorageInteractor{
+			pool: NewSessionPool(cnf),
+			cnf:  cnf,
+		}, nil
+	default:
+		return nil, fmt.Errorf("wrong storage type " + cnf.StorageType)
 	}
 }