Feat: filter and search file

pull/247/head
HFO4 2020-02-11 11:13:20 +08:00
parent 8f28a9c346
commit 127d0236f9
5 changed files with 34 additions and 13 deletions

View File

@ -81,15 +81,26 @@ func GetFilesByIDs(ids []uint, uid uint) ([]File, error) {
// GetFilesByKeywords 根据关键字搜索文件, // GetFilesByKeywords 根据关键字搜索文件,
// UID为0表示忽略用户只根据文件ID检索 // UID为0表示忽略用户只根据文件ID检索
// TODO 测试 // TODO 测试
func GetFilesByKeywords(keywords string, uid uint) ([]File, error) { func GetFilesByKeywords(uid uint, keywords ...interface{}) ([]File, error) {
var files []File var (
var result *gorm.DB files []File
result = DB
conditions string
)
if uid == 0 { // 生成查询条件
result = DB.Where("name like ?", keywords).Find(&files) for i := 0; i < len(keywords); i++ {
} else { conditions += "LOWER(name) like ?"
result = DB.Where("name like ? AND user_id = ?", keywords, uid).Find(&files) if i != len(keywords)-1 {
conditions += " or "
}
} }
if uid != 0 {
result = result.Where("user_id = ?", uid)
}
result = result.Where("("+conditions+")", keywords...).Find(&files)
return files, result.Error return files, result.Error
} }

View File

@ -47,7 +47,7 @@ func Init() {
// Debug模式下输出所有 SQL 日志 // Debug模式下输出所有 SQL 日志
if conf.SystemConfig.Debug { if conf.SystemConfig.Debug {
db.LogMode(false) db.LogMode(true)
} }
//db.SetLogger(util.Log()) //db.SetLogger(util.Log())

View File

@ -127,6 +127,7 @@ func (fs *FileSystem) Preview(ctx context.Context, id uint, isText bool) (*respo
return &response.ContentResponse{ return &response.ContentResponse{
Redirect: true, Redirect: true,
URL: previewURL, URL: previewURL,
MaxAge: ttl,
}, nil }, nil
} }
@ -342,8 +343,8 @@ func (fs *FileSystem) resetPolicyToFirstFile(ctx context.Context) error {
} }
// Search 搜索文件 // Search 搜索文件
func (fs *FileSystem) Search(ctx context.Context, keywords string) ([]Object, error) { func (fs *FileSystem) Search(ctx context.Context, keywords ...interface{}) ([]Object, error) {
files, _ := model.GetFilesByKeywords(keywords, fs.User.ID) files, _ := model.GetFilesByKeywords(fs.User.ID, keywords...)
fs.SetTargetFile(&files) fs.SetTargetFile(&files)
return fs.listObjects(ctx, "/", files, nil, nil), nil return fs.listObjects(ctx, "/", files, nil, nil), nil

View File

@ -272,6 +272,7 @@ func (service *FileIDService) PreviewContent(ctx context.Context, c *gin.Context
// 重定向到文件源 // 重定向到文件源
if resp.Redirect { if resp.Redirect {
c.Header("Cache-Control", fmt.Sprintf("max-age=%d", resp.MaxAge))
return serializer.Response{ return serializer.Response{
Code: -301, Code: -301,
Data: resp.URL, Data: resp.URL,

View File

@ -24,20 +24,28 @@ func (service *ItemSearchService) Search(c *gin.Context) serializer.Response {
switch service.Type { switch service.Type {
case "keywords": case "keywords":
return service.SearchKeywords(c, "%"+service.Keywords+"%", fs) return service.SearchKeywords(c, fs, "%"+service.Keywords+"%")
case "image":
return service.SearchKeywords(c, fs, "%.bmp", "%.flac", "%.iff", "%.png", "%.gif", "%.jpg", "%.jpge", "%.psd", "%.svg", "%.webp")
case "video":
return service.SearchKeywords(c, fs, "%.mp4", "%.flv", "%.avi", "%.wmv", "%.mkv", "%.rm", "%.rmvb", "%.mov", "%.ogv")
case "audio":
return service.SearchKeywords(c, fs, "%.mp3", "%.flac", "%.ape", "%.wav", "%.acc", "%.ogg", "%.midi", "%.mid")
case "doc":
return service.SearchKeywords(c, fs, "%.txt", "%.md", "%.pdf", "%.doc", "%.docx", "%.ppt", "%.pptx", "%.xls", "%.xlsx", "%.pub")
default: default:
return serializer.ParamErr("未知搜索类型", nil) return serializer.ParamErr("未知搜索类型", nil)
} }
} }
// SearchKeywords 根据关键字搜索文件 // SearchKeywords 根据关键字搜索文件
func (service *ItemSearchService) SearchKeywords(c *gin.Context, keywords string, fs *filesystem.FileSystem) serializer.Response { func (service *ItemSearchService) SearchKeywords(c *gin.Context, fs *filesystem.FileSystem, keywords ...interface{}) serializer.Response {
// 上下文 // 上下文
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
// 获取子项目 // 获取子项目
objects, err := fs.Search(ctx, keywords) objects, err := fs.Search(ctx, keywords...)
if err != nil { if err != nil {
return serializer.Err(serializer.CodeNotSet, err.Error(), err) return serializer.Err(serializer.CodeNotSet, err.Error(), err)
} }