move errors

.gitignore

@@ -1 +1,2 @@
 data
+.DS_Store

internal/photos/api/account.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"gitlab.celogeek.com/photos/api/internal/photos/models"
+	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 	"gopkg.in/validator.v2"
 	"gorm.io/gorm"
 )
@@ -33,7 +34,7 @@ func (s *Service) Signup(c *gin.Context) {
 		return
 	}
 	if accountExists > 0 {
-		s.Error(c, http.StatusConflict, ErrAccountExists)
+		s.Error(c, http.StatusConflict, photoserrors.ErrAccountExists)
 		return
 	}
 	if err := s.DB.Create(models.NewAccount(account.Login, account.Password)).Error; err != nil {
@@ -57,7 +58,7 @@ func (s *Service) Login(c *gin.Context) {
 	session, err := models.NewSession(s.DB, account.Login, account.Password)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			s.Error(c, http.StatusNotFound, ErrAccountAuth)
+			s.Error(c, http.StatusNotFound, photoserrors.ErrAccountAuth)
 		} else {
 			s.Error(c, http.StatusInternalServerError, err)
 		}
@@ -77,7 +78,7 @@ func (s *Service) Logout(c *gin.Context) {
 		return
 	}
 	if res.RowsAffected == 0 {
-		s.Error(c, http.StatusNotFound, ErrSessionNotFound)
+		s.Error(c, http.StatusNotFound, photoserrors.ErrSessionNotFound)
 		return
 	}
 	c.JSON(http.StatusOK, gin.H{

internal/photos/api/check_body.go

@@ -4,11 +4,12 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 )
 
 func (s *Service) RequireBody(c *gin.Context) {
 	if c.Request.Method == "POST" && c.Request.ContentLength == 0 {
-		s.Error(c, http.StatusBadRequest, ErrReqMissingBody)
+		s.Error(c, http.StatusBadRequest, photoserrors.ErrReqMissingBody)
 		return
 	}
 }

internal/photos/api/errors.go

@@ -1,39 +1,9 @@
 package api
 
 import (
-	"errors"
-
 	"github.com/gin-gonic/gin"
 )
 
-var (
-	// Session
-	ErrSessionNotFound = errors.New("session not found")
-	ErrSessionInvalid  = errors.New("session invalid")
-	ErrTokenMissing    = errors.New("token missing")
-
-	// Request
-	ErrReqMissingBody = errors.New("missing body")
-	ErrReqNotFound    = errors.New("this route doesn't exists")
-
-	// Account
-	ErrAccountExists = errors.New("account exists")
-	ErrAccountAuth   = errors.New("login or password incorrect")
-
-	// Panic
-	ErrUnexpected = errors.New("an unexpected error occur")
-
-	// Album
-	ErrAlbumDontExists = errors.New("album doesn't exists")
-
-	// Store
-	ErrStorePathNotADirectory = errors.New("store path is not a directory")
-	ErrStoreBadChecksum       = errors.New("checksum should be sha1 in hex format")
-	ErrStoreBadChunkSize      = errors.New("part file size should be 1MB max")
-	ErrStoreMissingChunks     = errors.New("part checksum missing")
-	ErrStoreMismatchChecksum  = errors.New("part files doesn't match the original checksum")
-)
-
 func (s *Service) Error(c *gin.Context, code int, err error) {
 	c.AbortWithStatusJSON(code, gin.H{
 		"status": "failed",

internal/photos/api/file.go

@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"path/filepath"
 
 	"github.com/gin-gonic/gin"
+	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 )
 
 var CHUNK_SIZE int64 = 1 << 20
@@ -24,17 +26,17 @@ func (s *Service) FileCreate(c *gin.Context) {
 	}
 
 	if len(file.Sum) != 40 {
-		s.Error(c, http.StatusBadRequest, ErrStoreBadChecksum)
+		s.Error(c, http.StatusBadRequest, photoserrors.ErrStoreBadChecksum)
 		return
 	}
 	if len(file.Chunks) == 0 {
-		s.Error(c, http.StatusBadRequest, ErrStoreMissingChunks)
+		s.Error(c, http.StatusBadRequest, photoserrors.ErrStoreMissingChunks)
 		return
 	}
 
 	for _, chunk := range file.Chunks {
 		if len(chunk) != 40 {
-			s.Error(c, http.StatusBadRequest, ErrStoreBadChecksum)
+			s.Error(c, http.StatusBadRequest, photoserrors.ErrStoreBadChecksum)
 			return
 		}
 	}
@@ -47,7 +49,7 @@ func (s *Service) FileCreate(c *gin.Context) {
 
 	if r != file.Sum {
 		fmt.Printf("R=%s, O=%s\n", r, file.Sum)
-		s.Error(c, http.StatusExpectationFailed, ErrStoreMismatchChecksum)
+		s.Error(c, http.StatusExpectationFailed, photoserrors.ErrStoreMismatchChecksum)
 		return
 	}
 
@@ -70,12 +72,19 @@ func (s *Service) FileCreateTemp(c *gin.Context) {
 		sumb    = c.Param("sum")
 	)
 	if len(origsum) != 40 || len(sumb) != 40 {
-		s.Error(c, http.StatusBadRequest, ErrStoreBadChecksum)
+		s.Error(c, http.StatusBadRequest, photoserrors.ErrStoreBadChecksum)
+		return
+	}
+
+	originaldir := s.Store.Dir("original", origsum)
+	originalname := filepath.Join(originaldir, origsum)
+	if s.Store.FileExists(originalname) {
+		s.Error(c, http.StatusBadRequest, photoserrors.ErrStoreAlreadyExists)
 		return
 	}
 
 	if c.Request.ContentLength > CHUNK_SIZE {
-		s.Error(c, http.StatusBadRequest, ErrStoreBadChunkSize)
+		s.Error(c, http.StatusBadRequest, photoserrors.ErrStoreBadChunkSize)
 		return
 	}
 

internal/photos/api/main.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-sql-driver/mysql"
+	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 	"gitlab.celogeek.com/photos/api/internal/store"
 	"gorm.io/gorm"
 )
@@ -62,7 +63,7 @@ func (s *Service) SetupRoutes() {
 	album.POST("/tmp/:origsum/:sum", s.FileCreateTemp)
 
 	s.Gin.NoRoute(func(c *gin.Context) {
-		s.Error(c, http.StatusNotFound, ErrReqNotFound)
+		s.Error(c, http.StatusNotFound, photoserrors.ErrReqNotFound)
 	})
 }
 
@@ -72,7 +73,7 @@ func (s *Service) PrepareStore() {
 		s.LogErr.Fatal("Store", err)
 	}
 	if !d.IsDir() {
-		s.LogErr.Fatal("Store", ErrStorePathNotADirectory)
+		s.LogErr.Fatal("Store", photoserrors.ErrStorePathNotADirectory)
 	}
 	if err := s.Store.MkDirs([]string{"tmp", "original"}); err != nil {
 		s.LogErr.Fatal("Store", err)

internal/photos/api/recovery.go

@@ -4,13 +4,14 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 )
 
 func (s *Service) Recovery(c *gin.Context) {
 	defer func() {
 		if err := recover(); err != nil {
 			s.LogErr.Print("PANIC", err)
-			s.Error(c, http.StatusInternalServerError, ErrUnexpected)
+			s.Error(c, http.StatusInternalServerError, photoserrors.ErrUnexpected)
 		}
 	}()
 	c.Next()

internal/photos/api/session.go

@@ -8,13 +8,14 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"gitlab.celogeek.com/photos/api/internal/photos/models"
+	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 	"gorm.io/gorm"
 )
 
 func (s *Service) RequireAuthToken(c *gin.Context) {
 	token := c.GetHeader("Authorization")
 	if !strings.HasPrefix(token, "Private ") {
-		s.Error(c, http.StatusForbidden, ErrTokenMissing)
+		s.Error(c, http.StatusForbidden, photoserrors.ErrTokenMissing)
 		return
 	}
 	token = token[8:]
@@ -30,14 +31,14 @@ func (s *Service) RequireSession(c *gin.Context) {
 	sess := &models.Session{}
 	if err := s.DB.Preload("Account").Where("token = ?", c.GetString("token")).First(sess).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			s.Error(c, http.StatusForbidden, ErrSessionNotFound)
+			s.Error(c, http.StatusForbidden, photoserrors.ErrSessionNotFound)
 		} else {
 			s.Error(c, http.StatusForbidden, err)
 		}
 		return
 	}
 	if sess.Account == nil {
-		s.Error(c, http.StatusInternalServerError, ErrSessionInvalid)
+		s.Error(c, http.StatusInternalServerError, photoserrors.ErrSessionInvalid)
 		return
 	}
 	s.DB.Select("updated_at").Save(sess)

internal/photoserrors/accounts.go

@@ -0,0 +1,9 @@
+package photoserrors
+
+import "errors"
+
+var (
+	// Account
+	ErrAccountExists = errors.New("account exists")
+	ErrAccountAuth   = errors.New("login or password incorrect")
+)

internal/photoserrors/albums.go

@@ -0,0 +1,9 @@
+package photoserrors
+
+import "errors"
+
+var (
+
+	// Album
+	ErrAlbumDontExists = errors.New("album doesn't exists")
+)

internal/photoserrors/panic.go

@@ -0,0 +1,9 @@
+package photoserrors
+
+import "errors"
+
+var (
+
+	// Panic
+	ErrUnexpected = errors.New("an unexpected error occur")
+)

internal/photoserrors/requests.go

@@ -0,0 +1,9 @@
+package photoserrors
+
+import "errors"
+
+var (
+	// Request
+	ErrReqMissingBody = errors.New("missing body")
+	ErrReqNotFound    = errors.New("this route doesn't exists")
+)

internal/photoserrors/session.go

@@ -0,0 +1,10 @@
+package photoserrors
+
+import "errors"
+
+var (
+	// Session
+	ErrSessionNotFound = errors.New("session not found")
+	ErrSessionInvalid  = errors.New("session invalid")
+	ErrTokenMissing    = errors.New("token missing")
+)

internal/photoserrors/store.go

@@ -0,0 +1,14 @@
+package photoserrors
+
+import "errors"
+
+var (
+	// Store
+	ErrStorePathNotADirectory = errors.New("store path is not a directory")
+	ErrStoreBadChecksum       = errors.New("checksum should be sha1 in hex format")
+	ErrStoreBadChunkSize      = errors.New("part file size should be 1MB max")
+	ErrStoreMissingChunks     = errors.New("part checksum missing")
+	ErrStoreWrongChecksum     = errors.New("wrong checksum")
+	ErrStoreMismatchChecksum  = errors.New("part files doesn't match the original checksum")
+	ErrStoreAlreadyExists     = errors.New("original file already exists")
+)

internal/store/core.go

@@ -7,6 +7,8 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+
+	"gitlab.celogeek.com/photos/api/internal/photoserrors"
 )
 
 type Store struct {
@@ -40,7 +42,7 @@ func (s *Store) SaveTemp(path string, sumb string, b []byte) error {
 	sumString := hex.EncodeToString(sum.Sum(nil))
 
 	if sumb != sumString {
-		return errors.New("wrong checksum")
+		return photoserrors.ErrStoreWrongChecksum
 	}
 
 	dir := s.Dir(path, sumString)
@@ -89,7 +91,7 @@ func (s *Store) CommitTemp(path string, sumb []string) error {
 	originalname := filepath.Join(originaldir, path)
 
 	if s.FileExists(originalname) {
-		return fmt.Errorf("original file already exists")
+		return photoserrors.ErrStoreAlreadyExists
 	}
 
 	os.MkdirAll(originaldir, 0755)