HyperNet/Paperclip
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Refactor get s3 client process

Browse Source
This commit is contained in:
LittleSheep 2025-03-24 22:48:43 +08:00
parent 9360d17706
commit 1390f26afa
5 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/internal/fs/downloader.go
View File

@ -10,7 +10,6 @@ import (
"git.solsynth.dev/hypernet/paperclip/pkg/internal/models"
jsoniter "github.com/json-iterator/go"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/spf13/viper"
)
@ -31,11 +30,7 @@ func DownloadFileToLocal(meta models.Attachment, dst int) (string, error) {
var destConfigured models.S3Destination
_ = jsoniter.Unmarshal(rawDest, &destConfigured)
client, err := minio.New(destConfigured.Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(destConfigured.SecretID, destConfigured.SecretKey, ""),
Secure: destConfigured.EnableSSL,
BucketLookup: minio.BucketLookupType(destConfigured.BucketLookup),
})
client, err := destConfigured.GetClient()
client.SetAppInfo("HyperNet.Paperclip", pkg.AppVersion)
if err != nil {
return "", fmt.Errorf("unable to configure s3 client: %v", err)

9
pkg/internal/fs/recycler.go
View File

@ -7,14 +7,12 @@ import (
"path/filepath"
"time"
pkg "git.solsynth.dev/hypernet/paperclip/pkg/internal"
"git.solsynth.dev/hypernet/paperclip/pkg/internal/database"
"github.com/samber/lo"
"git.solsynth.dev/hypernet/paperclip/pkg/internal/models"
jsoniter "github.com/json-iterator/go"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/rs/zerolog/log"
"github.com/spf13/viper"
)
@ -121,12 +119,7 @@ func DeleteFileFromLocal(config models.LocalDestination, uuid string) error {
}
func DeleteFileFromS3(config models.S3Destination, uuid string) error {
client, err := minio.New(config.Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(config.SecretID, config.SecretKey, ""),
Secure: config.EnableSSL,
BucketLookup: minio.BucketLookupType(config.BucketLookup),
})
client.SetAppInfo("HyperNet.Paperclip", pkg.AppVersion)
client, err := config.GetClient()
if err != nil {
return fmt.Errorf("unable to configure s3 client: %v", err)
}

18
pkg/internal/models/destination.go
View File

@ -1,5 +1,11 @@
package models
import (
pkg "git.solsynth.dev/hypernet/paperclip/pkg/internal"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
)
const (
DestinationTypeLocal = "local"
DestinationTypeS3 = "s3"
@ -33,3 +39,15 @@ type S3Destination struct {
EnableSigned bool `json:"enable_signed"`
BucketLookup int `json:"bucket_lookup"`
}
func (v S3Destination) GetClient() (*minio.Client, error) {
client, err := minio.New(v.Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(v.SecretID, v.SecretKey, ""),
Secure: v.EnableSSL,
BucketLookup: minio.BucketLookupType(v.BucketLookup),
})
if err == nil {
client.SetAppInfo("HyperNet.Paperclip", pkg.AppVersion)
}
return client, err
}

9
pkg/internal/services/opener.go
View File

@ -9,7 +9,6 @@ import (
"path/filepath"
"time"
pkg "git.solsynth.dev/hypernet/paperclip/pkg/internal"
localCache "git.solsynth.dev/hypernet/paperclip/pkg/internal/cache"
"git.solsynth.dev/hypernet/paperclip/pkg/internal/database"
"git.solsynth.dev/hypernet/paperclip/pkg/internal/models"
@ -18,7 +17,6 @@ import (
"github.com/eko/gocache/lib/v4/store"
jsoniter "github.com/json-iterator/go"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/samber/lo"
)
@ -118,12 +116,7 @@ func OpenAttachmentByRID(rid string, region ...string) (url string, mimetype str
_ = jsoniter.Unmarshal(rawDest, &destConfigured)
if destConfigured.EnableSigned {
var client *minio.Client
client, err = minio.New(destConfigured.Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(destConfigured.SecretID, destConfigured.SecretKey, ""),
Secure: destConfigured.EnableSSL,
BucketLookup: minio.BucketLookupType(destConfigured.BucketLookup),
})
client.SetAppInfo("HyperNet.Paperclip", pkg.AppVersion)
client, err = destConfigured.GetClient()
if err != nil {
return
}

9
pkg/internal/services/uploader.go
View File

@ -8,14 +8,12 @@ import (
"os"
"path/filepath"
pkg "git.solsynth.dev/hypernet/paperclip/pkg/internal"
"git.solsynth.dev/hypernet/paperclip/pkg/internal/database"
"git.solsynth.dev/hypernet/paperclip/pkg/internal/fs"
"git.solsynth.dev/hypernet/paperclip/pkg/internal/models"
"github.com/gofiber/fiber/v2"
jsoniter "github.com/json-iterator/go"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/spf13/viper"
)
@ -92,12 +90,7 @@ func ReUploadFile(meta models.Attachment, dst int, doNotUpdate ...bool) error {
var destConfigured models.S3Destination
_ = jsoniter.Unmarshal(rawDest, &destConfigured)
client, err := minio.New(destConfigured.Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(destConfigured.SecretID, destConfigured.SecretKey, ""),
Secure: destConfigured.EnableSSL,
BucketLookup: minio.BucketLookupType(destConfigured.BucketLookup),
})
client.SetAppInfo("HyperNet.Paperclip", pkg.AppVersion)
client, err := destConfigured.GetClient()
if err != nil {
return fmt.Errorf("unable to configure s3 client: %v", err)
}