Skip to content

golint fixed for modules/base #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2016
+16 −7
Merged

golint fixed for modules/base #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/base/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

package base

// DocURL api doc url
const DocURL = "https://godoc.org/github.com/go-gitea/go-sdk/gitea"

type (
// TplName template relative path type
TplName string
)
21 changes: 14 additions & 7 deletions modules/base/tool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func EncodeMD5(str string) string {
return hex.EncodeToString(m.Sum(nil))
}

// Encode string to sha1 hex value.
// EncodeSha1 string to sha1 hex value.
func EncodeSha1(str string) string {
h := sha1.New()
h.Write([]byte(str))
Expand All @@ -49,6 +49,7 @@ func ShortSha(sha1 string) string {
return TruncateString(sha1, 10)
}

// DetectEncoding detect the encoding of content
func DetectEncoding(content []byte) (string, error) {
if utf8.Valid(content) {
log.Debug("Detected encoding: utf-8 (fast)")
Expand All @@ -65,6 +66,7 @@ func DetectEncoding(content []byte) (string, error) {
return result.Charset, err
}

// BasicAuthDecode decode basic auth string
func BasicAuthDecode(encoded string) (string, string, error) {
s, err := base64.StdEncoding.DecodeString(encoded)
if err != nil {
Expand All @@ -75,6 +77,7 @@ func BasicAuthDecode(encoded string) (string, string, error) {
return auth[0], auth[1], nil
}

// BasicAuthEncode encode basic auth string
func BasicAuthEncode(username, password string) string {
return base64.StdEncoding.EncodeToString([]byte(username + ":" + password))
}
Expand All @@ -94,7 +97,7 @@ func GetRandomString(n int, alphabets ...byte) string {
return string(bytes)
}

// http://code.google.com/p/go/source/browse/pbkdf2/pbkdf2.go?repo=crypto
// PBKDF2 http://code.google.com/p/go/source/browse/pbkdf2/pbkdf2.go?repo=crypto
// FIXME: use https://godoc.org/golang.org/x/crypto/pbkdf2?
func PBKDF2(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
prf := hmac.New(h, password)
Expand Down Expand Up @@ -133,7 +136,7 @@ func PBKDF2(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte
return dk[:keyLen]
}

// verify time limit code
// VerifyTimeLimitCode verify time limit code
func VerifyTimeLimitCode(data string, minutes int, code string) bool {
if len(code) <= 18 {
return false
Expand All @@ -160,9 +163,10 @@ func VerifyTimeLimitCode(data string, minutes int, code string) bool {
return false
}

// TimeLimitCodeLength default value for time limit code
const TimeLimitCodeLength = 12 + 6 + 40

// create a time limit code
// CreateTimeLimitCode create a time limit code
// code format: 12 length date time string + 6 minutes string + 40 sha1 encoded string
func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string {
format := "200601021504"
Expand Down Expand Up @@ -355,6 +359,7 @@ func timeSince(then time.Time, lang string) string {
}
}

// RawTimeSince retrieves i18n key of time since t
func RawTimeSince(t time.Time, lang string) string {
return timeSince(t, lang)
}
Expand All @@ -364,6 +369,7 @@ func TimeSince(t time.Time, lang string) template.HTML {
return template.HTML(fmt.Sprintf(`<span class="time-since" title="%s">%s</span>`, t.Format(setting.TimeFormat), timeSince(t, lang)))
}

// Storage space size types
const (
Byte = 1
KByte = Byte * 1024
Expand Down Expand Up @@ -413,7 +419,7 @@ func FileSize(s int64) string {
func Subtract(left interface{}, right interface{}) interface{} {
var rleft, rright int64
var fleft, fright float64
var isInt bool = true
var isInt = true
switch left.(type) {
case int:
rleft = int64(left.(int))
Expand Down Expand Up @@ -454,9 +460,8 @@ func Subtract(left interface{}, right interface{}) interface{} {

if isInt {
return rleft - rright
} else {
return fleft + float64(rleft) - (fright + float64(rright))
}
return fleft + float64(rleft) - (fright + float64(rright))
}

// EllipsisString returns a truncated short string,
Expand Down Expand Up @@ -521,10 +526,12 @@ func IsTextFile(data []byte) bool {
return strings.Index(http.DetectContentType(data), "text/") != -1
}

// IsImageFile detectes if data is an image format
func IsImageFile(data []byte) bool {
return strings.Index(http.DetectContentType(data), "image/") != -1
}

// IsPDFFile detectes if data is a pdf format
func IsPDFFile(data []byte) bool {
return strings.Index(http.DetectContentType(data), "application/pdf") != -1
}