Finish half translation work.

code/rest/alien_controller.go

@@ -1,7 +1,6 @@
 package rest
 
 import (
-	"fmt"
 	"github.com/eyebluecn/tank/code/core"
 	"github.com/eyebluecn/tank/code/tool/i18n"
 	"github.com/eyebluecn/tank/code/tool/result"
@@ -24,11 +23,9 @@ type AlienController struct {
 	shareService      *ShareService
 }
 
-//初始化方法
 func (this *AlienController) Init() {
 	this.BaseController.Init()
 
-	//手动装填本实例的Bean.
 	b := core.CONTEXT.GetBean(this.uploadTokenDao)
 	if c, ok := b.(*UploadTokenDao); ok {
 		this.uploadTokenDao = c
@@ -70,28 +67,26 @@ func (this *AlienController) Init() {
 	}
 }
 
-//注册自己的路由。
 func (this *AlienController) RegisterRoutes() map[string]func(writer http.ResponseWriter, request *http.Request) {
 
 	routeMap := make(map[string]func(writer http.ResponseWriter, request *http.Request))
 
-	//每个Controller需要主动注册自己的路由。
-	routeMap["/api/alien/fetch/upload/token"] = this.Wrap(this.FetchUploadToken, USER_ROLE_GUEST)
-	routeMap["/api/alien/fetch/download/token"] = this.Wrap(this.FetchDownloadToken, USER_ROLE_GUEST)
-	routeMap["/api/alien/confirm"] = this.Wrap(this.Confirm, USER_ROLE_GUEST)
+	routeMap["/api/alien/fetch/upload/token"] = this.Wrap(this.FetchUploadToken, USER_ROLE_USER)
+	routeMap["/api/alien/fetch/download/token"] = this.Wrap(this.FetchDownloadToken, USER_ROLE_USER)
+	routeMap["/api/alien/confirm"] = this.Wrap(this.Confirm, USER_ROLE_USER)
 	routeMap["/api/alien/upload"] = this.Wrap(this.Upload, USER_ROLE_GUEST)
 	routeMap["/api/alien/crawl/token"] = this.Wrap(this.CrawlToken, USER_ROLE_GUEST)
-	routeMap["/api/alien/crawl/direct"] = this.Wrap(this.CrawlDirect, USER_ROLE_GUEST)
+	routeMap["/api/alien/crawl/direct"] = this.Wrap(this.CrawlDirect, USER_ROLE_USER)
 
 	return routeMap
 }
 
-//处理一些特殊的接口，比如参数包含在路径中,一般情况下，controller不将参数放在url路径中
+//handle some special routes, eg. params in the url.
 func (this *AlienController) HandleRoutes(writer http.ResponseWriter, request *http.Request) (func(writer http.ResponseWriter, request *http.Request), bool) {
 
 	path := request.URL.Path
 
-	//匹配 /api/alien/preview/{uuid}/{filename} (响应头不包含 content-disposition)
+	//match /api/alien/preview/{uuid}/{filename} (response header not contain content-disposition)
 	reg := regexp.MustCompile(`^/api/alien/preview/([^/]+)/([^/]+)$`)
 	strs := reg.FindStringSubmatch(path)
 	if len(strs) == 3 {
@@ -101,7 +96,7 @@ func (this *AlienController) HandleRoutes(writer http.ResponseWriter, request *h
 		return f, true
 	}
 
-	//匹配 /api/alien/download/{uuid}/{filename} (响应头包含 content-disposition)
+	//match /api/alien/download/{uuid}/{filename} (response header contain content-disposition)
 	reg = regexp.MustCompile(`^/api/alien/download/([^/]+)/([^/]+)$`)
 	strs = reg.FindStringSubmatch(path)
 	if len(strs) == 3 {
@@ -114,76 +109,60 @@ func (this *AlienController) HandleRoutes(writer http.ResponseWriter, request *h
 	return nil, false
 }
 
-//系统中的用户x要获取一个UploadToken，用于提供给x信任的用户上传文件。
+//fetch a upload token for guest. Guest can upload file with this token.
 func (this *AlienController) FetchUploadToken(writer http.ResponseWriter, request *http.Request) *result.WebResult {
 
-	//文件名。
 	filename := request.FormValue("filename")
+	expireTimeStr := request.FormValue("expireTime")
+	privacyStr := request.FormValue("privacy")
+	sizeStr := request.FormValue("size")
+	//store dir path
+	dirPath := request.FormValue("dirPath")
+
 	if filename == "" {
-		panic("文件名必填")
+		panic(result.BadRequest("filename cannot be null"))
 	} else if m, _ := regexp.MatchString(MATTER_NAME_PATTERN, filename); m {
 		panic(result.BadRequestI18n(request, i18n.MatterNameContainSpecialChars))
 	}
 
-	//什么时间后过期，默认24h
-	expireStr := request.FormValue("expire")
-	expire := 24 * 60 * 60
-	if expireStr != "" {
-		var err error
-		expire, err = strconv.Atoi(expireStr)
-		if err != nil {
-			panic(`过期时间不符合规范`)
-		}
-		if expire < 1 {
-			panic(`过期时间不符合规范`)
-		}
-
-	}
-
-	//文件公有或私有
-	privacyStr := request.FormValue("privacy")
-	var privacy bool
-	if privacyStr == "" {
-		panic(`文件公有性必填`)
+	var expireTime time.Time
+	if expireTimeStr == "" {
+		panic(result.BadRequest("time format error"))
 	} else {
-		if privacyStr == TRUE {
-			privacy = true
-		} else if privacyStr == "false" {
-			privacy = false
-		} else {
-			panic(`文件公有性不符合规范`)
-		}
+		expireTime = util.ConvertDateTimeStringToTime(expireTimeStr)
+	}
+	if expireTime.Before(time.Now()) {
+		panic(result.BadRequest("expire time cannot before now"))
+	}
+
+	var privacy = false
+	if privacyStr == TRUE {
+		privacy = true
 	}
 
-	//文件大小
-	sizeStr := request.FormValue("size")
 	var size int64
 	if sizeStr == "" {
-		panic(`文件大小必填`)
+		panic(result.BadRequest("file size cannot be null"))
 	} else {
 
 		var err error
 		size, err = strconv.ParseInt(sizeStr, 10, 64)
 		if err != nil {
-			panic(`文件大小不符合规范`)
+			panic(result.BadRequest("file size error"))
 		}
 		if size < 1 {
-			panic(`文件大小不符合规范`)
+			panic(result.BadRequest("file size error"))
 		}
 	}
 
-	//文件夹路径，以 / 开头。
-	dir := request.FormValue("dir")
-
 	user := this.checkUser(request)
-	dirMatter := this.matterService.CreateDirectories(request, user, dir)
+	dirMatter := this.matterService.CreateDirectories(request, user, dirPath)
 
-	mm, _ := time.ParseDuration(fmt.Sprintf("%ds", expire))
 	uploadToken := &UploadToken{
 		UserUuid:   user.Uuid,
 		FolderUuid: dirMatter.Uuid,
 		MatterUuid: "",
-		ExpireTime: time.Now().Add(mm),
+		ExpireTime: expireTime,
 		Filename:   filename,
 		Privacy:    privacy,
 		Size:       size,
@@ -196,51 +175,34 @@ func (this *AlienController) FetchUploadToken(writer http.ResponseWriter, reques
 
 }
 
-//系统中的用户x 拿着某个文件的uuid来确认是否其信任的用户已经上传好了。
+//user confirm a file whether uploaded successfully.
 func (this *AlienController) Confirm(writer http.ResponseWriter, request *http.Request) *result.WebResult {
 
 	matterUuid := request.FormValue("matterUuid")
 	if matterUuid == "" {
-		panic("matterUuid必填")
+		panic(result.BadRequest("matterUuid  cannot be null"))
 	}
 
 	user := this.checkUser(request)
 
 	matter := this.matterDao.CheckByUuid(matterUuid)
 	if matter.UserUuid != user.Uuid {
-		panic("文件不属于你")
+		panic(result.BadRequest("matter not belong to you"))
 	}
 
 	return this.Success(matter)
 }
 
-//系统中的用户x 信任的用户上传文件。这个接口需要支持跨域。
+//a guest upload a file with a upload token.
 func (this *AlienController) Upload(writer http.ResponseWriter, request *http.Request) *result.WebResult {
-	//允许跨域请求。
+	//allow cors.
 	this.allowCORS(writer)
 	if request.Method == "OPTIONS" {
-		return this.Success("OK")
+		//nil means empty response body.
+		return nil
 	}
 
 	uploadTokenUuid := request.FormValue("uploadTokenUuid")
-	if uploadTokenUuid == "" {
-		panic("uploadTokenUuid必填")
-	}
-
-	uploadToken := this.uploadTokenDao.FindByUuid(uploadTokenUuid)
-	if uploadToken == nil {
-		panic("uploadTokenUuid无效")
-	}
-
-	if uploadToken.ExpireTime.Before(time.Now()) {
-		panic("uploadToken已失效")
-	}
-
-	user := this.userDao.CheckByUuid(uploadToken.UserUuid)
-
-	err := request.ParseMultipartForm(32 << 20)
-	this.PanicError(err)
-
 	file, handler, err := request.FormFile("file")
 	this.PanicError(err)
 	defer func() {
@@ -248,47 +210,61 @@ func (this *AlienController) Upload(writer http.ResponseWriter, request *http.Re
 		this.PanicError(e)
 	}()
 
+	if uploadTokenUuid == "" {
+		panic(result.BadRequest("uploadTokenUuid cannot be null"))
+	}
+
+	uploadToken := this.uploadTokenDao.CheckByUuid(uploadTokenUuid)
+
+	if uploadToken.ExpireTime.Before(time.Now()) {
+		panic(result.BadRequest("uploadToken has expired"))
+	}
+
+	user := this.userDao.CheckByUuid(uploadToken.UserUuid)
+
+	err = request.ParseMultipartForm(32 << 20)
+	this.PanicError(err)
+
 	if handler.Filename != uploadToken.Filename {
-		panic("文件名称不正确")
+		panic(result.BadRequest("filename doesn't the one in uploadToken"))
 	}
 
 	if handler.Size != uploadToken.Size {
-		panic("文件大小不正确")
+		panic(result.BadRequest("file size doesn't the one in uploadToken"))
 	}
 
 	dirMatter := this.matterDao.CheckWithRootByUuid(uploadToken.FolderUuid, user)
 
-	matter := this.matterService.AtomicUpload(request, file, user, dirMatter, uploadToken.Filename, uploadToken.Privacy)
+	matter := this.matterService.Upload(request, file, user, dirMatter, uploadToken.Filename, uploadToken.Privacy)
 
-	//更新这个uploadToken的信息.
+	//expire the upload token.
 	uploadToken.ExpireTime = time.Now()
 	this.uploadTokenDao.Save(uploadToken)
 
 	return this.Success(matter)
 }
 
-//给一个指定的url，从该url中去拉取文件回来。此处采用uploadToken的模式。
+//crawl a url with uploadToken. guest can visit this method.
 func (this *AlienController) CrawlToken(writer http.ResponseWriter, request *http.Request) *result.WebResult {
-	//允许跨域请求。
+
+	//allow cors.
 	this.allowCORS(writer)
 	if request.Method == "OPTIONS" {
-		return this.Success("OK")
+		//nil means empty response body.
+		return nil
 	}
 
 	uploadTokenUuid := request.FormValue("uploadTokenUuid")
 	url := request.FormValue("url")
 
 	if uploadTokenUuid == "" {
-		panic("uploadTokenUuid必填")
+		panic(result.BadRequest("uploadTokenUuid cannot be null"))
 	}
 
-	uploadToken := this.uploadTokenDao.FindByUuid(uploadTokenUuid)
-	if uploadToken == nil {
-		panic("uploadTokenUuid无效")
-	}
+	uploadToken := this.uploadTokenDao.CheckByUuid(uploadTokenUuid)
 
 	if uploadToken.ExpireTime.Before(time.Now()) {
-		panic("uploadToken已失效")
+		panic(result.BadRequest("uploadToken has expired"))
 	}
 
 	user := this.userDao.CheckByUuid(uploadToken.UserUuid)
@@ -297,89 +273,71 @@ func (this *AlienController) CrawlToken(writer http.ResponseWriter, request *htt
 
 	matter := this.matterService.AtomicCrawl(request, url, uploadToken.Filename, user, dirMatter, uploadToken.Privacy)
 
-	//更新这个uploadToken的信息.
+	//expire the upload token.
 	uploadToken.ExpireTime = time.Now()
 	this.uploadTokenDao.Save(uploadToken)
 
 	return this.Success(matter)
 }
 
-//通过一个url直接上传，无需借助uploadToken.
+//crawl a url directly. only user can visit this method.
 func (this *AlienController) CrawlDirect(writer http.ResponseWriter, request *http.Request) *result.WebResult {
 
-	//文件名。
 	filename := request.FormValue("filename")
-	//文件公有或私有
 	privacyStr := request.FormValue("privacy")
-	//文件夹路径，以 / 开头。
-	dir := request.FormValue("dir")
+	dirPath := request.FormValue("dirPath")
 	url := request.FormValue("url")
 
 	if filename == "" {
-		panic("文件名必填")
+		panic(result.BadRequest("filename cannot be null."))
 	} else if m, _ := regexp.MatchString(MATTER_NAME_PATTERN, filename); m {
 		panic(result.BadRequestI18n(request, i18n.MatterNameContainSpecialChars))
 	}
 
 	var privacy bool
-	if privacyStr == "" {
-		panic(`文件公有性必填`)
-	} else {
-		if privacyStr == TRUE {
-			privacy = true
-		} else if privacyStr == FALSE {
-			privacy = false
-		} else {
-			panic(`文件公有性不符合规范`)
-		}
+	if privacyStr == TRUE {
+		privacy = true
 	}
 
 	user := this.checkUser(request)
-	dirMatter := this.matterService.CreateDirectories(request, user, dir)
+	dirMatter := this.matterService.CreateDirectories(request, user, dirPath)
 
 	matter := this.matterService.AtomicCrawl(request, url, filename, user, dirMatter, privacy)
 
 	return this.Success(matter)
 }
 
-//系统中的用户x要获取一个DownloadToken，用于提供给x信任的用户下载文件。
+//fetch a download token for guest. Guest can download file with this token.
 func (this *AlienController) FetchDownloadToken(writer http.ResponseWriter, request *http.Request) *result.WebResult {
 
 	matterUuid := request.FormValue("matterUuid")
+	expireTimeStr := request.FormValue("expireTime")
+
 	if matterUuid == "" {
-		panic("matterUuid必填")
+		panic(result.BadRequest("matterUuid cannot be null."))
 	}
 
 	user := this.checkUser(request)
 
 	matter := this.matterDao.CheckByUuid(matterUuid)
 	if matter.UserUuid != user.Uuid {
-		panic("文件不属于你")
-	}
-	if matter.Dir {
-		panic("不支持下载文件夹")
+		panic(result.BadRequest("matter not belong to you"))
 	}
 
-	//什么时间后过期，默认24h
-	expireStr := request.FormValue("expire")
-	expire := 24 * 60 * 60
-	if expireStr != "" {
-		var err error
-		expire, err = strconv.Atoi(expireStr)
-		if err != nil {
-			panic(`过期时间不符合规范`)
-		}
-		if expire < 1 {
-			panic(`过期时间不符合规范`)
-		}
-
+	var expireTime time.Time
+	if expireTimeStr == "" {
+		panic(result.BadRequest("time format error"))
+	} else {
+		expireTime = util.ConvertDateTimeStringToTime(expireTimeStr)
+	}
+	if expireTime.Before(time.Now()) {
+		panic(result.BadRequest("expire time cannot before now"))
 	}
 
-	mm, _ := time.ParseDuration(fmt.Sprintf("%ds", expire))
 	downloadToken := &DownloadToken{
 		UserUuid:   user.Uuid,
 		MatterUuid: matterUuid,
-		ExpireTime: time.Now().Add(mm),
+		ExpireTime: expireTime,
 		Ip:         util.GetIpAddress(request),
 	}
 
@@ -389,13 +347,13 @@ func (this *AlienController) FetchDownloadToken(writer http.ResponseWriter, requ
 
 }
 
-//预览一个文件。既可以使用登录的方式，也可以使用授权的方式
+//preview a file.
 func (this *AlienController) Preview(writer http.ResponseWriter, request *http.Request, uuid string, filename string) {
 
 	this.alienService.PreviewOrDownload(writer, request, uuid, filename, false)
 }
 
-//下载一个文件。既可以使用登录的方式，也可以使用授权的方式
+//download a file.
 func (this *AlienController) Download(writer http.ResponseWriter, request *http.Request, uuid string, filename string) {
 
 	this.alienService.PreviewOrDownload(writer, request, uuid, filename, true)