Merge branch 'master' of github.com:gogits/gogs

2 files changed, 16 insertions, 9 deletions

diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index c722f04b..962e1ae1 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -51,6 +51,14 @@ func IsTextFile(data []byte) (string, bool) {
 	return contentType, false
 }
 
+func IsImageFile(data []byte) (string, bool) {
+	contentType := http.DetectContentType(data)
+	if strings.Index(contentType, "image/") != -1 {
+		return contentType, true
+	}
+	return contentType, false
+}
+
 func IsReadmeFile(name string) bool {
 	name = strings.ToLower(name)
 	if len(name) < 6 {
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 6f4fbe83..9ddb90f7 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -412,6 +412,11 @@ func (f StrTo) Int() (int, error) {
 	return int(v), err
 }
 
+func (f StrTo) Int64() (int64, error) {
+	v, err := strconv.ParseInt(f.String(), 10, 64)
+	return int64(v), err
+}
+
 func (f StrTo) String() string {
 	if f.Exist() {
 		return string(f)
@@ -541,16 +546,10 @@ func ActionDesc(act Actioner, avatarLink string) string {
 }
 
 func DiffTypeToStr(diffType int) string {
-	switch diffType {
-	case 1:
-		return "add"
-	case 2:
-		return "modify"
-	case 3:
-		return "del"
-	default:
-		return "unknown"
+	diffTypes := map[int]string{
+		1: "add", 2: "modify", 3: "del",
 	}
+	return diffTypes[diffType]
 }
 
 func DiffLineTypeToStr(diffType int) string {