Merge pull request #1755 from hmhealey/plt1108

PLT-1108 Refactored ViewImage modal and made it automatically play animated gifs

2 files changed, 13 insertions, 30 deletions

diff --git a/api/file.go b/api/file.go
index 4339e610b..d31abfb1d 100644
--- a/api/file.go
+++ b/api/file.go
@@ -23,7 +23,6 @@ import (
 	"image/jpeg"
 	"io"
 	"io/ioutil"
-	"mime"
 	"net/http"
 	"net/url"
 	"os"
@@ -323,25 +322,22 @@ func getFileInfo(c *Context, w http.ResponseWriter, r *http.Request) {
 	cchan := Srv.Store.Channel().CheckPermissionsTo(c.Session.TeamId, channelId, c.Session.UserId)
 
 	path := "teams/" + c.Session.TeamId + "/channels/" + channelId + "/users/" + userId + "/" + filename
-	size := ""
+	var info *model.FileInfo
 
-	if s, ok := fileInfoCache.Get(path); ok {
-		size = s.(string)
+	if cached, ok := fileInfoCache.Get(path); ok {
+		info = cached.(*model.FileInfo)
 	} else {
-
 		fileData := make(chan []byte)
 		getFileAndForget(path, fileData)
 
-		f := <-fileData
-
-		if f == nil {
-			c.Err = model.NewAppError("getFileInfo", "Could not find file.", "path="+path)
-			c.Err.StatusCode = http.StatusNotFound
+		newInfo, err := model.GetInfoForBytes(filename, <-fileData)
+		if err != nil {
+			c.Err = err
 			return
+		} else {
+			fileInfoCache.Add(path, newInfo)
+			info = newInfo
 		}
-
-		size = strconv.Itoa(len(f))
-		fileInfoCache.Add(path, size)
 	}
 
 	if !c.HasPermissionsToChannel(cchan, "getFileInfo") {
@@ -350,19 +346,7 @@ func getFileInfo(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Cache-Control", "max-age=2592000, public")
 
-	var mimeType string
-	ext := filepath.Ext(filename)
-	if model.IsFileExtImage(ext) {
-		mimeType = model.GetImageMimeType(ext)
-	} else {
-		mimeType = mime.TypeByExtension(ext)
-	}
-
-	result := make(map[string]string)
-	result["filename"] = filename
-	result["size"] = size
-	result["mime"] = mimeType
-	w.Write([]byte(model.MapToJson(result)))
+	w.Write([]byte(info.ToJson()))
 }
 
 func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/api/file_test.go b/api/file_test.go
index b5501e4bd..b3fbd2a27 100644
--- a/api/file_test.go
+++ b/api/file_test.go
@@ -152,7 +152,6 @@ func TestGetFile(t *testing.T) {
 	channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel)
 
 	if utils.Cfg.FileSettings.DriverName != "" {
-
 		body := &bytes.Buffer{}
 		writer := multipart.NewWriter(body)
 		part, err := writer.CreateFormFile("files", "test.png")
@@ -204,9 +203,9 @@ func TestGetFile(t *testing.T) {
 		if resp, downErr := Client.GetFileInfo(filenames[0]); downErr != nil {
 			t.Fatal(downErr)
 		} else {
-			m := resp.Data.(map[string]string)
-			if len(m["size"]) == 0 {
-				t.Fail()
+			info := resp.Data.(*model.FileInfo)
+			if info.Size == 0 {
+				t.Fatal("No file size returned")
 			}
 		}