From a6c5d0328613cf9033afff9d247e9d83b3447f7c Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:21:11 +0530 Subject: [PATCH] rename --- server/pkg/api/file.go | 80 ++++++++++++++++++------------------- server/pkg/api/file_data.go | 20 +++++----- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/server/pkg/api/file.go b/server/pkg/api/file.go index 65efb1d068..2e15ade325 100644 --- a/server/pkg/api/file.go +++ b/server/pkg/api/file.go @@ -33,7 +33,7 @@ const DefaultMaxBatchSize = 1000 const DefaultCopyBatchSize = 100 // CreateOrUpdate creates an entry for a file -func (f *FileHandler) CreateOrUpdate(c *gin.Context) { +func (h *FileHandler) CreateOrUpdate(c *gin.Context) { userID := auth.GetUserID(c.Request.Header) var file ente.File if err := c.ShouldBindJSON(&file); err != nil { @@ -48,7 +48,7 @@ func (f *FileHandler) CreateOrUpdate(c *gin.Context) { if file.ID == 0 { file.OwnerID = userID file.IsDeleted = false - file, err := f.Controller.Create(c, userID, file, c.Request.UserAgent(), enteApp) + file, err := h.Controller.Create(c, userID, file, c.Request.UserAgent(), enteApp) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -56,7 +56,7 @@ func (f *FileHandler) CreateOrUpdate(c *gin.Context) { c.JSON(http.StatusOK, file) return } - response, err := f.Controller.Update(c, userID, file, enteApp) + response, err := h.Controller.Update(c, userID, file, enteApp) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -65,7 +65,7 @@ func (f *FileHandler) CreateOrUpdate(c *gin.Context) { } // CopyFiles copies files that are owned by another user -func (f *FileHandler) CopyFiles(c *gin.Context) { +func (h *FileHandler) CopyFiles(c *gin.Context) { var req ente.CopyFileSyncRequest if err := c.ShouldBindJSON(&req); err != nil { handler.Error(c, stacktrace.Propagate(err, "")) @@ -75,7 +75,7 @@ func (f *FileHandler) CopyFiles(c *gin.Context) { handler.Error(c, stacktrace.Propagate(ente.NewBadRequestWithMessage(fmt.Sprintf("more than %d items", DefaultCopyBatchSize)), "")) return } - response, err := f.FileCopyCtrl.CopyFiles(c, req) + response, err := h.FileCopyCtrl.CopyFiles(c, req) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -84,7 +84,7 @@ func (f *FileHandler) CopyFiles(c *gin.Context) { } // Update updates already existing file -func (f *FileHandler) Update(c *gin.Context) { +func (h *FileHandler) Update(c *gin.Context) { enteApp := auth.GetApp(c) userID := auth.GetUserID(c.Request.Header) @@ -98,7 +98,7 @@ func (f *FileHandler) Update(c *gin.Context) { handler.Error(c, stacktrace.Propagate(ente.ErrBadRequest, "fileID should be >0")) return } - response, err := f.Controller.Update(c, userID, file, enteApp) + response, err := h.Controller.Update(c, userID, file, enteApp) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -107,12 +107,12 @@ func (f *FileHandler) Update(c *gin.Context) { } // GetUploadURLs returns a bunch of urls where in the user can upload objects -func (f *FileHandler) GetUploadURLs(c *gin.Context) { +func (h *FileHandler) GetUploadURLs(c *gin.Context) { enteApp := auth.GetApp(c) userID := auth.GetUserID(c.Request.Header) count, _ := strconv.Atoi(c.Query("count")) - urls, err := f.Controller.GetUploadURLs(c, userID, count, enteApp, false) + urls, err := h.Controller.GetUploadURLs(c, userID, count, enteApp, false) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -123,12 +123,12 @@ func (f *FileHandler) GetUploadURLs(c *gin.Context) { } // GetMultipartUploadURLs returns an array of PartUpload PresignedURLs -func (f *FileHandler) GetMultipartUploadURLs(c *gin.Context) { +func (h *FileHandler) GetMultipartUploadURLs(c *gin.Context) { enteApp := auth.GetApp(c) userID := auth.GetUserID(c.Request.Header) count, _ := strconv.Atoi(c.Query("count")) - urls, err := f.Controller.GetMultipartUploadURLs(c, userID, count, enteApp) + urls, err := h.Controller.GetMultipartUploadURLs(c, userID, count, enteApp) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -139,21 +139,21 @@ func (f *FileHandler) GetMultipartUploadURLs(c *gin.Context) { } // Get redirects the request to the file location -func (f *FileHandler) Get(c *gin.Context) { +func (h *FileHandler) Get(c *gin.Context) { userID, fileID := getUserAndFileIDs(c) - url, err := f.Controller.GetFileURL(c, userID, fileID) + url, err := h.Controller.GetFileURL(c, userID, fileID) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return } - f.logBadRedirect(c) + h.logBadRedirect(c) c.Redirect(http.StatusTemporaryRedirect, url) } // GetV2 returns the URL of the file to client -func (f *FileHandler) GetV2(c *gin.Context) { +func (h *FileHandler) GetV2(c *gin.Context) { userID, fileID := getUserAndFileIDs(c) - url, err := f.Controller.GetFileURL(c, userID, fileID) + url, err := h.Controller.GetFileURL(c, userID, fileID) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -164,21 +164,21 @@ func (f *FileHandler) GetV2(c *gin.Context) { } // GetThumbnail redirects the request to the file's thumbnail location -func (f *FileHandler) GetThumbnail(c *gin.Context) { +func (h *FileHandler) GetThumbnail(c *gin.Context) { userID, fileID := getUserAndFileIDs(c) - url, err := f.Controller.GetThumbnailURL(c, userID, fileID) + url, err := h.Controller.GetThumbnailURL(c, userID, fileID) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return } - f.logBadRedirect(c) + h.logBadRedirect(c) c.Redirect(http.StatusTemporaryRedirect, url) } // GetThumbnailV2 returns the URL of the thumbnail to the client -func (f *FileHandler) GetThumbnailV2(c *gin.Context) { +func (h *FileHandler) GetThumbnailV2(c *gin.Context) { userID, fileID := getUserAndFileIDs(c) - url, err := f.Controller.GetThumbnailURL(c, userID, fileID) + url, err := h.Controller.GetThumbnailURL(c, userID, fileID) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -189,7 +189,7 @@ func (f *FileHandler) GetThumbnailV2(c *gin.Context) { } // Trash moves the given files to the trash bin -func (f *FileHandler) Trash(c *gin.Context) { +func (h *FileHandler) Trash(c *gin.Context) { var request ente.TrashRequest if err := c.ShouldBindJSON(&request); err != nil { handler.Error(c, stacktrace.Propagate(err, "failed to bind")) @@ -201,7 +201,7 @@ func (f *FileHandler) Trash(c *gin.Context) { } userID := auth.GetUserID(c.Request.Header) request.OwnerID = userID - err := f.Controller.Trash(c, userID, request) + err := h.Controller.Trash(c, userID, request) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) } else { @@ -210,7 +210,7 @@ func (f *FileHandler) Trash(c *gin.Context) { } // GetSize returns the size of files indicated by fileIDs -func (f *FileHandler) GetSize(c *gin.Context) { +func (h *FileHandler) GetSize(c *gin.Context) { var request ente.FileIDsRequest if err := c.ShouldBindJSON(&request); err != nil { handler.Error(c, stacktrace.Propagate(err, "")) @@ -227,7 +227,7 @@ func (f *FileHandler) GetSize(c *gin.Context) { return } - size, err := f.Controller.GetSize(userID, request.FileIDs) + size, err := h.Controller.GetSize(userID, request.FileIDs) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) } else { @@ -238,7 +238,7 @@ func (f *FileHandler) GetSize(c *gin.Context) { } // GetInfo returns the FileInfo of files indicated by fileIDs -func (f *FileHandler) GetInfo(c *gin.Context) { +func (h *FileHandler) GetInfo(c *gin.Context) { var request ente.FileIDsRequest if err := c.ShouldBindJSON(&request); err != nil { handler.Error(c, stacktrace.Propagate(err, "failed to bind request")) @@ -246,7 +246,7 @@ func (f *FileHandler) GetInfo(c *gin.Context) { } userID := auth.GetUserID(c.Request.Header) - response, err := f.Controller.GetFileInfo(c, userID, request.FileIDs) + response, err := h.Controller.GetFileInfo(c, userID, request.FileIDs) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) } else { @@ -295,9 +295,9 @@ func shouldRejectRequest(c *gin.Context) (bool, error) { } // GetDuplicates returns the list of files of the same size -func (f *FileHandler) GetDuplicates(c *gin.Context) { +func (h *FileHandler) GetDuplicates(c *gin.Context) { userID := auth.GetUserID(c.Request.Header) - dupes, err := f.Controller.GetDuplicates(userID) + dupes, err := h.Controller.GetDuplicates(userID) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -308,10 +308,10 @@ func (f *FileHandler) GetDuplicates(c *gin.Context) { } // GetLargeThumbnail returns the list of files whose thumbnail size is larger than threshold size -func (f *FileHandler) GetLargeThumbnailFiles(c *gin.Context) { +func (h *FileHandler) GetLargeThumbnailFiles(c *gin.Context) { userID := auth.GetUserID(c.Request.Header) threshold, _ := strconv.ParseInt(c.Query("threshold"), 10, 64) - largeThumbnailFiles, err := f.Controller.GetLargeThumbnailFiles(userID, threshold) + largeThumbnailFiles, err := h.Controller.GetLargeThumbnailFiles(userID, threshold) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -322,7 +322,7 @@ func (f *FileHandler) GetLargeThumbnailFiles(c *gin.Context) { } // UpdateMagicMetadata updates magic metadata for a list of files. -func (f *FileHandler) UpdateMagicMetadata(c *gin.Context) { +func (h *FileHandler) UpdateMagicMetadata(c *gin.Context) { var request ente.UpdateMultipleMagicMetadataRequest if err := c.ShouldBindJSON(&request); err != nil { handler.Error(c, stacktrace.Propagate(err, "")) @@ -332,7 +332,7 @@ func (f *FileHandler) UpdateMagicMetadata(c *gin.Context) { handler.Error(c, stacktrace.Propagate(ente.ErrBatchSizeTooLarge, "")) return } - err := f.Controller.UpdateMagicMetadata(c, request, false) + err := h.Controller.UpdateMagicMetadata(c, request, false) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -341,13 +341,13 @@ func (f *FileHandler) UpdateMagicMetadata(c *gin.Context) { } // UpdatePublicMagicMetadata updates public magic metadata for a list of files. -func (f *FileHandler) UpdatePublicMagicMetadata(c *gin.Context) { +func (h *FileHandler) UpdatePublicMagicMetadata(c *gin.Context) { var request ente.UpdateMultipleMagicMetadataRequest if err := c.ShouldBindJSON(&request); err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return } - err := f.Controller.UpdateMagicMetadata(c, request, true) + err := h.Controller.UpdateMagicMetadata(c, request, true) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -356,7 +356,7 @@ func (f *FileHandler) UpdatePublicMagicMetadata(c *gin.Context) { } // UpdateThumbnail updates thumbnail of a file -func (f *FileHandler) UpdateThumbnail(c *gin.Context) { +func (h *FileHandler) UpdateThumbnail(c *gin.Context) { enteApp := auth.GetApp(c) var request ente.UpdateThumbnailRequest @@ -364,7 +364,7 @@ func (f *FileHandler) UpdateThumbnail(c *gin.Context) { handler.Error(c, stacktrace.Propagate(err, "")) return } - err := f.Controller.UpdateThumbnail(c, request.FileID, request.Thumbnail, enteApp) + err := h.Controller.UpdateThumbnail(c, request.FileID, request.Thumbnail, enteApp) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -372,8 +372,8 @@ func (f *FileHandler) UpdateThumbnail(c *gin.Context) { c.Status(http.StatusOK) } -func (f *FileHandler) GetTotalFileCount(c *gin.Context) { - count, err := f.Controller.GetTotalFileCount() +func (h *FileHandler) GetTotalFileCount(c *gin.Context) { + count, err := h.Controller.GetTotalFileCount() if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -390,7 +390,7 @@ func getUserAndFileIDs(c *gin.Context) (int64, int64) { } // logBadRedirect will log the request id if we are redirecting to another url with the auth-token in header -func (f *FileHandler) logBadRedirect(c *gin.Context) { +func (h *FileHandler) logBadRedirect(c *gin.Context) { if len(c.GetHeader("X-Auth-Token")) != 0 && os.Getenv("ENVIRONMENT") != "" { log.WithField("req_id", requestid.Get(c)).Error("critical: sending token to another service") } diff --git a/server/pkg/api/file_data.go b/server/pkg/api/file_data.go index d45a3392b8..36c863e65c 100644 --- a/server/pkg/api/file_data.go +++ b/server/pkg/api/file_data.go @@ -10,7 +10,7 @@ import ( "net/http" ) -func (f *FileHandler) PutFileData(ctx *gin.Context) { +func (h *FileHandler) PutFileData(ctx *gin.Context) { var req fileData.PutFileDataRequest if err := ctx.ShouldBindJSON(&req); err != nil { ctx.JSON(http.StatusBadRequest, ente.NewBadRequestWithMessage(err.Error())) @@ -25,7 +25,7 @@ func (f *FileHandler) PutFileData(ctx *gin.Context) { version := 1 reqInt.Version = &version } - err := f.FileDataCtrl.InsertOrUpdate(ctx, &req) + err := h.FileDataCtrl.InsertOrUpdate(ctx, &req) if err != nil { handler.Error(ctx, err) @@ -34,13 +34,13 @@ func (f *FileHandler) PutFileData(ctx *gin.Context) { ctx.JSON(http.StatusOK, gin.H{}) } -func (f *FileHandler) GetFilesData(ctx *gin.Context) { +func (h *FileHandler) GetFilesData(ctx *gin.Context) { var req fileData.GetFilesData if err := ctx.ShouldBindJSON(&req); err != nil { ctx.JSON(http.StatusBadRequest, ente.NewBadRequestWithMessage(err.Error())) return } - resp, err := f.FileDataCtrl.GetFilesData(ctx, req) + resp, err := h.FileDataCtrl.GetFilesData(ctx, req) if err != nil { handler.Error(ctx, err) return @@ -48,13 +48,13 @@ func (f *FileHandler) GetFilesData(ctx *gin.Context) { ctx.JSON(http.StatusOK, resp) } -func (f *FileHandler) GetFileData(ctx *gin.Context) { +func (h *FileHandler) GetFileData(ctx *gin.Context) { var req fileData.GetFileData if err := ctx.ShouldBindJSON(&req); err != nil { ctx.JSON(http.StatusBadRequest, ente.NewBadRequestWithMessage(err.Error())) return } - resp, err := f.FileDataCtrl.GetFileData(ctx, req) + resp, err := h.FileDataCtrl.GetFileData(ctx, req) if err != nil { handler.Error(ctx, err) return @@ -64,13 +64,13 @@ func (f *FileHandler) GetFileData(ctx *gin.Context) { }) } -func (f *FileHandler) GetPreviewUploadURL(c *gin.Context) { +func (h *FileHandler) GetPreviewUploadURL(c *gin.Context) { var request fileData.PreviewUploadUrlRequest if err := c.ShouldBindJSON(&request); err != nil { handler.Error(c, stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("Request binding failed %s", err))) return } - url, err := f.FileDataCtrl.PreviewUploadURL(c, request) + url, err := h.FileDataCtrl.PreviewUploadURL(c, request) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return @@ -80,13 +80,13 @@ func (f *FileHandler) GetPreviewUploadURL(c *gin.Context) { }) } -func (f *FileHandler) GetPreviewURL(c *gin.Context) { +func (h *FileHandler) GetPreviewURL(c *gin.Context) { var request fileData.GetPreviewURLRequest if err := c.ShouldBindJSON(&request); err != nil { handler.Error(c, stacktrace.Propagate(ente.ErrBadRequest, fmt.Sprintf("Request binding failed %s", err))) return } - url, err := f.FileDataCtrl.GetPreviewUrl(c, request) + url, err := h.FileDataCtrl.GetPreviewUrl(c, request) if err != nil { handler.Error(c, stacktrace.Propagate(err, "")) return