refactor(kv): interface

Author: iyear

app/dl/files.go

@@ -31,7 +31,7 @@ type fMessage struct {
 	Text   interface{} `mapstructure:"text"`
 }
 
-func parseFiles(ctx context.Context, client *tg.Client, kvd *kv.KV, files []string) ([]*dialog, error) {
+func parseFiles(ctx context.Context, client *tg.Client, kvd kv.KV, files []string) ([]*dialog, error) {
 	dialogs := make([]*dialog, 0, len(files))
 
 	for _, file := range files {
@@ -46,7 +46,7 @@ func parseFiles(ctx context.Context, client *tg.Client, kvd *kv.KV, files []stri
 	return dialogs, nil
 }
 
-func parseFile(ctx context.Context, client *tg.Client, kvd *kv.KV, file string) (*dialog, error) {
+func parseFile(ctx context.Context, client *tg.Client, kvd kv.KV, file string) (*dialog, error) {
 	f, err := os.Open(file)
 	if err != nil {
 		return nil, err
@@ -105,7 +105,7 @@ func collect(ctx context.Context, r io.Reader, peer peers.Peer) (*dialog, error)
 	return m, nil
 }
 
-func getChatInfo(ctx context.Context, client *tg.Client, kvd *kv.KV, r io.Reader) (peers.Peer, error) {
+func getChatInfo(ctx context.Context, client *tg.Client, kvd kv.KV, r io.Reader) (peers.Peer, error) {
 	d := jstream.NewDecoder(r, 1).EmitKV()
 
 	chatID := int64(0)

app/dl/iter.go

@@ -38,7 +38,7 @@ type fileTemplate struct {
 	DownloadDate int64
 }
 
-func newIter(client *tg.Client, kvd *kv.KV, tmpl string, items ...[]*dialog) (*iter, error) {
+func newIter(client *tg.Client, kvd kv.KV, tmpl string, items ...[]*dialog) (*iter, error) {
 	t, err := template.New("dl").Parse(tmpl)
 	if err != nil {
 		return nil, err

app/dl/urls.go

@@ -9,7 +9,7 @@ import (
 	"github.com/iyear/tdl/pkg/utils"
 )
 
-func parseURLs(ctx context.Context, client *tg.Client, kvd *kv.KV, urls []string) ([]*dialog, error) {
+func parseURLs(ctx context.Context, client *tg.Client, kvd kv.KV, urls []string) ([]*dialog, error) {
 	manager := peers.Options{Storage: storage.NewPeers(kvd)}.Build(client)
 	msgMap := make(map[int64]*dialog)
 

app/internal/tgc/tgc.go

@@ -17,7 +17,7 @@ import (
 	"time"
 )
 
-func New(login bool, middlewares ...telegram.Middleware) (*telegram.Client, *kv.KV, error) {
+func New(login bool, middlewares ...telegram.Middleware) (*telegram.Client, kv.KV, error) {
 	kvd, err := kv.New(kv.Options{
 		Path: consts.KVPath,
 		NS:   viper.GetString(consts.FlagNamespace),
@@ -58,10 +58,10 @@ func New(login bool, middlewares ...telegram.Middleware) (*telegram.Client, *kv.
 	}), kvd, nil
 }
 
-func NoLogin(middlewares ...telegram.Middleware) (*telegram.Client, *kv.KV, error) {
+func NoLogin(middlewares ...telegram.Middleware) (*telegram.Client, kv.KV, error) {
 	return New(false, append(middlewares, floodwait.NewSimpleWaiter())...)
 }
 
-func Login(middlewares ...telegram.Middleware) (*telegram.Client, *kv.KV, error) {
+func Login(middlewares ...telegram.Middleware) (*telegram.Client, kv.KV, error) {
 	return New(true, append(middlewares, floodwait.NewSimpleWaiter())...)
 }

pkg/kv/bolt.go

@@ -1,52 +1,15 @@
 package kv
 
 import (
-	"errors"
-	"github.com/iyear/tdl/pkg/validator"
 	"go.etcd.io/bbolt"
-	"os"
-	"time"
 )
 
-var (
-	ErrNotFound = errors.New("key not found")
-)
-
-type Options struct {
-	Path string `validate:"required"`
-	NS   string `validate:"required"`
-}
-
-type KV struct {
+type Bolt struct {
 	ns []byte
 	db *bbolt.DB
 }
 
-func New(opts Options) (*KV, error) {
-	if err := validator.Struct(&opts); err != nil {
-		return nil, err
-	}
-
-	db, err := bbolt.Open(opts.Path, os.ModePerm, &bbolt.Options{
-		Timeout:      time.Second,
-		NoGrowSync:   false,
-		FreelistType: bbolt.FreelistArrayType,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	if err = db.Update(func(tx *bbolt.Tx) error {
-		_, err := tx.CreateBucketIfNotExists([]byte(opts.NS))
-		return err
-	}); err != nil {
-		return nil, err
-	}
-
-	return &KV{db: db, ns: []byte(opts.NS)}, nil
-}
-
-func (b *KV) Get(key string) ([]byte, error) {
+func (b *Bolt) Get(key string) ([]byte, error) {
 	var val []byte
 
 	if err := b.db.View(func(tx *bbolt.Tx) error {
@@ -62,7 +25,7 @@ func (b *KV) Get(key string) ([]byte, error) {
 	return val, nil
 }
 
-func (b *KV) Set(key string, val []byte) error {
+func (b *Bolt) Set(key string, val []byte) error {
 	return b.db.Update(func(tx *bbolt.Tx) error {
 		return tx.Bucket(b.ns).Put([]byte(key), val)
 	})

pkg/kv/kv.go

@@ -0,0 +1,47 @@
+package kv
+
+import (
+	"errors"
+	"github.com/iyear/tdl/pkg/validator"
+	"go.etcd.io/bbolt"
+	"os"
+	"time"
+)
+
+var (
+	ErrNotFound = errors.New("key not found")
+)
+
+type KV interface {
+	Get(key string) ([]byte, error)
+	Set(key string, value []byte) error
+}
+
+type Options struct {
+	NS   string `validate:"required"`
+	Path string `validate:"required"`
+}
+
+func New(opts Options) (KV, error) {
+	if err := validator.Struct(&opts); err != nil {
+		return nil, err
+	}
+
+	db, err := bbolt.Open(opts.Path, os.ModePerm, &bbolt.Options{
+		Timeout:      time.Second,
+		NoGrowSync:   false,
+		FreelistType: bbolt.FreelistArrayType,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	if err = db.Update(func(tx *bbolt.Tx) error {
+		_, err := tx.CreateBucketIfNotExists([]byte(opts.NS))
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return &Bolt{db: db, ns: []byte(opts.NS)}, nil
+}

pkg/storage/peers.go

@@ -10,10 +10,10 @@ import (
 )
 
 type Peers struct {
-	kv *kv.KV
+	kv kv.KV
 }
 
-func NewPeers(kv *kv.KV) *Peers {
+func NewPeers(kv kv.KV) peers.Storage {
 	return &Peers{kv: kv}
 }
 

pkg/storage/session.go

@@ -3,16 +3,17 @@ package storage
 import (
 	"context"
 	"errors"
+	"github.com/gotd/td/telegram"
 	"github.com/iyear/tdl/pkg/key"
 	"github.com/iyear/tdl/pkg/kv"
 )
 
 type Session struct {
-	kv    *kv.KV
+	kv    kv.KV
 	login bool
 }
 
-func NewSession(kv *kv.KV, login bool) *Session {
+func NewSession(kv kv.KV, login bool) telegram.SessionStorage {
 	return &Session{kv: kv, login: login}
 }
 

pkg/storage/state.go

@@ -9,10 +9,10 @@ import (
 )
 
 type State struct {
-	kv *kv.KV
+	kv kv.KV
 }
 
-func NewState(kv *kv.KV) *State {
+func NewState(kv kv.KV) updates.StateStorage {
 	return &State{kv: kv}
 }