🚧 构建目录树

alist-org · Mar 5, 2021 · d137ef8 · d137ef8
1 parent 3892266
commit d137ef8
Show file tree

Hide file tree

Showing 11 changed files with 238 additions and 53 deletions.
diff --git a/bootstrap/model.go b/bootstrap/model.go
@@ -12,24 +12,28 @@ import (
 func InitModel() bool {
 	log.Infof("初始化数据库...")
 	switch conf.Conf.Database.Type {
-	case "sqlite3":{
-		needMigrate := !utils.Exists(conf.Conf.Database.DBFile)
-		db, err := gorm.Open(sqlite.Open(conf.Conf.Database.DBFile), &gorm.Config{})
-		if err!=nil {
-			log.Errorf("连接数据库出现错误:%s", err.Error())
-			return false
-		}
-		conf.DB = db
-		if needMigrate {
-			log.Infof("迁移数据库...")
-			err = conf.DB.AutoMigrate(&models.File{})
-			if err !=nil {
-				log.Errorf("数据库迁移失败:%s",err.Error())
+	case "sqlite3":
+		{
+			needMigrate := !utils.Exists(conf.Conf.Database.DBFile)
+			db, err := gorm.Open(sqlite.Open(conf.Conf.Database.DBFile), &gorm.Config{})
+			if err != nil {
+				log.Errorf("连接数据库出现错误:%s", err.Error())
 				return false
 			}
+			conf.DB = db
+			if needMigrate {
+				log.Infof("迁移数据库...")
+				err = conf.DB.AutoMigrate(&models.File{})
+				if err != nil {
+					log.Errorf("数据库迁移失败:%s", err.Error())
+					return false
+				}
+				if err := models.BuildTree(); err != nil {
+					log.Errorf("构建目录树失败:%s", err.Error())
+				}
+			}
+			return true
 		}
-		return true
-	}
 	default:
 		log.Errorf("不支持的数据库类型:%s", conf.Conf.Database.Type)
 		return false

diff --git a/server/controllers/utils.go b/server/controllers/utils.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/server/models"
 	"github.com/gin-gonic/gin"
 )
 
@@ -24,4 +25,18 @@ func RefreshCache(c *gin.Context) {
 	}
 	c.JSON(200, MetaResponse(400,"disabled cache."))
 	return
+}
+
+// rebuild tree
+func RebuildTree(c *gin.Context) {
+	if err:=models.Clear();err!=nil{
+		c.JSON(200,MetaResponse(500,err.Error()))
+		return
+	}
+	if err:=models.BuildTree();err!=nil {
+		c.JSON(200,MetaResponse(500,err.Error()))
+		return
+	}
+	c.JSON(200,MetaResponse(200,"success."))
+	return
 }
diff --git a/server/controllers/get.go → server/controllers/v1/get.go b/server/controllers/get.go → server/controllers/v1/get.go
@@ -1,7 +1,8 @@
-package controllers
+package v1
 
 import (
 	"github.com/Xhofe/alist/alidrive"
+	"github.com/Xhofe/alist/server/controllers"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 	"strings"
@@ -12,7 +13,7 @@ import (
 func Get(c *gin.Context) {
 	var get alidrive.GetReq
 	if err := c.ShouldBindJSON(&get); err != nil {
-		c.JSON(200, MetaResponse(400,"Bad Request"))
+		c.JSON(200, controllers.MetaResponse(400,"Bad Request"))
 		return
 	}
 	log.Debugf("get:%+v",get)
@@ -28,25 +29,25 @@ func Get(c *gin.Context) {
 	//}
 	file,err:=alidrive.GetFile(get.FileId)
 	if err !=nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
 	paths,err:=alidrive.GetPaths(get.FileId)
 	if err!=nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
 	file.Paths=*paths
 	download,err:=alidrive.GetDownLoadUrl(get.FileId)
 	if err!=nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
 	file.DownloadUrl=download.Url
 	//if conf.Conf.Cache.Enable {
 	//	conf.Cache.Set(cacheKey,file,cache.DefaultExpiration)
 	//}
-	c.JSON(200, DataResponse(file))
+	c.JSON(200, controllers.DataResponse(file))
 }
 
 func Down(c *gin.Context) {
@@ -64,7 +65,7 @@ func Down(c *gin.Context) {
 	//}
 	file,err:=alidrive.GetDownLoadUrl(fileId)
 	if err != nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
 	//if conf.Conf.Cache.Enable {

diff --git a/server/controllers/list.go → server/controllers/v1/list.go b/server/controllers/list.go → server/controllers/v1/list.go
@@ -1,9 +1,10 @@
-package controllers
+package v1
 
 import (
 	"fmt"
 	"github.com/Xhofe/alist/alidrive"
 	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/server/controllers"
 	"github.com/gin-gonic/gin"
 	"github.com/patrickmn/go-cache"
 	log "github.com/sirupsen/logrus"
@@ -19,7 +20,7 @@ type ListReq struct {
 func List(c *gin.Context) {
 	var list ListReq
 	if err := c.ShouldBindJSON(&list);err!=nil {
-		c.JSON(200, MetaResponse(400,"Bad Request"))
+		c.JSON(200, controllers.MetaResponse(400,"Bad Request"))
 		return
 	}
 	log.Debugf("list:%+v",list)
@@ -29,7 +30,7 @@ func List(c *gin.Context) {
 		files,exist:=conf.Cache.Get(cacheKey)
 		if exist {
 			log.Debugf("使用了缓存:%s",cacheKey)
-			c.JSON(200, DataResponse(files))
+			c.JSON(200, controllers.DataResponse(files))
 			return
 		}
 	}
@@ -49,27 +50,27 @@ func List(c *gin.Context) {
 		files,err=alidrive.GetList(list.ParentFileId,list.Limit,list.Marker,list.OrderBy,list.OrderDirection)
 	}
 	if err!=nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
 	password:=alidrive.HasPassword(files)
 	if password!="" && password!=list.Password {
 		if list.Password=="" {
-			c.JSON(200, MetaResponse(401,"need password."))
+			c.JSON(200, controllers.MetaResponse(401,"need password."))
 			return
 		}
-		c.JSON(200, MetaResponse(401,"wrong password."))
+		c.JSON(200, controllers.MetaResponse(401,"wrong password."))
 		return
 	}
 	paths,err:=alidrive.GetPaths(list.ParentFileId)
 	if err!=nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
 	files.Paths=*paths
 	//files.Readme=alidrive.HasReadme(files)
 	if conf.Conf.Cache.Enable {
 		conf.Cache.Set(cacheKey,files,cache.DefaultExpiration)
 	}
-	c.JSON(200, DataResponse(files))
+	c.JSON(200, controllers.DataResponse(files))
 }
diff --git a/server/controllers/offie_preview.go → server/controllers/v1/offie_preview.go b/server/controllers/offie_preview.go → server/controllers/v1/offie_preview.go
@@ -1,7 +1,8 @@
-package controllers
+package v1
 
 import (
 	"github.com/Xhofe/alist/alidrive"
+	"github.com/Xhofe/alist/server/controllers"
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
 )
@@ -10,14 +11,14 @@ import (
 func OfficePreview(c *gin.Context) {
 	var req alidrive.OfficePreviewUrlReq
 	if err := c.ShouldBindJSON(&req); err != nil {
-		c.JSON(200, MetaResponse(400,"Bad Request"))
+		c.JSON(200, controllers.MetaResponse(400,"Bad Request"))
 		return
 	}
 	log.Debugf("preview_req:%+v",req)
 	preview,err:=alidrive.GetOfficePreviewUrl(req.FileId)
 	if err!=nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
-	c.JSON(200, DataResponse(preview))
+	c.JSON(200, controllers.DataResponse(preview))
 }
diff --git a/server/controllers/search.go → server/controllers/v1/search.go b/server/controllers/search.go → server/controllers/v1/search.go
@@ -1,9 +1,10 @@
-package controllers
+package v1
 
 import (
 	"fmt"
 	"github.com/Xhofe/alist/alidrive"
 	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/server/controllers"
 	"github.com/gin-gonic/gin"
 	"github.com/patrickmn/go-cache"
 	log "github.com/sirupsen/logrus"
@@ -12,12 +13,12 @@ import (
 // handle search request
 func Search(c *gin.Context) {
 	if !conf.Conf.Server.Search {
-		c.JSON(200, MetaResponse(403,"Not allow search."))
+		c.JSON(200, controllers.MetaResponse(403,"Not allow search."))
 		return
 	}
 	var search alidrive.SearchReq
 	if err := c.ShouldBindJSON(&search); err != nil {
-		c.JSON(200, MetaResponse(400,"Bad Request"))
+		c.JSON(200, controllers.MetaResponse(400,"Bad Request"))
 		return
 	}
 	log.Debugf("search:%+v",search)
@@ -27,7 +28,7 @@ func Search(c *gin.Context) {
 		files,exist:=conf.Cache.Get(cacheKey)
 		if exist {
 			log.Debugf("使用了缓存:%s",cacheKey)
-			c.JSON(200, DataResponse(files))
+			c.JSON(200, controllers.DataResponse(files))
 			return
 		}
 	}
@@ -40,11 +41,11 @@ func Search(c *gin.Context) {
 	//}
 	files,err:=alidrive.Search(search.Query,search.Limit,search.OrderBy)
 	if err != nil {
-		c.JSON(200, MetaResponse(500,err.Error()))
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
 		return
 	}
 	if conf.Conf.Cache.Enable {
 		conf.Cache.Set(cacheKey,files,cache.DefaultExpiration)
 	}
-	c.JSON(200, DataResponse(files))
+	c.JSON(200, controllers.DataResponse(files))
 }
diff --git a/server/controllers/v2/get.go b/server/controllers/v2/get.go
@@ -0,0 +1,52 @@
+package v2
+
+import (
+	"github.com/Xhofe/alist/alidrive"
+	"github.com/Xhofe/alist/server/controllers"
+	"github.com/Xhofe/alist/server/models"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+	"path/filepath"
+)
+
+// get request bean
+type GetReq struct {
+	File     string `json:"file"`
+	Password string `json:"password"`
+}
+
+// handle list request
+func Get(c *gin.Context) {
+	var get GetReq
+	if err := c.ShouldBindJSON(&get); err != nil {
+		c.JSON(200, controllers.MetaResponse(400, "Bad Request."))
+		return
+	}
+	log.Debugf("list:%+v", get)
+	path,name:=filepath.Split(get.File)
+	file, err := models.GetFileByParentPathAndName(path,name)
+	if err != nil {
+		c.JSON(200, controllers.MetaResponse(500, err.Error()))
+		return
+	}
+	c.JSON(200, controllers.DataResponse(file))
+}
+
+// handle download request
+func Down(c *gin.Context) {
+	filePath:=c.Param("file")
+	log.Debugf("down:%s",filePath)
+	path,name:=filepath.Split(filePath)
+	fileModel, err := models.GetFileByParentPathAndName(path,name)
+	if err != nil {
+		c.JSON(200, controllers.MetaResponse(500, err.Error()))
+		return
+	}
+	file,err:=alidrive.GetDownLoadUrl(fileModel.FileId)
+	if err != nil {
+		c.JSON(200, controllers.MetaResponse(500,err.Error()))
+		return
+	}
+	c.Redirect(301,file.Url)
+	return
+}
diff --git a/server/controllers/v2/list.go b/server/controllers/v2/list.go
@@ -0,0 +1,30 @@
+package v2
+
+import (
+	"github.com/Xhofe/alist/server/controllers"
+	"github.com/Xhofe/alist/server/models"
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+)
+
+// list request bean
+type ListReq struct {
+	Path     string `json:"path"`
+	Password string `json:"password"`
+}
+
+// handle list request
+func List(c *gin.Context) {
+	var list ListReq
+	if err := c.ShouldBindJSON(&list); err != nil {
+		c.JSON(200, controllers.MetaResponse(400, "Bad Request."))
+		return
+	}
+	log.Debugf("list:%+v", list)
+	files, err := models.GetFilesByParentPath(list.Path)
+	if err != nil {
+		c.JSON(200, controllers.MetaResponse(500, err.Error()))
+		return
+	}
+	c.JSON(200, controllers.DataResponse(files))
+}