name change of avatar

diff --git a/modules/avatar/avatar.go b/modules/avatar/avatar.go
index 449c9656dcc0944d9688e99e69b925113b2b9ce3..06e2c1385bc728b7ca1c47d1d768bc81b7289355 100644 (file)
--- a/modules/avatar/avatar.go
+++ b/modules/avatar/avatar.go
@@ -9,7 +9,7 @@ It is recommend to use this way
 
        cacheDir := "./cache"
        defaultImg := "./default.jpg"
-       http.Handle("/avatar/", avatar.HttpHandler(cacheDir, defaultImg))
+       http.Handle("/avatar/", avatar.CacheServer(cacheDir, defaultImg))
 */
 package avatar
 
@@ -135,12 +135,12 @@ func (this *Avatar) UpdateTimeout(timeout time.Duration) error {
        return err
 }
 
-type avatarHandler struct {
+type service struct {
        cacheDir string
        altImage string
 }
 
-func (this *avatarHandler) mustInt(r *http.Request, defaultValue int, keys ...string) int {
+func (this *service) mustInt(r *http.Request, defaultValue int, keys ...string) int {
        var v int
        for _, k := range keys {
                if _, err := fmt.Sscanf(r.FormValue(k), "%d", &v); err == nil {
@@ -150,7 +150,7 @@ func (this *avatarHandler) mustInt(r *http.Request, defaultValue int, keys ...st
        return defaultValue
 }
 
-func (this *avatarHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (this *service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
        urlPath := r.URL.Path
        hash := urlPath[strings.LastIndex(urlPath, "/")+1:]
        size := this.mustInt(r, 80, "s", "size") // default size = 80*80
@@ -183,9 +183,9 @@ func (this *avatarHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
        }
 }
 
-// http.Handle("/avatar/", avatar.HttpHandler("./cache"))
-func HttpHandler(cacheDir string, defaultImgPath string) http.Handler {
-       return &avatarHandler{
+// http.Handle("/avatar/", avatar.CacheServer("./cache"))
+func CacheServer(cacheDir string, defaultImgPath string) http.Handler {
+       return &service{
                cacheDir: cacheDir,
                altImage: defaultImgPath,
        }

diff --git a/modules/avatar/avatar_test.go b/modules/avatar/avatar_test.go
index 4656d6f0f40b68f9ab640dac4b6a258cd5fe6697..0cbf70fe60230bb7bb9aabc4adf904cfce1c6a76 100644 (file)
--- a/modules/avatar/avatar_test.go
+++ b/modules/avatar/avatar_test.go
@@ -51,7 +51,7 @@ func TestFetchMany(t *testing.T) {
 // wget http://www.artsjournal.com/artfulmanager/wp/wp-content/uploads/2013/12/200x200xmirror_cat.jpg.pagespeed.ic.GOZSv6v1_H.jpg -O default.jpg
 /*
 func TestHttp(t *testing.T) {
-       http.Handle("/", avatar.HttpHandler("./", "default.jpg"))
+       http.Handle("/", avatar.CacheServer("./", "default.jpg"))
        http.ListenAndServe(":8001", nil)
 }
 */

diff --git a/web.go b/web.go
index 9b7b21639a9b5c3f4e3659894739e2f0de7e4c6c..9423c3eecb63fb298794a9f5bca97d6b07435ed7 100644 (file)
--- a/web.go
+++ b/web.go
@@ -96,8 +96,8 @@ func runWeb(*cli.Context) {
        m.Get("/stars", reqSignIn, user.Stars)
        m.Get("/help", routers.Help)
 
-       avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar_default.jpg")
-       m.Get("/avatar/:hash", avatarCache.ServeHTTP)
+       avt := avatar.CacheServer("public/img/avatar/", "public/img/avatar_default.jpg")
+       m.Get("/avatar/:hash", avt.ServeHTTP)
 
        m.Group("/user", func(r martini.Router) {
                r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)