High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Remove forcing unique filename on all media uploads.
Kailash Nadhe4a18dabc346
diff --git a/cmd/manager_store.go b/cmd/manager_store.goindex b1d67ef8..e0d82fc2 100644--- a/cmd/manager_store.go+++ b/cmd/manager_store.go@@ -90,7 +90,7 @@ func (s *store) UpdateCampaignCounts(campID int, toSend int, sent int, lastSubID// GetAttachment fetches a media attachment blob.func (s *store) GetAttachment(mediaID int) (models.Attachment, error) {- m, err := s.core.GetMedia(mediaID, "", s.media)+ m, err := s.core.GetMedia(mediaID, "", "", s.media)if err != nil {return models.Attachment{}, err}diff --git a/cmd/media.go b/cmd/media.goindex 39d420c1..06255a41 100644--- a/cmd/media.go+++ b/cmd/media.go@@ -57,12 +57,19 @@ func handleUploadMedia(c echo.Context) error {}}- // Sanitize filename.+ // Sanitize the filename.fName := makeFilename(file.Filename)- // Add a random suffix to the filename to ensure uniqueness.- suffix, _ := generateRandomString(6)- fName = appendSuffixToFilename(fName, suffix)+ // If the filename already exists in the DB, make it unique by adding a random suffix.+ if _, err := app.core.GetMedia(0, "", fName, app.media); err == nil {+ suffix, err := generateRandomString(6)+ if err != nil {+ app.log.Printf("error generating random string: %v", err)+ return echo.NewHTTPError(http.StatusInternalServerError, app.i18n.T("globals.messages.internalError"))+ }++ fName = appendSuffixToFilename(fName, suffix)+ }// Upload the file.fName, err = app.media.Put(fName, contentType, src)@@ -143,7 +150,7 @@ func handleGetMedia(c echo.Context) error {// Fetch one list.if id > 0 {- out, err := app.core.GetMedia(id, "", app.media)+ out, err := app.core.GetMedia(id, "", "", app.media)if err != nil {return err}diff --git a/internal/core/core.go b/internal/core/core.goindex 4d78aa28..4a7db504 100644--- a/internal/core/core.go+++ b/internal/core/core.go@@ -8,12 +8,14 @@ import ("bytes""fmt""log"+ "net/http""regexp""strings""github.com/jmoiron/sqlx""github.com/knadh/listmonk/internal/i18n""github.com/knadh/listmonk/models"+ "github.com/labstack/echo/v4""github.com/lib/pq")@@ -61,6 +63,10 @@ type Opt struct {Log *log.Logger}+var (+ ErrNotFound = echo.NewHTTPError(http.StatusNotFound, "not found")+)+var (regexFullTextQuery = regexp.MustCompile(`\s+`)regexpSpaces = regexp.MustCompile(`[\s]+`)diff --git a/internal/core/media.go b/internal/core/media.goindex dda461fa..f8c5201a 100644--- a/internal/core/media.go+++ b/internal/core/media.go@@ -1,6 +1,7 @@package coreimport (+ "database/sql""fmt""net/http""strings"@@ -43,14 +44,19 @@ func (c *Core) QueryMedia(provider string, s media.Store, query string, offset,}// GetMedia returns a media item.-func (c *Core) GetMedia(id int, uuid string, s media.Store) (media.Media, error) {+func (c *Core) GetMedia(id int, uuid, fileName string, s media.Store) (media.Media, error) {var uu interface{}if uuid != "" {uu = uuid}var out media.Media- if err := c.q.GetMedia.Get(&out, id, uu); err != nil {+ if err := c.q.GetMedia.Get(&out, id, uu, fileName); err != nil {+ // If it's ` sql: no rows in result set`, return a 404.+ if err == sql.ErrNoRows {+ return out, ErrNotFound+ }+return out, echo.NewHTTPError(http.StatusInternalServerError,c.i18n.Ts("globals.messages.errorFetching", "name", "{globals.terms.media}", "error", pqErrMsg(err)))}@@ -80,7 +86,7 @@ func (c *Core) InsertMedia(fileName, thumbName, contentType string, meta models.c.i18n.Ts("globals.messages.errorCreating", "name", "{globals.terms.media}", "error", pqErrMsg(err)))}- return c.GetMedia(newID, "", s)+ return c.GetMedia(newID, "", "", s)}// DeleteMedia deletes a given media item and returns the filename of the deleted item.diff --git a/internal/migrations/v5.0.0.go b/internal/migrations/v5.0.0.goindex cabd3027..a143b3c8 100644--- a/internal/migrations/v5.0.0.go+++ b/internal/migrations/v5.0.0.go@@ -31,5 +31,11 @@ func V5_0_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf, lo *log.Loggerreturn err}+ if _, err := db.Exec(`+ CREATE INDEX IF NOT EXISTS idx_media_filename ON media(provider, filename);+ `); err != nil {+ return err+ }+return nil}diff --git a/queries.sql b/queries.sqlindex c0d09dcb..c6ac6cba 100644--- a/queries.sql+++ b/queries.sql@@ -952,7 +952,13 @@ SELECT COUNT(*) OVER () AS total, * FROM mediaWHERE ($1 = '' OR filename ILIKE $1) AND provider=$2 ORDER BY created_at DESC OFFSET $3 LIMIT $4;-- name: get-media-SELECT * FROM media WHERE CASE WHEN $1 > 0 THEN id = $1 ELSE uuid = $2 END;+SELECT * FROM media WHERE+ CASE+ WHEN $1 > 0 THEN id = $1+ WHEN $2 != '' THEN uuid = $2::UUID+ WHEN $3 != '' THEN filename = $3+ ELSE false+ END;-- name: delete-mediaDELETE FROM media WHERE id=$1 RETURNING filename;diff --git a/schema.sql b/schema.sqlindex ae3aa92e..9f2a81a6 100644--- a/schema.sql+++ b/schema.sql@@ -170,6 +170,7 @@ CREATE TABLE media (meta JSONB NOT NULL DEFAULT '{}',created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW());+DROP INDEX IF EXISTS idx_media_filename; CREATE INDEX idx_media_filename ON media(provider, filename);-- campaign_mediaDROP TABLE IF EXISTS campaign_media CASCADE;