From a4137102e6664aa7db5fe002b1676f704f2d9648 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Wed, 24 Jan 2024 03:36:03 -0500 Subject: [PATCH] fix: import cycle --- api/s5/http.go | 11 ----------- protocols/s5.go | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/api/s5/http.go b/api/s5/http.go index 87bc6e3..8072eaf 100644 --- a/api/s5/http.go +++ b/api/s5/http.go @@ -1342,14 +1342,3 @@ func setAuthCookie(jwt string, jc jape.Context) { http.SetCookie(jc.ResponseWriter, &authCookie) } - -func GenerateDownloadUrl(hash *encoding.Multihash, portal interfaces.Portal) string { - domain := portal.Config().GetString("core.domain") - - hashStr, err := hash.ToBase64Url() - if err != nil { - portal.Logger().Error("error encoding hash", zap.Error(err)) - } - - return fmt.Sprintf("https://%s/api/s5/download/%s", domain, hashStr) -} diff --git a/protocols/s5.go b/protocols/s5.go index 92e837b..aee3a17 100644 --- a/protocols/s5.go +++ b/protocols/s5.go @@ -10,7 +10,6 @@ import ( s5node "git.lumeweb.com/LumeWeb/libs5-go/node" s5storage "git.lumeweb.com/LumeWeb/libs5-go/storage" "git.lumeweb.com/LumeWeb/libs5-go/types" - "git.lumeweb.com/LumeWeb/portal/api/s5" "git.lumeweb.com/LumeWeb/portal/interfaces" bolt "go.etcd.io/bbolt" "go.uber.org/zap" @@ -140,7 +139,7 @@ func (s S5ProviderStore) Provide(hash *encoding.Multihash, kind []types.StorageL case types.StorageLocationTypeArchive: return s5storage.NewStorageLocation(int(types.StorageLocationTypeArchive), []string{}, calculateExpiry(24*time.Hour)), nil case types.StorageLocationTypeFile, types.StorageLocationTypeFull: - return s5storage.NewStorageLocation(int(types.StorageLocationTypeArchive), []string{s5.GenerateDownloadUrl(hash, s.proto.portal)}, calculateExpiry(24*time.Hour)), nil + return s5storage.NewStorageLocation(int(types.StorageLocationTypeArchive), []string{generateDownloadUrl(hash, s.proto.portal)}, calculateExpiry(24*time.Hour)), nil } } @@ -154,3 +153,14 @@ func (s S5ProviderStore) Provide(hash *encoding.Multihash, kind []types.StorageL func calculateExpiry(duration time.Duration) int64 { return time.Now().Add(duration).Unix() } + +func generateDownloadUrl(hash *encoding.Multihash, portal interfaces.Portal) string { + domain := portal.Config().GetString("core.domain") + + hashStr, err := hash.ToBase64Url() + if err != nil { + portal.Logger().Error("error encoding hash", zap.Error(err)) + } + + return fmt.Sprintf("https://%s/api/s5/download/%s", domain, hashStr) +}