TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server] Make linter happy

Browse Source
This commit is contained in:
Neeraj Gupta
2024-07-25 11:47:06 +05:30
parent 4bcec9d43b
commit 336aa7ac5f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/pkg/controller/file.go
View File

@@ -371,11 +371,10 @@ func (c *FileController) GetCastFileUrl(ctx *gin.Context, fileID int64, objType
return c.getSignedURLForType(ctx, fileID, objType)
}
func (c *FileController) getSignedURLForType(_ *gin.Context, fileID int64, objType ente.ObjectType) (string, error) {
// todo:(neeraj) enable it back after wasabi changes
//if isCliRequest(ctx) {
// return c.getWasabiSignedUrlIfAvailable(fileID, objType)
//}
func (c *FileController) getSignedURLForType(ctx *gin.Context, fileID int64, objType ente.ObjectType) (string, error) {
if isCliRequest(ctx) {
return c.getWasabiSignedUrlIfAvailable(fileID, objType)
}
s3Object, err := c.ObjectRepo.GetObject(fileID, objType)
if err != nil {
return "", stacktrace.Propagate(err, "")
@@ -383,10 +382,14 @@ func (c *FileController) getSignedURLForType(_ *gin.Context, fileID int64, objTy
return c.getHotDcSignedUrl(s3Object.ObjectKey)
}
// ignore lint unused inspection
func isCliRequest(ctx *gin.Context) bool {
// todo: (neeraj) remove this short-circuit after wasabi migration
return false
// check if user-agent contains go-resty
userAgent := ctx.Request.Header.Get("User-Agent")
return strings.Contains(userAgent, "go-resty")
//userAgent := ctx.Request.Header.Get("User-Agent")
//return strings.Contains(userAgent, "go-resty")
}
// getWasabiSignedUrlIfAvailable returns a signed URL for the given fileID and objectType. It prefers wasabi over b2