move resolve into package

This commit is contained in:
Bel LaPointe
2021-02-21 12:39:15 -06:00
parent ff8b908ee7
commit 7f2d451ca4
15 changed files with 205 additions and 175 deletions

View File

@@ -4,6 +4,7 @@ import (
"bytes"
"fmt"
"io/ioutil"
"local/storage/resolve"
"net/url"
"sort"
"strings"
@@ -27,8 +28,8 @@ func NewMinio(addr, user, pass string) (*Minio, error) {
}
func (m *Minio) List(ns []string, limits ...string) ([]string, error) {
namespace := resolveNamespace(ns)
limits = resolveLimits(limits)
namespace := resolve.Namespace(ns)
limits = resolve.Limits(limits)
done := make(chan struct{})
defer close(done)
keys := []string{}
@@ -51,7 +52,7 @@ func (m *Minio) List(ns []string, limits ...string) ([]string, error) {
}
func (m *Minio) Get(key string, ns ...string) ([]byte, error) {
namespace := resolveNamespace(ns)
namespace := resolve.Namespace(ns)
obj, err := m.db.GetObject(namespace, key, minio.GetObjectOptions{})
if err == nil {
var stat minio.ObjectInfo
@@ -68,7 +69,7 @@ func (m *Minio) Get(key string, ns ...string) ([]byte, error) {
}
func (m *Minio) Set(key string, value []byte, ns ...string) error {
namespace := resolveNamespace(ns)
namespace := resolve.Namespace(ns)
if ok, err := m.db.BucketExists(namespace); err != nil {
return err
} else if !ok {