@@ -3,12 +3,9 @@ package main
33import (
44 "fmt"
55 "net/http"
6- "os"
7- "path/filepath"
86 "strconv"
97
10- "github.com/disintegration/imaging"
11- "github.com/knadh/listmonk/models"
8+ "github.com/knadh/listmonk/media"
129 "github.com/labstack/echo"
1310 uuid "github.com/satori/go.uuid"
1411)
@@ -26,53 +23,72 @@ func handleUploadMedia(c echo.Context) error {
2623 app = c .Get ("app" ).(* App )
2724 cleanUp = false
2825 )
29-
26+ file , err := c .FormFile ("file" )
27+ if err != nil {
28+ return echo .NewHTTPError (http .StatusBadRequest ,
29+ fmt .Sprintf ("Invalid file uploaded: %v" , err ))
30+ }
31+ // Validate MIME type with the list of allowed types.
32+ var typ = file .Header .Get ("Content-type" )
33+ ok := validateMIME (typ , imageMimes )
34+ if ! ok {
35+ return echo .NewHTTPError (http .StatusBadRequest ,
36+ fmt .Sprintf ("Unsupported file type (%s) uploaded." , typ ))
37+ }
38+ // Generate filename
39+ fName := generateFileName (file .Filename )
40+ // Read file contents in memory
41+ src , err := file .Open ()
42+ if err != nil {
43+ return echo .NewHTTPError (http .StatusBadRequest ,
44+ fmt .Sprintf ("Error reading file: %s" , err ))
45+ }
46+ defer src .Close ()
3047 // Upload the file.
31- fName , err := uploadFile ( "file" , app .Constants . UploadPath , "" , imageMimes , c )
48+ fName , err = app .Media . Put ( fName , typ , src )
3249 if err != nil {
50+ cleanUp = true
3351 return echo .NewHTTPError (http .StatusInternalServerError ,
3452 fmt .Sprintf ("Error uploading file: %s" , err ))
3553 }
36- path := filepath .Join (app .Constants .UploadPath , fName )
3754
3855 defer func () {
3956 // If any of the subroutines in this function fail,
4057 // the uploaded image should be removed.
4158 if cleanUp {
42- os .Remove (path )
59+ app .Media .Delete (fName )
60+ app .Media .Delete (thumbPrefix + fName )
4361 }
4462 }()
4563
46- // Create a thumbnail.
47- src , err := imaging . Open ( path )
64+ // Create thumbnail from file .
65+ thumbFile , err := createThumbnail ( file )
4866 if err != nil {
4967 cleanUp = true
5068 return echo .NewHTTPError (http .StatusInternalServerError ,
5169 fmt .Sprintf ("Error opening image for resizing: %s" , err ))
5270 }
53-
54- t := imaging . Resize ( src , thumbnailSize , 0 , imaging . Lanczos )
55- if err := imaging . Save ( t , fmt . Sprintf ( "%s/%s%s" , app . Constants . UploadPath , thumbPrefix , fName )); err != nil {
71+ // Upload thumbnail.
72+ thumbfName , err := app . Media . Put ( thumbPrefix + fName , typ , thumbFile )
73+ if err != nil {
5674 cleanUp = true
5775 return echo .NewHTTPError (http .StatusInternalServerError ,
5876 fmt .Sprintf ("Error saving thumbnail: %s" , err ))
5977 }
60-
6178 // Write to the DB.
62- if _ , err := app .Queries .InsertMedia .Exec (uuid .NewV4 (), fName , fmt . Sprintf ( "%s%s" , thumbPrefix , fName ) , 0 , 0 ); err != nil {
79+ if _ , err := app .Queries .InsertMedia .Exec (uuid .NewV4 (), fName , thumbfName , 0 , 0 ); err != nil {
6380 cleanUp = true
6481 return echo .NewHTTPError (http .StatusInternalServerError ,
65- fmt .Sprintf ("Error saving uploaded file: %s" , pqErrMsg (err )))
82+ fmt .Sprintf ("Error saving uploaded file to db : %s" , pqErrMsg (err )))
6683 }
67-
6884 return c .JSON (http .StatusOK , okResp {true })
6985}
7086
7187// handleGetMedia handles retrieval of uploaded media.
7288func handleGetMedia (c echo.Context ) error {
7389 var (
7490 app = c .Get ("app" ).(* App )
75- out []models .Media
91+ out []media .Media
7692 )
7793
7894 if err := app .Queries .GetMedia .Select (& out ); err != nil {
@@ -81,8 +97,8 @@ func handleGetMedia(c echo.Context) error {
8197 }
8298
8399 for i := 0 ; i < len (out ); i ++ {
84- out [i ].URI = fmt . Sprintf ( "%s/%s" , app .Constants . UploadURI , out [i ].Filename )
85- out [i ].ThumbURI = fmt . Sprintf ( "%s/%s%s" , app .Constants . UploadURI , thumbPrefix , out [i ].Filename )
100+ out [i ].URI = app .Media . Get ( out [i ].Filename )
101+ out [i ].ThumbURI = app .Media . Get ( thumbPrefix + out [i ].Filename )
86102 }
87103
88104 return c .JSON (http .StatusOK , okResp {out })
@@ -99,13 +115,14 @@ func handleDeleteMedia(c echo.Context) error {
99115 return echo .NewHTTPError (http .StatusBadRequest , "Invalid ID." )
100116 }
101117
102- var m models .Media
118+ var m media .Media
103119 if err := app .Queries .DeleteMedia .Get (& m , id ); err != nil {
104120 return echo .NewHTTPError (http .StatusInternalServerError ,
105121 fmt .Sprintf ("Error deleting media: %s" , pqErrMsg (err )))
106122 }
107- os .Remove (filepath .Join (app .Constants .UploadPath , m .Filename ))
108- os .Remove (filepath .Join (app .Constants .UploadPath , fmt .Sprintf ("%s%s" , thumbPrefix , m .Filename )))
123+
124+ app .Media .Delete (m .Filename )
125+ app .Media .Delete (thumbPrefix + m .Filename )
109126
110127 return c .JSON (http .StatusOK , okResp {true })
111128}
0 commit comments