From 4d8a8999a56efe6db7522d2c5db75da29fa257e4 Mon Sep 17 00:00:00 2001 From: hexxa Date: Fri, 8 Oct 2021 17:32:48 +0800 Subject: [PATCH] fix(db): aggregate store pkgs under db dir --- src/client/users.go | 2 +- src/{ => db}/fileinfostore/file_info_store.go | 0 src/{ => db}/fileinfostore/file_info_store_test.go | 0 src/{ => db}/userstore/user_store.go | 0 src/{ => db}/userstore/user_store_test.go | 0 src/depidx/deps.go | 4 ++-- src/handlers/fileshdr/handlers.go | 2 +- src/handlers/multiusers/handlers.go | 2 +- src/handlers/multiusers/middlewares.go | 2 +- src/iolimiter/iolimiter.go | 2 +- src/server/config.go | 2 +- src/server/server.go | 4 ++-- src/server/server_space_limit_test.go | 2 +- src/server/server_users_test.go | 2 +- src/server/test_helpers.go | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename src/{ => db}/fileinfostore/file_info_store.go (100%) rename src/{ => db}/fileinfostore/file_info_store_test.go (100%) rename src/{ => db}/userstore/user_store.go (100%) rename src/{ => db}/userstore/user_store_test.go (100%) diff --git a/src/client/users.go b/src/client/users.go index c4252d5..f21140d 100644 --- a/src/client/users.go +++ b/src/client/users.go @@ -7,7 +7,7 @@ import ( "github.com/ihexxa/quickshare/src/handlers" "github.com/ihexxa/quickshare/src/handlers/multiusers" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" "github.com/parnurzeal/gorequest" ) diff --git a/src/fileinfostore/file_info_store.go b/src/db/fileinfostore/file_info_store.go similarity index 100% rename from src/fileinfostore/file_info_store.go rename to src/db/fileinfostore/file_info_store.go diff --git a/src/fileinfostore/file_info_store_test.go b/src/db/fileinfostore/file_info_store_test.go similarity index 100% rename from src/fileinfostore/file_info_store_test.go rename to src/db/fileinfostore/file_info_store_test.go diff --git a/src/userstore/user_store.go b/src/db/userstore/user_store.go similarity index 100% rename from src/userstore/user_store.go rename to src/db/userstore/user_store.go diff --git a/src/userstore/user_store_test.go b/src/db/userstore/user_store_test.go similarity index 100% rename from src/userstore/user_store_test.go rename to src/db/userstore/user_store_test.go diff --git a/src/depidx/deps.go b/src/depidx/deps.go index ff483f0..661a893 100644 --- a/src/depidx/deps.go +++ b/src/depidx/deps.go @@ -5,12 +5,12 @@ import ( "go.uber.org/zap" "github.com/ihexxa/quickshare/src/cryptoutil" - "github.com/ihexxa/quickshare/src/fileinfostore" + "github.com/ihexxa/quickshare/src/db/fileinfostore" "github.com/ihexxa/quickshare/src/fs" "github.com/ihexxa/quickshare/src/idgen" "github.com/ihexxa/quickshare/src/iolimiter" "github.com/ihexxa/quickshare/src/kvstore" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" "github.com/ihexxa/quickshare/src/worker" ) diff --git a/src/handlers/fileshdr/handlers.go b/src/handlers/fileshdr/handlers.go index 7d31c14..8e3c0d4 100644 --- a/src/handlers/fileshdr/handlers.go +++ b/src/handlers/fileshdr/handlers.go @@ -20,7 +20,7 @@ import ( "github.com/ihexxa/quickshare/src/depidx" q "github.com/ihexxa/quickshare/src/handlers" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" "github.com/ihexxa/quickshare/src/worker/localworker" ) diff --git a/src/handlers/multiusers/handlers.go b/src/handlers/multiusers/handlers.go index 6f8ec18..055bbb2 100644 --- a/src/handlers/multiusers/handlers.go +++ b/src/handlers/multiusers/handlers.go @@ -14,7 +14,7 @@ import ( "github.com/ihexxa/quickshare/src/depidx" q "github.com/ihexxa/quickshare/src/handlers" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" ) var ( diff --git a/src/handlers/multiusers/middlewares.go b/src/handlers/multiusers/middlewares.go index 1446f38..6fc8643 100644 --- a/src/handlers/multiusers/middlewares.go +++ b/src/handlers/multiusers/middlewares.go @@ -9,7 +9,7 @@ import ( "github.com/gin-gonic/gin" q "github.com/ihexxa/quickshare/src/handlers" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" ) func apiRuleCname(role, method, path string) string { diff --git a/src/iolimiter/iolimiter.go b/src/iolimiter/iolimiter.go index a2c366c..1738d1a 100644 --- a/src/iolimiter/iolimiter.go +++ b/src/iolimiter/iolimiter.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/ihexxa/quickshare/src/golimiter" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" ) const cacheSizeLimit = 1024 diff --git a/src/server/config.go b/src/server/config.go index 98ef5da..aa286a4 100644 --- a/src/server/config.go +++ b/src/server/config.go @@ -3,7 +3,7 @@ package server import ( "encoding/json" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" ) type FSConfig struct { diff --git a/src/server/server.go b/src/server/server.go index 977a19c..882b681 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -23,8 +23,9 @@ import ( "golang.org/x/crypto/bcrypt" "github.com/ihexxa/quickshare/src/cryptoutil/jwt" + "github.com/ihexxa/quickshare/src/db/fileinfostore" + "github.com/ihexxa/quickshare/src/db/userstore" "github.com/ihexxa/quickshare/src/depidx" - "github.com/ihexxa/quickshare/src/fileinfostore" "github.com/ihexxa/quickshare/src/fs" "github.com/ihexxa/quickshare/src/fs/local" "github.com/ihexxa/quickshare/src/handlers/fileshdr" @@ -34,7 +35,6 @@ import ( "github.com/ihexxa/quickshare/src/iolimiter" "github.com/ihexxa/quickshare/src/kvstore" "github.com/ihexxa/quickshare/src/kvstore/boltdbpvd" - "github.com/ihexxa/quickshare/src/userstore" "github.com/ihexxa/quickshare/src/worker/localworker" ) diff --git a/src/server/server_space_limit_test.go b/src/server/server_space_limit_test.go index 10e7594..2e14025 100644 --- a/src/server/server_space_limit_test.go +++ b/src/server/server_space_limit_test.go @@ -7,7 +7,7 @@ import ( "github.com/ihexxa/quickshare/src/client" q "github.com/ihexxa/quickshare/src/handlers" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" ) func TestSpaceLimit(t *testing.T) { diff --git a/src/server/server_users_test.go b/src/server/server_users_test.go index 5096af7..422656a 100644 --- a/src/server/server_users_test.go +++ b/src/server/server_users_test.go @@ -9,7 +9,7 @@ import ( "github.com/ihexxa/quickshare/src/client" q "github.com/ihexxa/quickshare/src/handlers" su "github.com/ihexxa/quickshare/src/handlers/singleuserhdr" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" ) func TestUsersHandlers(t *testing.T) { diff --git a/src/server/test_helpers.go b/src/server/test_helpers.go index 096951e..07f2214 100644 --- a/src/server/test_helpers.go +++ b/src/server/test_helpers.go @@ -15,7 +15,7 @@ import ( "github.com/ihexxa/gocfg" "github.com/ihexxa/quickshare/src/client" fspkg "github.com/ihexxa/quickshare/src/fs" - "github.com/ihexxa/quickshare/src/userstore" + "github.com/ihexxa/quickshare/src/db/userstore" ) func startTestServer(config string) *Server {