Fix: policy should be re-dispatch while getting thumbnails

pkg/filesystem/file.go

@@ -287,6 +287,21 @@ func (fs *FileSystem) resetFileIfNotExist(ctx context.Context, path string) erro
 	return fs.resetPolicyToFirstFile(ctx)
 }
 
+// resetFileIfNotExist 重设当前目标文件为 id，如果当前目标为空
+func (fs *FileSystem) resetFileIDIfNotExist(ctx context.Context, id uint) error {
+	// 找到文件
+	if len(fs.FileTarget) == 0 {
+		file, err := model.GetFilesByIDs([]uint{id}, fs.User.ID)
+		if err != nil || len(file) == 0 {
+			return ErrObjectNotExist
+		}
+		fs.FileTarget = []model.File{file[0]}
+	}
+
+	// 将当前存储策略重设为文件使用的
+	return fs.resetPolicyToFirstFile(ctx)
+}
+
 // resetPolicyToFirstFile 将当前存储策略重设为第一个目标文件文件使用的
 func (fs *FileSystem) resetPolicyToFirstFile(ctx context.Context) error {
 	if len(fs.FileTarget) == 0 {

pkg/filesystem/filesystem.go

@@ -146,6 +146,8 @@ func (fs *FileSystem) dispatchHandler() error {
 
 	// 根据存储策略类型分配适配器
 	switch policyType {
+	case "mock":
+		return nil
 	case "local":
 		fs.Handler = local.Handler{
 			Policy: currentPolicy,

pkg/filesystem/image.go

@@ -21,15 +21,14 @@ var HandledExtension = []string{"jpg", "jpeg", "png", "gif"}
 // GetThumb 获取文件的缩略图
 func (fs *FileSystem) GetThumb(ctx context.Context, id uint) (*response.ContentResponse, error) {
 	// 根据 ID 查找文件
-	file, err := model.GetFilesByIDs([]uint{id}, fs.User.ID)
-	if err != nil || len(file) == 0 || file[0].PicInfo == "" {
+	err := fs.resetFileIDIfNotExist(ctx, id)
+	if err != nil || fs.FileTarget[0].PicInfo == "" {
 		return &response.ContentResponse{
 			Redirect: false,
 		}, ErrObjectNotExist
 	}
 
-	fs.FileTarget = []model.File{file[0]}
-	res, err := fs.Handler.Thumb(ctx, file[0].SourceName)
+	res, err := fs.Handler.Thumb(ctx, fs.FileTarget[0].SourceName)
 
 	// TODO 出错时重新生成缩略图
 	return res, err

pkg/filesystem/image_test.go

@@ -31,15 +31,15 @@ func CreateTestImage() *os.File {
 
 func TestFileSystem_GetThumb(t *testing.T) {
 	asserts := assert.New(t)
-	fs := FileSystem{
-		User: &model.User{
-			Model: gorm.Model{ID: 1},
-		},
-	}
 	ctx := context.Background()
 
 	// 正常
 	{
+		fs := FileSystem{
+			User: &model.User{
+				Model: gorm.Model{ID: 1},
+			},
+		}
 		testHandler := new(FileHeaderMock)
 		testHandler.On("Thumb", testMock.Anything, "123.jpg").Return(&response.ContentResponse{URL: "123"}, nil)
 		fs.Handler = testHandler
@@ -47,8 +47,14 @@ func TestFileSystem_GetThumb(t *testing.T) {
 			WithArgs(10, 1).
 			WillReturnRows(
 				sqlmock.NewRows(
-					[]string{"id", "pic_info", "source_name"}).
-					AddRow(10, "10,10", "123.jpg"),
+					[]string{"id", "pic_info", "source_name", "policy_id"}).
+					AddRow(10, "10,10", "123.jpg", 154),
+			)
+		mock.ExpectQuery("SELECT(.+)").
+			WillReturnRows(
+				sqlmock.NewRows(
+					[]string{"id", "type"}).
+					AddRow(154, "mock"),
 			)
 
 		res, err := fs.GetThumb(ctx, 10)
@@ -60,7 +66,11 @@ func TestFileSystem_GetThumb(t *testing.T) {
 
 	// 文件不存在
 	{
-
+		fs := FileSystem{
+			User: &model.User{
+				Model: gorm.Model{ID: 1},
+			},
+		}
 		mock.ExpectQuery("SELECT(.+)").
 			WithArgs(10, 1).
 			WillReturnRows(

pkg/filesystem/remote/handler.go

@@ -38,6 +38,8 @@ func (handler Handler) getAPI(scope string) string {
 	switch scope {
 	case "delete":
 		controller, _ = url.Parse("/api/v3/slave/delete")
+	case "thumb":
+		controller, _ = url.Parse("/api/v3/slave/thumb")
 	}
 
 	return serverURL.ResolveReference(controller).String()
@@ -101,7 +103,18 @@ func (handler Handler) Delete(ctx context.Context, files []string) ([]string, er
 
 // Thumb 获取文件缩略图
 func (handler Handler) Thumb(ctx context.Context, path string) (*response.ContentResponse, error) {
-	return nil, errors.New("未实现")
+	sourcePath := base64.RawURLEncoding.EncodeToString([]byte(path))
+	thumbURL := handler.getAPI("thumb") + "/" + sourcePath
+	ttl := model.GetIntSetting("slave_api_timeout", 60)
+	signedThumbURL, err := auth.SignURI(handler.AuthInstance, thumbURL, int64(ttl))
+	if err != nil {
+		return nil, err
+	}
+
+	return &response.ContentResponse{
+		Redirect: true,
+		URL:      signedThumbURL.String(),
+	}, nil
 }
 
 // Source 获取外链URL