add leaui_image plugin for replace leanote_image. on a train to ChangSha

app/controllers/AlbumController.go

@@ -0,0 +1,46 @@
+package controllers
+
+import (
+	"github.com/revel/revel"
+//	"encoding/json"
+	"github.com/leanote/leanote/app/info"
+	"labix.org/v2/mgo/bson"
+//	. "github.com/leanote/leanote/app/lea"
+//	"io/ioutil"
+)
+
+type Album struct {
+	BaseController
+}
+
+// all albums by userId
+func (c Album) GetAlbums() revel.Result {
+	re := albumService.GetAlbums(c.GetUserId())
+	return c.RenderJson(re)
+}
+
+func (c Album) DeleteAlbum(albumId string) revel.Result {
+	re, msg := albumService.DeleteAlbum(c.GetUserId(), albumId)
+	return c.RenderJson(info.Re{Ok: re, Msg: msg})
+}
+
+// add album
+func (c Album) AddAlbum(name string) revel.Result {
+	album := info.Album{
+		AlbumId: bson.NewObjectId(),
+		Name: name,
+		Seq: -1,
+		UserId: c.GetObjectUserId()}
+	re := albumService.AddAlbum(album)
+
+	if(re) {
+		return c.RenderJson(album)
+	} else {
+		return c.RenderJson(false)
+	}
+}
+
+// update alnum name
+func (c Album) UpdateAlbum(albumId, name string) revel.Result {
+	return c.RenderJson(albumService.UpdateAlbum(albumId, c.GetUserId(), name))
+}

app/controllers/FileController.go

@@ -7,6 +7,7 @@ import (
 	"github.com/leanote/leanote/app/info"
 	"io/ioutil"
 	"os"
+	"strconv"
 )
 
 // 首页
@@ -20,7 +21,7 @@ func (c File) UploadImage(renderHtml string) revel.Result {
 		renderHtml = "file/image.html"
 	}
 	
-	re := c.uploadImage("");
+	re := c.uploadImage("", "");
 	
 	c.RenderArgs["fileUrlPath"] = siteUrl + re.Id
 	c.RenderArgs["resultCode"] = re.Code
@@ -36,14 +37,22 @@ func (c File) UploadBlogLogo() revel.Result {
 
 // 拖拉上传, pasteImage
 func (c File) UploadImageJson(renderHtml, from string) revel.Result {
-	re := c.uploadImage(from);
+	re := c.uploadImage(from, "");
+	re.Id = siteUrl + re.Id
+//	re.Id = re.Id
+	return c.RenderJson(re)
+}
+
+// leaui image plugin
+func (c File) UploadImageLeaui(albumId string) revel.Result {
+	re := c.uploadImage("", albumId);
 	re.Id = siteUrl + re.Id
 //	re.Id = re.Id
 	return c.RenderJson(re)
 }
 
 // 上传图片, 公用方法
-func (c File) uploadImage(from string) (re info.Re) {
+func (c File) uploadImage(from, albumId string) (re info.Re) {
 	var fileUrlPath = ""
 	var resultCode = 0 // 1表示正常
 	var resultMsg = "内部错误" // 错误信息
@@ -105,11 +114,87 @@ func (c File) uploadImage(from string) (re info.Re) {
 	}
 	// 改变成gif图片
 	_, toPathGif := TransToGif(toPath, 0, true)
-	
-	fileUrlPath += "/" + GetFilename(toPathGif)
+	filename = GetFilename(toPathGif)
+	filesize := GetFilesize(toPathGif)
+	fileUrlPath += "/" + filename
 	resultCode = 1
-	Ok = true
 	resultMsg = "上传成功!"
 	
+	// File
+	fileInfo := info.File{Name: filename,
+		Title: filename,
+		Path: fileUrlPath,
+		Size: filesize}
+		
+	Ok = fileService.AddImage(fileInfo, albumId, c.GetUserId())
+	
+	re.Item = fileInfo
+	
 	return re
+}
+
+// get all images by userId with page
+func (c File) GetImages(albumId, key string, page int) revel.Result {
+	re := fileService.ListImagesWithPage(c.GetUserId(), albumId, key, page, 12)
+	return c.RenderJson(re)
+}
+
+func (c File) UpdateImageTitle(fileId, title string) revel.Result {
+	re := info.NewRe()
+	re.Ok = fileService.UpdateImageTitle(c.GetUserId(), fileId, title)
+	return c.RenderJson(re)
+}
+
+func (c File) DeleteImage(fileId string) revel.Result {
+	re := info.NewRe()
+	re.Ok, re.Msg = fileService.DeleteImage(c.GetUserId(), fileId)
+	return c.RenderJson(re)
+}
+
+// update image uploader to leaui image, 
+// scan all user's images and insert into db
+func (c File) UpgradeLeauiImage() revel.Result {
+	re := info.NewRe()
+	
+	if ok, _ := revel.Config.Bool("upgradeLeauiImage"); !ok {
+		re.Msg = "Not allowed"
+		return c.RenderJson(re)
+	}
+	
+	uploadPath := revel.BasePath + "/public/upload";
+	userIds := ListDir(uploadPath)
+	if userIds == nil {
+		re.Msg = "no user"
+		return c.RenderJson(re)
+	}
+	
+	msg := "";
+	
+	for _, userId := range userIds {
+		dirPath := uploadPath + "/" + userId +  "/images"
+		images := ListDir(dirPath)
+		if images == nil {
+			msg += userId + " no images "
+			continue;
+		}
+		
+		hadImages := fileService.GetAllImageNamesMap(userId)
+		
+		i := 0
+		for _, filename := range images {
+			if _, ok := hadImages[filename]; !ok {
+				fileUrlPath := "/upload/" + userId + "/images/" + filename
+				fileInfo := info.File{Name: filename,
+					Title: filename,
+					Path: fileUrlPath,
+					Size: GetFilesize(dirPath + "/" + filename)}
+				fileService.AddImage(fileInfo, "", userId)
+				i++
+			}
+		}
+		msg += userId + ": " + strconv.Itoa(len(images)) + " -- " + strconv.Itoa(i) + " images "
+	}
+	
+	re.Msg = msg
+	return c.RenderJson(re)
 }

app/controllers/init.go

@@ -23,6 +23,9 @@ var pwdService *service.PwdService
 var tokenService *service.TokenService
 var suggestionService *service.SuggestionService 
 
+var albumService *service.AlbumService 
+var fileService *service.FileService
+
 var pageSize = 1000
 var defaultSortField = "UpdatedTime"
 var leanoteUserId = "52d26b4e99c37b609a000001"