🔖 release 1.0.4

* Update request.go

* Update req_bean.go

alidrive/req_bean.go

@@ -69,6 +69,7 @@ type OfficePreviewUrlReq struct {
 
 // video preview url request bean
 type VideoPreviewUrlReq struct {
-	DriveId     string `json:"drive_id"`
-	FileId      string `json:"file_id"`
+	DriveId   string `json:"drive_id"`
+	FileId    string `json:"file_id"`
+	ExpireSec int    `json:"expire_sec"`
 }

alidrive/request.go

@@ -112,12 +112,13 @@ func GetOfficePreviewUrl(fileId string, drive *conf.Drive) (*OfficePreviewUrlRes
 func GetVideoPreviewUrl(fileId string, drive *conf.Drive) (*VideoPreviewUrlResp, error) {
 	url := conf.Conf.AliDrive.ApiUrl + "/databox/get_video_play_info"
 	req := VideoPreviewUrlReq{
-		DriveId:     drive.DefaultDriveId,
-		FileId:      fileId,
+		DriveId:   drive.DefaultDriveId,
+		FileId:    fileId,
+		ExpireSec: 14400,
 	}
 	var resp VideoPreviewUrlResp
 	if err := BodyToJson(url, req, &resp, drive); err != nil {
 		return nil, err
 	}
 	return &resp, nil
-}
+}

alidrive/resp_bean.go

@@ -68,6 +68,14 @@ type Path struct {
 	FileId string `json:"file_id"`
 }
 
+/** 秒传
+{
+	"name":"mikuclub.mp4",
+	"content_hash":"C733AC50D1F964C0398D0E403F3A30C37EFC2ADD",
+	"size":1141068377,
+	"content_type":"video/mp4"
+}
+ */
 // file response bean
 type File struct {
 	RespError

conf.yml.example

@@ -18,7 +18,7 @@ server:
   password: password #用于重建目录
 ali_drive:
   api_url: https://api.aliyundrive.com/v2
-  max_files_count: 3000
+  max_files_count: 50 #重建目录时每次请求的文件
   drives:
   - refresh_token: xxx #refresh_token
     root_folder: root #根目录的file_id

conf/const.go

@@ -22,7 +22,7 @@ var (
 var Conf = new(Config)
 
 const (
-	VERSION = "v1.0.3"
+	VERSION = "v1.0.4"
 
 	ImageThumbnailProcess = "image/resize,w_50"
 	VideoThumbnailProcess = "video/snapshot,t_0,f_jpg,w_50"

server/controllers/down.go

@@ -45,7 +45,7 @@ func Down(c *gin.Context) {
 		c.JSON(200, MetaResponse(406, "无法下载目录."))
 		return
 	}
-	drive := utils.GetDriveByName(strings.Split(dir, "/")[0])
+	drive := utils.GetDriveByName(strings.Split(filePath, "/")[0])
 	if drive == nil {
 		c.JSON(200, MetaResponse(500, "找不到drive."))
 		return

server/controllers/get.go

@@ -42,7 +42,7 @@ func Get(c *gin.Context) {
 		}
 		return
 	}
-	drive := utils.GetDriveByName(strings.Split(dir, "/")[0])
+	drive := utils.GetDriveByName(strings.Split(get.Path, "/")[0])
 	if drive == nil {
 		c.JSON(200, MetaResponse(500, "找不到drive."))
 		return

server/controllers/path.go

@@ -27,7 +27,7 @@ func Path(c *gin.Context) {
 	if err != nil {
 		// folder model not exist
 		if file == nil {
-			c.JSON(200, MetaResponse(404, "path not found."))
+			c.JSON(200, MetaResponse(404, "path not found.(第一次请先点击网页底部rebuild)"))
 			return
 		}
 		c.JSON(200, MetaResponse(500, err.Error()))

server/controllers/utils.go

@@ -3,8 +3,8 @@ package controllers
 import (
 	"github.com/Xhofe/alist/conf"
 	"github.com/Xhofe/alist/server/models"
-	"github.com/Xhofe/alist/utils"
 	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
 )
 
 // handle info request
@@ -12,14 +12,21 @@ func Info(c *gin.Context) {
 	c.JSON(200, DataResponse(conf.Conf.Info))
 }
 
+type RebuildReq struct {
+	Path     string `json:"path" binding:"required"`
+	Password string `json:"password"`
+	Depth    int    `json:"depth"`
+}
+
 // rebuild tree
 func RebuildTree(c *gin.Context) {
-	drive := utils.GetDriveByName(c.Param("drive"))
-	if drive == nil {
-		c.JSON(200, MetaResponse(400, "drive isn't exist."))
+	var req RebuildReq
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(200, MetaResponse(400, "Bad Request:"+err.Error()))
 		return
 	}
-	password := c.Param("password")
+	log.Debugf("rebuild:%+v", req)
+	password := req.Password
 	if password != conf.Conf.Server.Password {
 		if password == "" {
 			c.JSON(200, MetaResponse(401, "need password."))
@@ -28,11 +35,7 @@ func RebuildTree(c *gin.Context) {
 		c.JSON(200, MetaResponse(401, "wrong password."))
 		return
 	}
-	if err := models.Clear(drive); err != nil {
-		c.JSON(200, MetaResponse(500, err.Error()))
-		return
-	}
-	if err := models.BuildTree(drive); err != nil {
+	if err := models.BuildTreeWithPath(req.Path, req.Depth); err != nil {
 		c.JSON(200, MetaResponse(500, err.Error()))
 		return
 	}

server/models/create.go

@@ -4,23 +4,25 @@ import (
 	"fmt"
 	"github.com/Xhofe/alist/alidrive"
 	"github.com/Xhofe/alist/conf"
+	"github.com/Xhofe/alist/utils"
 	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"
+	"path/filepath"
 	"strings"
 )
 
-func BuildTreeAll() {
+func BuildTreeAll(depth int) {
 	for i, _ := range conf.Conf.AliDrive.Drives {
-		if err := BuildTree(&conf.Conf.AliDrive.Drives[i]); err != nil {
-			log.Errorf("盘[%s]构建目录树失败:%s", err.Error())
+		if err := BuildTree(&conf.Conf.AliDrive.Drives[i], depth); err != nil {
+			log.Errorf("盘[%s]构建目录树失败:%s", conf.Conf.AliDrive.Drives[i].Name, err.Error())
 		} else {
-			log.Infof("盘[%s]构建目录树成功")
+			log.Infof("盘[%s]构建目录树成功", conf.Conf.AliDrive.Drives[i].Name)
 		}
 	}
 }
 
 // build tree
-func BuildTree(drive *conf.Drive) error {
+func BuildTree(drive *conf.Drive, depth int) error {
 	log.Infof("开始构建目录树...")
 	tx := conf.DB.Begin()
 	defer func() {
@@ -42,50 +44,137 @@ func BuildTree(drive *conf.Drive) error {
 		tx.Rollback()
 		return err
 	}
-	if err := BuildOne(drive.RootFolder, drive.Name+"/", tx, drive.Password, drive); err != nil {
+	if err := BuildOne(drive.RootFolder, drive.Name+"/", tx, drive.Password, drive, depth); err != nil {
 		tx.Rollback()
 		return err
 	}
 	return tx.Commit().Error
 }
 
-func BuildOne(parent string, path string, tx *gorm.DB, parentPassword string, drive *conf.Drive) error {
-	files, err := alidrive.GetList(parent, conf.Conf.AliDrive.MaxFilesCount, "", "", "", drive)
-	if err != nil {
-		return err
+/*
+递归构建目录树,插入指定目录下的所有文件
+parent 父目录的file_id
+path 指定的目录
+parentPassword	父目录所携带的密码
+drive 要构建的盘
+*/
+func BuildOne(parent string, path string, tx *gorm.DB, parentPassword string, drive *conf.Drive, depth int) error {
+	if depth == 0 {
+		return nil
 	}
-	for _, file := range files.Items {
-		name := file.Name
-		if strings.HasSuffix(name, ".hide") {
-			continue
+	marker := "first"
+	for marker != "" {
+		if marker == "first" {
+			marker = ""
 		}
-		password := parentPassword
-		if strings.Contains(name, ".password-") {
-			index := strings.Index(name, ".password-")
-			name = file.Name[:index]
-			password = file.Name[index+10:]
-		}
-		newFile := File{
-			Dir:           path,
-			FileExtension: file.FileExtension,
-			FileId:        file.FileId,
-			Name:          name,
-			Type:          file.Type,
-			UpdatedAt:     file.UpdatedAt,
-			Category:      file.Category,
-			ContentType:   file.ContentType,
-			Size:          file.Size,
-			Password:      password,
-		}
-		log.Debugf("插入file:%+v", newFile)
-		if err := tx.Create(&newFile).Error; err != nil {
+		files, err := alidrive.GetList(parent, conf.Conf.AliDrive.MaxFilesCount, marker, "", "", drive)
+		if err != nil {
 			return err
 		}
-		if file.Type == "folder" {
-			if err := BuildOne(file.FileId, fmt.Sprintf("%s%s/", path, name), tx, password, drive); err != nil {
+		marker = files.NextMarker
+		for _, file := range files.Items {
+			name := file.Name
+			if strings.HasSuffix(name, ".hide") {
+				continue
+			}
+			password := parentPassword
+			if strings.Contains(name, ".password-") {
+				index := strings.Index(name, ".password-")
+				name = file.Name[:index]
+				password = file.Name[index+10:]
+			}
+			newFile := File{
+				Dir:           path,
+				FileExtension: file.FileExtension,
+				FileId:        file.FileId,
+				Name:          name,
+				Type:          file.Type,
+				UpdatedAt:     file.UpdatedAt,
+				Category:      file.Category,
+				ContentType:   file.ContentType,
+				Size:          file.Size,
+				Password:      password,
+				ContentHash:   file.ContentHash,
+			}
+			log.Debugf("插入file:%+v", newFile)
+			if err := tx.Create(&newFile).Error; err != nil {
 				return err
 			}
+			if file.Type == "folder" {
+				if err := BuildOne(file.FileId, fmt.Sprintf("%s%s/", path, name), tx, password, drive, depth-1); err != nil {
+					return err
+				}
+			}
 		}
 	}
 	return nil
 }
+
+//重建指定路径与深度的目录树: 先删除该目录与该目录下所有文件的model，再重新插入
+func BuildTreeWithPath(path string, depth int) error {
+	dir, name := filepath.Split(path)
+	driveName := strings.Split(path, "/")[0]
+	drive := utils.GetDriveByName(driveName)
+	if drive == nil {
+		return fmt.Errorf("找不到drive[%s]", driveName)
+	}
+	file := &File{
+		Dir:      "",
+		FileId:   drive.RootFolder,
+		Name:     drive.Name,
+		Type:     "folder",
+		Password: drive.Password,
+	}
+	var err error
+	if dir != "" {
+		file, err = GetFileByDirAndName(dir, name)
+		if err != nil {
+			if file == nil {
+				return fmt.Errorf("path not found")
+			}
+			return err
+		}
+	}
+	tx := conf.DB.Begin()
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	if err = tx.Error; err != nil {
+		tx.Rollback()
+		return err
+	}
+	if err = tx.Where("dir = ? AND name = ?", file.Dir, file.Name).Delete(file).Error; err != nil{
+		tx.Rollback()
+		return err
+	}
+	if err = tx.Where("dir like ?", fmt.Sprintf("%s%%", path)).Delete(&File{}).Error; err != nil{
+		tx.Rollback()
+		return err
+	}
+	//if dir != "" {
+	//	aliFile, err := alidrive.GetFile(file.FileId, drive)
+	//	if err != nil {
+	//		tx.Rollback()
+	//		return err
+	//	}
+	//	aliName := aliFile.Name
+	//	if strings.HasSuffix(aliName, ".hide") {
+	//		return nil
+	//	}
+	//	if strings.Contains(aliName, ".password-") {
+	//		index := strings.Index(name, ".password-")
+	//		file.Name = aliName[:index]
+	//		file.Password = aliName[index+10:]
+	//	}
+	//}
+	if err = tx.Create(&file).Error; err != nil {
+		return err
+	}
+	if err = BuildOne(file.FileId, path+"/", tx, file.Password, drive, depth); err != nil {
+		tx.Rollback()
+		return err
+	}
+	return tx.Commit().Error
+}

server/models/file.go

@@ -18,6 +18,7 @@ type File struct {
 	Size          int64      `json:"size"`
 	Password      string     `json:"password"`
 	Url           string     `json:"url" gorm:"-"`
+	ContentHash   string     `json:"content_hash"`
 }
 
 func (file *File) Create() error {
@@ -62,3 +63,7 @@ func SearchByNameInDir(keyword string, dir string) (*[]File, error) {
 	}
 	return &files, nil
 }
+
+func DeleteWithDir(dir string) error {
+	return conf.DB.Where("dir like ?", fmt.Sprintf("%s%%", dir)).Delete(&File{}).Error
+}

server/router.go

@@ -30,7 +30,7 @@ func InitApiRouter(engine *gin.Engine) {
 		apiV2.POST("/video_preview/:drive", controllers.VideoPreview)
 		apiV2.POST("/local_search", controllers.LocalSearch)
 		apiV2.POST("/global_search", controllers.GlobalSearch)
-		apiV2.GET("/rebuild/:drive/:password", controllers.RebuildTree)
+		apiV2.POST("/rebuild", controllers.RebuildTree)
 	}
 	engine.GET("/d/*path", controllers.Down)
 }