Upload Custom Thumbnail for a Lecture #1479
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -50,6 +50,8 @@ func configGinStreamRestRouter(router *gin.Engine, daoWrapper dao.DaoWrapper) { | |||||
| thumbs.GET(":fid", routes.getThumbs) | ||||||
| thumbs.GET("/live", routes.getLiveThumbs) | ||||||
| thumbs.GET("/vod", routes.getVODThumbs) | ||||||
| thumbs.POST("/customlive", routes.putCustomLiveThumbnail) | ||||||
|
There was a problem hiding this comment. Imo the logical method and path would be something like
Suggested change
|
||||||
| thumbs.POST("/customvod", routes.putCustomLiveThumbnail) | ||||||
| } | ||||||
| } | ||||||
| { | ||||||
|
|
@@ -894,3 +896,45 @@ func (r streamRoutes) updateChatEnabled(c *gin.Context) { | |||||
| return | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| func (r streamRoutes) putCustomLiveThumbnail(c *gin.Context) { | ||||||
| tumLiveContext := c.MustGet("TUMLiveContext").(tools.TUMLiveContext) | ||||||
| streamID := tumLiveContext.Stream.ID | ||||||
| course := tumLiveContext.Course | ||||||
| file, err := c.FormFile("file") | ||||||
| if err != nil { | ||||||
| c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid file"}) | ||||||
|
There was a problem hiding this comment. you can use our RequestError to abort: _ = c.AbortWithError(http.StatusForbidden, tools.RequestError{
Status: http.StatudBadRequest,
CustomMessage: "Couldn't read file",
Err: err,
}) |
||||||
| return | ||||||
| } | ||||||
|
|
||||||
| filename := file.Filename | ||||||
|
There was a problem hiding this comment. remove the filename if it's unused |
||||||
| fileUuid := uuid.NewV1() | ||||||
|
|
||||||
| filesFolder := fmt.Sprintf("%s/%s.%d/%s.%s/files", | ||||||
| tools.Cfg.Paths.Mass, | ||||||
| course.Name, course.Year, | ||||||
| course.Name, course.TeachingTerm) | ||||||
|
|
||||||
| path := fmt.Sprintf("%s/%s%s", filesFolder, fileUuid, filepath.Ext(filename)) | ||||||
|
Comment on lines
+913
to
+918
There was a problem hiding this comment. please use path.Join from the standard library to construct this filepath: |
||||||
|
|
||||||
| //tempFilePath := pathprovider.LiveThumbnail(strconv.Itoa(int(streamID))) | ||||||
| if err := c.SaveUploadedFile(file, path); err != nil { | ||||||
| c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to save file"}) | ||||||
|
There was a problem hiding this comment. Use RequestError here too |
||||||
| return | ||||||
| } | ||||||
|
|
||||||
| thumb := model.File{ | ||||||
| StreamID: streamID, | ||||||
| Path: path, | ||||||
| Filename: file.Filename, | ||||||
| Type: model.FILETYPE_THUMB_CAM, | ||||||
|
There was a problem hiding this comment. iirc this filetype is for the scrubbar, not the preview. To be sure, use FILETYPE_THUMB_LG_CAM_PRES, which is always elected default |
||||||
| } | ||||||
|
|
||||||
| fileDao := dao.NewFileDao() | ||||||
|
There was a problem hiding this comment. no need to create a new DAO, just use r.DaoWrapper.FileDao |
||||||
| if err := fileDao.SetThumbnail(streamID, thumb); err != nil { | ||||||
| c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to set thumbnail"}) | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| c.JSON(http.StatusOK, gin.H{"message": "Thumbnail uploaded successfully"}) | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need two routes to do the same thing? I'd argue there's no need to distinguish livestreams from vods when uploading thumbnails