LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

fix: import cycle

This commit is contained in:
Derrick Hammer 2024-01-24 03:36:03 -05:00
parent 6a2b1b4a9b
commit a4137102e6
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/s5/http.go
View File

@ -1342,14 +1342,3 @@ func setAuthCookie(jwt string, jc jape.Context) {
http.SetCookie(jc.ResponseWriter, &authCookie) 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)
}

14
protocols/s5.go
View File

@ -10,7 +10,6 @@ import (
s5node "git.lumeweb.com/LumeWeb/libs5-go/node" s5node "git.lumeweb.com/LumeWeb/libs5-go/node"
s5storage "git.lumeweb.com/LumeWeb/libs5-go/storage" s5storage "git.lumeweb.com/LumeWeb/libs5-go/storage"
"git.lumeweb.com/LumeWeb/libs5-go/types" "git.lumeweb.com/LumeWeb/libs5-go/types"
"git.lumeweb.com/LumeWeb/portal/api/s5"
"git.lumeweb.com/LumeWeb/portal/interfaces" "git.lumeweb.com/LumeWeb/portal/interfaces"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
"go.uber.org/zap" "go.uber.org/zap"
@ -140,7 +139,7 @@ func (s S5ProviderStore) Provide(hash *encoding.Multihash, kind []types.StorageL
case types.StorageLocationTypeArchive: case types.StorageLocationTypeArchive:
return s5storage.NewStorageLocation(int(types.StorageLocationTypeArchive), []string{}, calculateExpiry(24*time.Hour)), nil return s5storage.NewStorageLocation(int(types.StorageLocationTypeArchive), []string{}, calculateExpiry(24*time.Hour)), nil
case types.StorageLocationTypeFile, types.StorageLocationTypeFull: 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 { func calculateExpiry(duration time.Duration) int64 {
return time.Now().Add(duration).Unix() 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)
}