Modify: change raw object ID to Hash ID in file service

2026-01-26 09:34:57 +08:00 · 2020-02-10 13:10:59 +08:00
parent f235ad1def
commit 9be1b4366f
16 changed files with 287 additions and 121 deletions
--- a/service/explorer/directory.go
+++ b/service/explorer/directory.go
@@ -3,6 +3,7 @@ package explorer
 import (
 	"context"
 	"github.com/HFO4/cloudreve/pkg/filesystem"
+	"github.com/HFO4/cloudreve/pkg/hashid"
 	"github.com/HFO4/cloudreve/pkg/serializer"
 	"github.com/gin-gonic/gin"
 )
@@ -39,7 +40,7 @@ func (service *DirectoryService) ListDirectory(c *gin.Context) serializer.Respon
 	return serializer.Response{
 		Code: 0,
 		Data: map[string]interface{}{
-			"parent":  parentID,
+			"parent":  hashid.HashID(parentID, hashid.FolderID),
 			"objects": objects,
 		},
 	}
--- a/service/explorer/file.go
+++ b/service/explorer/file.go
@@ -15,7 +15,6 @@ import (
 	"github.com/jinzhu/gorm"
 	"net/http"
 	"net/url"
-	"path"
 	"strconv"
 	"time"
 )
@@ -25,6 +24,10 @@ type SingleFileService struct {
 	Path string `uri:"path" binding:"required,min=1,max=65535"`
 }

+// FileIDService 通过文件ID对文件进行操作的服务
+type FileIDService struct {
+}
+
 // FileAnonymousGetService 匿名（外链）获取文件服务
 type FileAnonymousGetService struct {
 	ID   uint   `uri:"id" binding:"required,min=1"`
@@ -105,7 +108,7 @@ func (service *FileAnonymousGetService) Download(ctx context.Context, c *gin.Con
 	}

 	// 获取文件流
-	rs, err := fs.GetDownloadContent(ctx, "")
+	rs, err := fs.GetDownloadContent(ctx, 0)
 	defer rs.Close()
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
@@ -120,7 +123,7 @@ func (service *FileAnonymousGetService) Download(ctx context.Context, c *gin.Con
 }

 // CreateDocPreviewSession 创建DOC文件预览会话，返回预览地址
-func (service *SingleFileService) CreateDocPreviewSession(ctx context.Context, c *gin.Context) serializer.Response {
+func (service *FileIDService) CreateDocPreviewSession(ctx context.Context, c *gin.Context) serializer.Response {
 	// 创建文件系统
 	fs, err := filesystem.NewFileSystemFromContext(c)
 	if err != nil {
@@ -138,8 +141,11 @@ func (service *SingleFileService) CreateDocPreviewSession(ctx context.Context, c
 		fs.Root = folder
 	}

+	// 获取对象id
+	objectID, _ := c.Get("object_id")
+
 	// 获取文件临时下载地址
-	downloadURL, err := fs.GetDownloadURL(ctx, service.Path, "doc_preview_timeout")
+	downloadURL, err := fs.GetDownloadURL(ctx, objectID.(uint), "doc_preview_timeout")
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -158,7 +164,7 @@ func (service *SingleFileService) CreateDocPreviewSession(ctx context.Context, c
 }

 // CreateDownloadSession 创建下载会话，获取下载URL
-func (service *SingleFileService) CreateDownloadSession(ctx context.Context, c *gin.Context) serializer.Response {
+func (service *FileIDService) CreateDownloadSession(ctx context.Context, c *gin.Context) serializer.Response {
 	// 创建文件系统
 	fs, err := filesystem.NewFileSystemFromContext(c)
 	if err != nil {
@@ -166,8 +172,11 @@ func (service *SingleFileService) CreateDownloadSession(ctx context.Context, c *
 	}
 	defer fs.Recycle()

+	// 获取对象id
+	objectID, _ := c.Get("object_id")
+
 	// 获取下载地址
-	downloadURL, err := fs.GetDownloadURL(ctx, service.Path, "download_timeout")
+	downloadURL, err := fs.GetDownloadURL(ctx, objectID.(uint), "download_timeout")
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -196,7 +205,7 @@ func (service *DownloadService) Download(ctx context.Context, c *gin.Context) se

 	// 开始处理下载
 	ctx = context.WithValue(ctx, fsctx.GinCtx, c)
-	rs, err := fs.GetDownloadContent(ctx, "")
+	rs, err := fs.GetDownloadContent(ctx, 0)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -220,7 +229,7 @@ func (service *DownloadService) Download(ctx context.Context, c *gin.Context) se

 // PreviewContent 预览文件，需要登录会话, isText - 是否为文本文件，文本文件会
 // 强制经由服务端中转
-func (service *SingleFileService) PreviewContent(ctx context.Context, c *gin.Context, isText bool) serializer.Response {
+func (service *FileIDService) PreviewContent(ctx context.Context, c *gin.Context, isText bool) serializer.Response {
 	// 创建文件系统
 	fs, err := filesystem.NewFileSystemFromContext(c)
 	if err != nil {
@@ -238,8 +247,11 @@ func (service *SingleFileService) PreviewContent(ctx context.Context, c *gin.Con
 		fs.Root = folder
 	}

+	// 获取对象id
+	objectID, _ := c.Get("object_id")
+
 	// 获取文件预览响应
-	resp, err := fs.Preview(ctx, service.Path, isText)
+	resp, err := fs.Preview(ctx, objectID.(uint), isText)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -267,7 +279,7 @@ func (service *SingleFileService) PreviewContent(ctx context.Context, c *gin.Con
 }

 // PutContent 更新文件内容
-func (service *SingleFileService) PutContent(ctx context.Context, c *gin.Context) serializer.Response {
+func (service *FileIDService) PutContent(ctx context.Context, c *gin.Context) serializer.Response {
 	// 创建上下文
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -280,11 +292,9 @@ func (service *SingleFileService) PutContent(ctx context.Context, c *gin.Context
 	}

 	fileData := local.FileStream{
-		MIMEType:    c.Request.Header.Get("Content-Type"),
-		File:        c.Request.Body,
-		Size:        fileSize,
-		Name:        path.Base(service.Path),
-		VirtualPath: path.Dir(service.Path),
+		MIMEType: c.Request.Header.Get("Content-Type"),
+		File:     c.Request.Body,
+		Size:     fileSize,
 	}

 	// 创建文件系统
@@ -295,16 +305,18 @@ func (service *SingleFileService) PutContent(ctx context.Context, c *gin.Context
 	uploadCtx := context.WithValue(ctx, fsctx.GinCtx, c)

 	// 取得现有文件
-	exist, originFile := fs.IsFileExist(service.Path)
-	if !exist {
+	fileID, _ := c.Get("object_id")
+	originFile, _ := model.GetFilesByIDs([]uint{fileID.(uint)}, fs.User.ID)
+	if len(originFile) == 0 {
 		return serializer.Err(404, "文件不存在", nil)
 	}
+	fileData.Name = originFile[0].Name

 	// 检查此文件是否有软链接
-	fileList, err := model.RemoveFilesWithSoftLinks([]model.File{*originFile})
+	fileList, err := model.RemoveFilesWithSoftLinks([]model.File{originFile[0]})
 	if err == nil && len(fileList) == 0 {
 		// 如果包含软连接，应重新生成新文件副本，并更新source_name
-		originFile.SourceName = fs.GenerateSavePath(uploadCtx, fileData)
+		originFile[0].SourceName = fs.GenerateSavePath(uploadCtx, fileData)
 		fs.Use("AfterUpload", filesystem.HookUpdateSourceName)
 		fs.Use("AfterUploadCanceled", filesystem.HookUpdateSourceName)
 		fs.Use("AfterValidateFailed", filesystem.HookUpdateSourceName)
@@ -323,7 +335,7 @@ func (service *SingleFileService) PutContent(ctx context.Context, c *gin.Context
 	fs.Use("AfterValidateFailed", filesystem.HookGiveBackCapacity)

 	// 执行上传
-	uploadCtx = context.WithValue(uploadCtx, fsctx.FileModelCtx, *originFile)
+	uploadCtx = context.WithValue(uploadCtx, fsctx.FileModelCtx, originFile[0])
 	err = fs.Upload(uploadCtx, fileData)
 	if err != nil {
 		return serializer.Err(serializer.CodeUploadFailed, err.Error(), err)
@@ -365,7 +377,7 @@ func (service *SlaveDownloadService) ServeFile(ctx context.Context, c *gin.Conte

 	// 开始处理下载
 	ctx = context.WithValue(ctx, fsctx.GinCtx, c)
-	rs, err := fs.GetDownloadContent(ctx, "")
+	rs, err := fs.GetDownloadContent(ctx, 0)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
--- a/service/explorer/objects.go
+++ b/service/explorer/objects.go
@@ -8,6 +8,7 @@ import (
 	"github.com/HFO4/cloudreve/pkg/cache"
 	"github.com/HFO4/cloudreve/pkg/filesystem"
 	"github.com/HFO4/cloudreve/pkg/filesystem/fsctx"
+	"github.com/HFO4/cloudreve/pkg/hashid"
 	"github.com/HFO4/cloudreve/pkg/serializer"
 	"github.com/HFO4/cloudreve/pkg/task"
 	"github.com/HFO4/cloudreve/pkg/util"
@@ -21,15 +22,15 @@ import (

 // ItemMoveService 处理多文件/目录移动
 type ItemMoveService struct {
-	SrcDir string      `json:"src_dir" binding:"required,min=1,max=65535"`
-	Src    ItemService `json:"src" binding:"exists"`
-	Dst    string      `json:"dst" binding:"required,min=1,max=65535"`
+	SrcDir string        `json:"src_dir" binding:"required,min=1,max=65535"`
+	Src    ItemIDService `json:"src" binding:"exists"`
+	Dst    string        `json:"dst" binding:"required,min=1,max=65535"`
 }

 // ItemRenameService 处理多文件/目录重命名
 type ItemRenameService struct {
-	Src     ItemService `json:"src" binding:"exists"`
-	NewName string      `json:"new_name" binding:"required,min=1,max=255"`
+	Src     ItemIDService `json:"src" binding:"exists"`
+	NewName string        `json:"new_name" binding:"required,min=1,max=255"`
 }

 // ItemService 处理多文件/目录相关服务
@@ -38,11 +39,18 @@ type ItemService struct {
 	Dirs  []uint `json:"dirs" binding:"exists"`
 }

+// ItemIDService 处理多文件/目录相关服务，字段值为HashID，可通过Raw()方法获取原始ID
+type ItemIDService struct {
+	Items  []string `json:"items" binding:"exists"`
+	Dirs   []string `json:"dirs" binding:"exists"`
+	Source *ItemService
+}
+
 // ItemCompressService 文件压缩任务服务
 type ItemCompressService struct {
-	Src  ItemService `json:"src" binding:"exists"`
-	Dst  string      `json:"dst" binding:"required,min=1,max=65535"`
-	Name string      `json:"name" binding:"required,min=1,max=255"`
+	Src  ItemIDService `json:"src" binding:"exists"`
+	Dst  string        `json:"dst" binding:"required,min=1,max=65535"`
+	Name string        `json:"name" binding:"required,min=1,max=255"`
 }

 // ItemDecompressService 文件解压缩任务服务
@@ -51,6 +59,32 @@ type ItemDecompressService struct {
 	Dst string `json:"dst" binding:"required,min=1,max=65535"`
 }

+// Raw 批量解码HashID，获取原始ID
+func (service *ItemIDService) Raw() *ItemService {
+	if service.Source != nil {
+		return service.Source
+	}
+
+	service.Source = &ItemService{
+		Dirs:  make([]uint, 0, len(service.Dirs)),
+		Items: make([]uint, 0, len(service.Items)),
+	}
+	for _, folder := range service.Dirs {
+		id, err := hashid.DecodeHashID(folder, hashid.FolderID)
+		if err == nil {
+			service.Source.Dirs = append(service.Source.Dirs, id)
+		}
+	}
+	for _, file := range service.Items {
+		id, err := hashid.DecodeHashID(file, hashid.FileID)
+		if err == nil {
+			service.Source.Items = append(service.Source.Items, id)
+		}
+	}
+
+	return service.Source
+}
+
 // CreateDecompressTask 创建文件解压缩任务
 func (service *ItemDecompressService) CreateDecompressTask(c *gin.Context) serializer.Response {
 	// 创建文件系统
@@ -129,7 +163,7 @@ func (service *ItemCompressService) CreateCompressTask(c *gin.Context) serialize
 	}

 	// 递归列出待压缩子目录
-	folders, err := model.GetRecursiveChildFolder(service.Src.Dirs, fs.User.ID, true)
+	folders, err := model.GetRecursiveChildFolder(service.Src.Raw().Dirs, fs.User.ID, true)
 	if err != nil {
 		return serializer.Err(serializer.CodeDBError, "无法列出子目录", err)
 	}
@@ -160,8 +194,8 @@ func (service *ItemCompressService) CreateCompressTask(c *gin.Context) serialize
 	}

 	// 创建任务
-	job, err := task.NewCompressTask(fs.User, path.Join(service.Dst, service.Name), service.Src.Dirs,
-		service.Src.Items)
+	job, err := task.NewCompressTask(fs.User, path.Join(service.Dst, service.Name), service.Src.Raw().Dirs,
+		service.Src.Raw().Items)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, "任务创建失败", err)
 	}
@@ -172,7 +206,7 @@ func (service *ItemCompressService) CreateCompressTask(c *gin.Context) serialize
 }

 // Archive 创建归档
-func (service *ItemService) Archive(ctx context.Context, c *gin.Context) serializer.Response {
+func (service *ItemIDService) Archive(ctx context.Context, c *gin.Context) serializer.Response {
 	// 创建文件系统
 	fs, err := filesystem.NewFileSystemFromContext(c)
 	if err != nil {
@@ -187,7 +221,8 @@ func (service *ItemService) Archive(ctx context.Context, c *gin.Context) seriali

 	// 开始压缩
 	ctx = context.WithValue(ctx, fsctx.GinCtx, c)
-	zipFile, err := fs.Compress(ctx, service.Dirs, service.Items, true)
+	items := service.Raw()
+	zipFile, err := fs.Compress(ctx, items.Dirs, items.Items, true)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, "无法创建压缩文件", err)
 	}
@@ -219,7 +254,7 @@ func (service *ItemService) Archive(ctx context.Context, c *gin.Context) seriali
 }

 // Delete 删除对象
-func (service *ItemService) Delete(ctx context.Context, c *gin.Context) serializer.Response {
+func (service *ItemIDService) Delete(ctx context.Context, c *gin.Context) serializer.Response {
 	// 创建文件系统
 	fs, err := filesystem.NewFileSystemFromContext(c)
 	if err != nil {
@@ -228,7 +263,8 @@ func (service *ItemService) Delete(ctx context.Context, c *gin.Context) serializ
 	defer fs.Recycle()

 	// 删除对象
-	err = fs.Delete(ctx, service.Dirs, service.Items)
+	items := service.Raw()
+	err = fs.Delete(ctx, items.Dirs, items.Items)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -249,7 +285,8 @@ func (service *ItemMoveService) Move(ctx context.Context, c *gin.Context) serial
 	defer fs.Recycle()

 	// 移动对象
-	err = fs.Move(ctx, service.Src.Dirs, service.Src.Items, service.SrcDir, service.Dst)
+	items := service.Src.Raw()
+	err = fs.Move(ctx, items.Dirs, items.Items, service.SrcDir, service.Dst)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -275,7 +312,7 @@ func (service *ItemMoveService) Copy(ctx context.Context, c *gin.Context) serial
 	defer fs.Recycle()

 	// 复制对象
-	err = fs.Copy(ctx, service.Src.Dirs, service.Src.Items, service.SrcDir, service.Dst)
+	err = fs.Copy(ctx, service.Src.Raw().Dirs, service.Src.Raw().Items, service.SrcDir, service.Dst)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -301,7 +338,7 @@ func (service *ItemRenameService) Rename(ctx context.Context, c *gin.Context) se
 	defer fs.Recycle()

 	// 重命名对象
-	err = fs.Rename(ctx, service.Src.Dirs, service.Src.Items, service.NewName)
+	err = fs.Rename(ctx, service.Src.Raw().Dirs, service.Src.Raw().Items, service.NewName)
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
--- a/service/explorer/search.go
+++ b/service/explorer/search.go
@@ -0,0 +1,52 @@
+package explorer
+
+import (
+	"context"
+	"github.com/HFO4/cloudreve/pkg/filesystem"
+	"github.com/HFO4/cloudreve/pkg/serializer"
+	"github.com/gin-gonic/gin"
+)
+
+// ItemSearchService 文件搜索服务
+type ItemSearchService struct {
+	Type     string `uri:"type" binding:"required"`
+	Keywords string `uri:"keywords" binding:"required"`
+}
+
+// Search 执行搜索
+func (service *ItemSearchService) Search(c *gin.Context) serializer.Response {
+	// 创建文件系统
+	fs, err := filesystem.NewFileSystemFromContext(c)
+	if err != nil {
+		return serializer.Err(serializer.CodePolicyNotAllowed, err.Error(), err)
+	}
+	defer fs.Recycle()
+
+	switch service.Type {
+	case "keywords":
+		return service.SearchKeywords(c, "%"+service.Keywords+"%", fs)
+	default:
+		return serializer.ParamErr("未知搜索类型", nil)
+	}
+}
+
+// SearchKeywords 根据关键字搜索文件
+func (service *ItemSearchService) SearchKeywords(c *gin.Context, keywords string, fs *filesystem.FileSystem) serializer.Response {
+	// 上下文
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	// 获取子项目
+	objects, err := fs.Search(ctx, keywords)
+	if err != nil {
+		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
+	}
+
+	return serializer.Response{
+		Code: 0,
+		Data: map[string]interface{}{
+			"parent":  0,
+			"objects": objects,
+		},
+	}
+}
--- a/service/share/manage.go
+++ b/service/share/manage.go
@@ -11,7 +11,7 @@ import (

 // ShareCreateService 创建新分享服务
 type ShareCreateService struct {
-	SourceID        uint   `json:"id" binding:"required"`
+	SourceID        string `json:"id" binding:"required"`
 	IsDir           bool   `json:"is_dir"`
 	Password        string `json:"password" binding:"max=255"`
 	RemainDownloads int    `json:"downloads"`
@@ -30,15 +30,29 @@ func (service *ShareCreateService) Create(c *gin.Context) serializer.Response {
 		return serializer.Err(serializer.CodeNoPermissionErr, "您无权创建分享链接", nil)
 	}

+	// 源对象真实ID
+	var (
+		sourceID uint
+		err      error
+	)
+	if service.IsDir {
+		sourceID, err = hashid.DecodeHashID(service.SourceID, hashid.FolderID)
+	} else {
+		sourceID, err = hashid.DecodeHashID(service.SourceID, hashid.FileID)
+	}
+	if err != nil {
+		return serializer.Err(serializer.CodeNotFound, "原始资源不存在", nil)
+	}
+
 	// 对象是否存在
 	exist := true
 	if service.IsDir {
-		folder, err := model.GetFoldersByIDs([]uint{service.SourceID}, user.ID)
+		folder, err := model.GetFoldersByIDs([]uint{sourceID}, user.ID)
 		if err != nil || len(folder) == 0 {
 			exist = false
 		}
 	} else {
-		file, err := model.GetFilesByIDs([]uint{service.SourceID}, user.ID)
+		file, err := model.GetFilesByIDs([]uint{sourceID}, user.ID)
 		if err != nil || len(file) == 0 {
 			exist = false
 		}
@@ -51,7 +65,7 @@ func (service *ShareCreateService) Create(c *gin.Context) serializer.Response {
 		Password:        service.Password,
 		IsDir:           service.IsDir,
 		UserID:          user.ID,
-		SourceID:        service.SourceID,
+		SourceID:        sourceID,
 		Score:           service.Score,
 		RemainDownloads: -1,
 		PreviewEnabled:  service.Preview,
--- a/service/share/visit.go
+++ b/service/share/visit.go
@@ -96,7 +96,8 @@ func (service *Service) CreateDownloadSession(c *gin.Context) serializer.Respons
 	}

 	// 取得下载地址
-	downloadURL, err := fs.GetDownloadURL(context.Background(), service.Path, "download_timeout")
+	// TODO 改为真实ID
+	downloadURL, err := fs.GetDownloadURL(context.Background(), 0, "download_timeout")
 	if err != nil {
 		return serializer.Err(serializer.CodeNotSet, err.Error(), err)
 	}
@@ -119,9 +120,7 @@ func (service *Service) PreviewContent(ctx context.Context, c *gin.Context, isTe
 	} else {
 		ctx = context.WithValue(ctx, fsctx.FileModelCtx, share.Source())
 	}
-	subService := explorer.SingleFileService{
-		Path: service.Path,
-	}
+	subService := explorer.FileIDService{}

 	return subService.PreviewContent(ctx, c, isText)
 }
@@ -138,9 +137,7 @@ func (service *Service) CreateDocPreviewSession(c *gin.Context) serializer.Respo
 	} else {
 		ctx = context.WithValue(ctx, fsctx.FileModelCtx, share.Source())
 	}
-	subService := explorer.SingleFileService{
-		Path: service.Path,
-	}
+	subService := explorer.FileIDService{}

 	return subService.CreateDocPreviewSession(ctx, c)
 }
@@ -321,10 +318,8 @@ func (service *ArchiveService) Archive(c *gin.Context) serializer.Response {
 	tempUser.Group.OptionsSerialized.ArchiveDownload = true
 	c.Set("user", tempUser)

-	subService := explorer.ItemService{
-		Items: service.Items,
-		Dirs:  service.Dirs,
-	}
+	// todo 改成真实
+	subService := explorer.ItemIDService{}

 	return subService.Archive(ctx, c)
 }