From d4a139c09afa5fc0bcdcd1276cf0d2121dbdd226 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Wed, 16 Dec 2015 16:48:34 -0500
Subject: Added additional information to getFileInfo api call

---
 model/file_info.go | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 model/file_info.go

(limited to 'model/file_info.go')

diff --git a/model/file_info.go b/model/file_info.go
new file mode 100644
index 000000000..d96723f32
--- /dev/null
+++ b/model/file_info.go
@@ -0,0 +1,60 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"bytes"
+	"encoding/json"
+	"image/gif"
+	"mime"
+	"path/filepath"
+)
+
+type FileInfo struct {
+	Filename        string `json:"filename"`
+	Size            int    `json:"size"`
+	Extension       string `json:"extension"`
+	MimeType        string `json:"mime_type"`
+	HasPreviewImage bool   `json:"has_preview_image"`
+}
+
+func GetInfoForBytes(filename string, data []byte) (*FileInfo, *AppError) {
+	size := len(data)
+
+	var mimeType string
+	extension := filepath.Ext(filename)
+	isImage := IsFileExtImage(extension)
+	if isImage {
+		mimeType = GetImageMimeType(extension)
+	} else {
+		mimeType = mime.TypeByExtension(extension)
+	}
+
+	hasPreviewImage := isImage
+	if mimeType == "image/gif" {
+		// just show the gif itself instead of a preview image for animated gifs
+		if gifImage, err := gif.DecodeAll(bytes.NewReader(data)); err != nil {
+			return nil, NewAppError("GetInfoForBytes", "Could not decode gif.", "filename="+filename)
+		} else {
+			hasPreviewImage = len(gifImage.Image) == 1
+		}
+	}
+
+	return &FileInfo{
+		Filename:        filename,
+		Size:            size,
+		Extension:       extension[1:],
+		MimeType:        mimeType,
+		HasPreviewImage: hasPreviewImage,
+	}, nil
+}
+
+func (info *FileInfo) ToJson() string {
+	b, err := json.Marshal(info)
+	if err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
+}
-- 
cgit v1.2.3-1-g7c22


From cfdc5ab9998a86a8b540d8f5d5a7b429e919e4d6 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Fri, 18 Dec 2015 19:02:48 -0500
Subject: Fixed TestGetFile unit test

---
 model/file_info.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'model/file_info.go')

diff --git a/model/file_info.go b/model/file_info.go
index d96723f32..741b4e55d 100644
--- a/model/file_info.go
+++ b/model/file_info.go
@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"image/gif"
+	"io"
 	"mime"
 	"path/filepath"
 )
@@ -58,3 +59,14 @@ func (info *FileInfo) ToJson() string {
 		return string(b)
 	}
 }
+
+func FileInfoFromJson(data io.Reader) *FileInfo {
+	decoder := json.NewDecoder(data)
+
+	var info FileInfo
+	if err := decoder.Decode(&info); err != nil {
+		return nil
+	} else {
+		return &info
+	}
+}
-- 
cgit v1.2.3-1-g7c22