fix(public): add view query param (#5)

When embeding image in public preview, use view query param instead of download, to prevent download hit count to be incremented
fix #1

Author: bemble

server/api/file.go

@@ -11,7 +11,7 @@ import (
 	"shortpaste/core/tools"
 
 	"github.com/go-chi/chi/v5"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/thanhpk/randstr"
 	"gopkg.in/go-playground/validator.v9"
 )
@@ -56,9 +56,9 @@ func FileAdd(w http.ResponseWriter, r *http.Request) {
 	file.Name = handler.Filename
 	file.MIME = handler.Header["Content-Type"][0]
 
-	log.WithField("category", "file-upload").Info("Uploaded File: " + file.Name)
-	log.WithField("category", "file-upload").Info("File Size: " + tools.IECFormat(handler.Size))
-	log.WithField("category", "file-upload").Info("MIME Header: " + file.MIME)
+	logrus.WithField("category", "file-upload").Info("Uploaded File: " + file.Name)
+	logrus.WithField("category", "file-upload").Info("File Size: " + tools.IECFormat(handler.Size))
+	logrus.WithField("category", "file-upload").Info("MIME Header: " + file.MIME)
 
 	filePath := path.Join(config.GetDataDirPath(), "files", file.ID, file.Name)
 

server/core/database/database.go

@@ -5,7 +5,7 @@ import (
 	"path"
 	"shortpaste/core/config"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	"github.com/glebarez/sqlite"
 	"gorm.io/gorm"
@@ -20,15 +20,15 @@ func Init() {
 
 func Get() *gorm.DB {
 	if !isInited() {
-		log.WithField("category", "database").Info("Initing...")
+		logrus.WithField("category", "database").Info("Initing...")
 
 		dbUri := path.Join(config.GetDataDirPath(), "mapping.db")
 		ndb, err := gorm.Open(sqlite.Open(dbUri), &gorm.Config{})
 		if err != nil {
 			panic(fmt.Errorf("db error %v", err))
 		}
 		if err != nil {
-			log.Fatal(err)
+			logrus.Fatal(err)
 		}
 		db = ndb
 
@@ -43,7 +43,7 @@ func isInited() bool {
 }
 
 func migrate() {
-	log.WithField("category", "database").Info("Migrating...")
+	logrus.WithField("category", "database").Info("Migrating...")
 	db.AutoMigrate(&Link{})
 	db.AutoMigrate(&File{})
 	db.AutoMigrate(&Text{})

server/core/tools/placeholder/placeholder.go

@@ -7,7 +7,7 @@ import (
 	"shortpaste/core/tools/file"
 	"strings"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 var replacers map[string]Replacer = map[string]Replacer{}
@@ -18,7 +18,7 @@ func SetReplacer(replacer Replacer) {
 
 func ReplaceInFiles(rootDirectory string) {
 	if _, err := os.Stat(rootDirectory); os.IsNotExist(err) {
-		log.WithField("category", "placeholders").Warn(rootDirectory + " not found.")
+		logrus.WithField("category", "placeholders").Warn(rootDirectory + " not found.")
 		return
 	}
 
@@ -33,7 +33,7 @@ func ReplaceInFiles(rootDirectory string) {
 			return nil
 		})
 	if err != nil {
-		log.WithField("category", "placeholders").Fatal(err)
+		logrus.WithField("category", "placeholders").Fatal(err)
 	}
 
 	err = filepath.Walk(rootDirectory,
@@ -50,14 +50,14 @@ func ReplaceInFiles(rootDirectory string) {
 			return nil
 		})
 	if err != nil {
-		log.WithField("category", "placeholders").Fatal(err)
+		logrus.WithField("category", "placeholders").Fatal(err)
 	}
 }
 
 func containsPlaceHolders(path string) bool {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatal(err)
 	}
 	contains := false
 	for _, replacer := range replacers {
@@ -70,7 +70,7 @@ func containsPlaceHolders(path string) bool {
 func replacePlaceHolders(path string) error {
 	b, err := ioutil.ReadFile(path)
 	if err != nil {
-		log.Fatal(err)
+		logrus.Fatal(err)
 	}
 
 	result := string(b)

server/main.go

@@ -11,20 +11,20 @@ import (
 	"shortpaste/public"
 
 	nested "github.com/antonfisher/nested-logrus-formatter"
-	log "github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 )
 
 func init() {
-	logLevel := log.InfoLevel
+	logLevel := logrus.InfoLevel
 	if config.IsDebug() {
-		logLevel = log.DebugLevel
+		logLevel = logrus.DebugLevel
 	}
 
-	log.SetLevel(logLevel)
-	log.SetFormatter(&nested.Formatter{
+	logrus.SetLevel(logLevel)
+	logrus.SetFormatter(&nested.Formatter{
 		HideKeys:    true,
 		FieldsOrder: []string{"component", "category"},
 	})
@@ -58,7 +58,7 @@ func main() {
 	r.Route(basePath, public.Router)
 	r.Route(basePath+"api/v"+constants.API_VERSION, api.Router)
 
-	log.WithField("category", "general").Info("Server started: http://0.0.0.0:" + config.GetPort())
+	logrus.WithField("category", "general").Info("Server started: http://0.0.0.0:" + config.GetPort())
 
-	log.Fatal(http.ListenAndServe(":"+config.GetPort(), r))
+	logrus.Fatal(http.ListenAndServe(":"+config.GetPort(), r))
 }

server/public/file.go

@@ -24,9 +24,13 @@ func FileGet(w http.ResponseWriter, r *http.Request) {
 	}
 
 	filePath := path.Join(config.GetDataDirPath(), "files", file.ID, file.Name)
-	if _, ok := r.URL.Query()["download"]; ok {
-		file.DownloadCount += 1
-		db.Save(&file)
+	_, isDownload := r.URL.Query()["download"]
+	_, isView := r.URL.Query()["view"]
+	if isDownload || isView {
+		if isDownload {
+			file.DownloadCount += 1
+			db.Save(&file)
+		}
 
 		w.Header().Set("Content-Disposition", "attachment; filename="+file.Name)
 		http.ServeFile(w, r, filePath)
@@ -53,7 +57,7 @@ func FileGet(w http.ResponseWriter, r *http.Request) {
 		Size  string
 	}{
 		Name:  file.Name,
-		Src:   "/f/" + id + "?download",
+		Src:   "/f/" + id + "?view",
 		Image: strings.HasPrefix(file.MIME, "image/"),
 		Size:  tools.IECFormat(fi.Size()),
 	}