mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-30 17:00:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "remove obsolete var"

Browse Source 
This reverts commit a145c36fd5.
This commit is contained in:
Ralf Haferkamp
2024-10-07 16:34:58 +02:00
committed by Ralf Haferkamp
parent 92b298fb13
commit 86fa6a9cde
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/thumbnails/pkg/service/grpc/v0/service.go
View File

@@ -116,10 +116,10 @@ func (g Thumbnail) GetThumbnail(ctx context.Context, req *thumbnailssvc.GetThumb
return nil
}
func (g Thumbnail) checkThumbnail(req *thumbnailssvc.GetThumbnailRequest, sRes *provider.StatResponse) (thumbnail.Request, error) {
func (g Thumbnail) checkThumbnail(req *thumbnailssvc.GetThumbnailRequest, sRes *provider.StatResponse) (string, thumbnail.Request, error) {
tr := thumbnail.Request{}
if !sRes.GetInfo().GetPermissionSet().GetInitiateFileDownload() {
return tr, merrors.Forbidden(g.serviceID, "no download permission")
return "", tr, merrors.Forbidden(g.serviceID, "no download permission")
}
tType := thumbnail.GetExtForMime(sRes.GetInfo().GetMimeType())
@@ -128,13 +128,13 @@ func (g Thumbnail) checkThumbnail(req *thumbnailssvc.GetThumbnailRequest, sRes *
}
tr, err := thumbnail.PrepareRequest(int(req.GetWidth()), int(req.GetHeight()), tType, sRes.GetInfo().GetChecksum().GetSum(), req.GetProcessor())
if err != nil {
return tr, merrors.BadRequest(g.serviceID, err.Error())
return "", tr, merrors.BadRequest(g.serviceID, err.Error())
}
if _, exists := g.manager.CheckThumbnail(tr); exists {
return tr, nil
if key, exists := g.manager.CheckThumbnail(tr); exists {
return key, tr, nil
}
return tr, nil
return "", tr, nil
}
func (g Thumbnail) handleCS3Source(ctx context.Context, req *thumbnailssvc.GetThumbnailRequest) (string, error) {
@@ -144,7 +144,7 @@ func (g Thumbnail) handleCS3Source(ctx context.Context, req *thumbnailssvc.GetTh
return "", err
}
tr, err := g.checkThumbnail(req, sRes)
key, tr, err := g.checkThumbnail(req, sRes)
if err != nil {
return "", err
}
@@ -164,7 +164,7 @@ func (g Thumbnail) handleCS3Source(ctx context.Context, req *thumbnailssvc.GetTh
return "", merrors.InternalServerError(g.serviceID, "could not get image")
}
key, err := g.manager.Generate(tr, img)
key, err = g.manager.Generate(tr, img)
if err != nil {
return "", err
}
@@ -219,7 +219,7 @@ func (g Thumbnail) handleWebdavSource(ctx context.Context, req *thumbnailssvc.Ge
return "", err
}
tr, err := g.checkThumbnail(req, sRes)
key, tr, err := g.checkThumbnail(req, sRes)
if err != nil {
return "", err
}
@@ -248,7 +248,7 @@ func (g Thumbnail) handleWebdavSource(ctx context.Context, req *thumbnailssvc.Ge
return "", merrors.InternalServerError(g.serviceID, "could not get image")
}
key, err := g.manager.Generate(tr, img)
key, err = g.manager.Generate(tr, img)
if err != nil {
return "", err
}