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

@@ -3,6 +3,7 @@ package storage
import (
"context"
"errors"
"local/storage/resolve"
"strings"
"time"
@@ -55,8 +56,8 @@ func NewMongo(addr string, auth ...string) (*Mongo, error) {
}
func (mg *Mongo) List(ns []string, limits ...string) ([]string, error) {
namespace := resolveNamespace(ns)
limits = resolveLimits(limits)
namespace := resolve.Namespace(ns)
limits = resolve.Limits(limits)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
collection := mg.db.Database(DefaultNamespace).Collection(namespace)
@@ -88,7 +89,7 @@ func (mg *Mongo) List(ns []string, limits ...string) ([]string, error) {
}
func (mg *Mongo) Get(key string, ns ...string) ([]byte, error) {
namespace := resolveNamespace(ns)
namespace := resolve.Namespace(ns)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
collection := mg.db.Database(DefaultNamespace).Collection(namespace)
@@ -118,7 +119,7 @@ func (mg *Mongo) Get(key string, ns ...string) ([]byte, error) {
}
func (mg *Mongo) Set(key string, value []byte, ns ...string) error {
namespace := resolveNamespace(ns)
namespace := resolve.Namespace(ns)
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
collection := mg.db.Database(DefaultNamespace).Collection(namespace)