Merge branch 'gormv2'

Author: JojiiOfficial

StartAPIServer.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/DataManager-Go/DataManagerServer/services"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -71,10 +71,10 @@ func awaitExit(httpServer *services.APIService, db *gorm.DB) {
 
 	// Close db connection
 	if db != nil {
-		err := db.Close()
-		if err != nil {
-			log.Warn(err)
-		}
+		// err := db.Close()
+		// if err != nil {
+		// 	log.Warn(err)
+		// }
 		log.Info("Database shutdown complete")
 	}
 

go.mod

@@ -14,12 +14,14 @@ require (
 	github.com/gabriel-vasile/mimetype v1.1.1
 	github.com/gorilla/mux v1.7.4
 	github.com/h2non/filetype v1.1.0
-	github.com/jinzhu/gorm v1.9.14
 	github.com/lib/pq v1.7.0 // indirect
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 	github.com/sbani/go-humanizer v0.3.1
 	github.com/sirupsen/logrus v1.6.0
+	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
 	golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
+	gorm.io/driver/postgres v0.2.5
+	gorm.io/gorm v0.2.20
 )

go.sum

@@ -7,7 +7,7 @@ import (
 	"github.com/DataManager-Go/DataManagerServer/models"
 	"github.com/JojiiOfficial/gaw"
 	"github.com/gorilla/mux"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 // AttributeHandler handler for file attributes.

handlers/FileAttrHandler.go

@@ -17,8 +17,8 @@ import (
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/gorilla/mux"
 	"github.com/h2non/filetype"
-	"github.com/jinzhu/gorm"
 	log "github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 )
 
 //UploadfileHandler handler for uploading files

handlers/FileHandler.go

@@ -9,7 +9,7 @@ import (
 	"github.com/DataManager-Go/DataManagerServer/models"
 
 	"github.com/JojiiOfficial/gaw"
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 
 	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"

handlers/Router.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/DataManager-Go/DataManagerServer/models"
 	"github.com/JojiiOfficial/gaw"
-	"github.com/jinzhu/gorm"
 	log "github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 )
 
 //HandlerData handlerData for web

handlers/web/utils.go

@@ -11,11 +11,11 @@ import (
 	"github.com/DataManager-Go/DataManagerServer/models"
 	"github.com/DataManager-Go/DataManagerServer/storage"
 
-	"github.com/jinzhu/gorm"
 	log "github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 
 	"github.com/alecthomas/kingpin"
-	_ "github.com/jinzhu/gorm/dialects/postgres"
+	_ "gorm.io/driver/postgres"
 )
 
 const version = "v3.12.0"

main.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/JojiiOfficial/gaw"
 	"github.com/JojiiOfficial/shred"
-	"github.com/jinzhu/gorm"
 	log "github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 )
 
 var shredder = shred.Shredder{}
@@ -364,7 +364,7 @@ func (file *File) Save(db *gorm.DB) error {
 
 // GetCount get count if file
 func (file File) GetCount(db *gorm.DB, fileID uint) (uint, error) {
-	var c uint
+	var c int64
 
 	fileFilter := File{
 		Model: file.Model,
@@ -396,7 +396,7 @@ func (file File) GetCount(db *gorm.DB, fileID uint) (uint, error) {
 	// Execute statement
 	err := del.Count(&c).Error
 
-	return c, err
+	return uint(c), err
 }
 
 // GetPublicFile returns a file which is public
@@ -405,7 +405,7 @@ func GetPublicFile(db *gorm.DB, publicFilename string) (*File, bool, error) {
 	err := db.Model(&File{}).Where("public_filename = ? AND is_public=true", publicFilename).First(&file).Error
 	if err != nil {
 		// Check error. Send server error if error is not "not found"
-		if gorm.IsRecordNotFoundError(err) {
+		if err == gorm.ErrRecordNotFound {
 			return nil, false, nil
 		}
 
@@ -495,7 +495,7 @@ func (file *File) SetUniqueFilename(db *gorm.DB) bool {
 
 	for i := 0; i < 7; i++ {
 		localName = gaw.RandString(40)
-		var c int
+		var c int64
 		db.Model(&File{}).Where(&File{LocalName: localName}).Count(&c)
 		if c == 0 {
 			file.LocalName = localName

models/File.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"github.com/jinzhu/gorm"
+	"gorm.io/gorm"
 )
 
 // Group a group in DB