Merge pull request #56 from minotar/develop

Merge in Minotar 1.0

Author: clone1018

.travis.yml

@@ -1,5 +1,5 @@
 language: go
+
 go:
-  - 1.0
   - 1.1
   - tip

README.md

@@ -46,14 +46,7 @@ Need Steve? Use "char" as the username:
 `<img src="https://minotar.net/skin/char">`
 
 ## How to install?
-1. Setup your GOPATH properly.
-2. go get github.com/Axxim/Minotar/minotard
-3. cp -Rf $GOPATH/src/github.com/Axxim/Minotar/minotard/static $GOPATH/bin
-4. cd $GOPATH/bin; ./minotard
-
-and it'll be listening on port 9999 on all interfaces.
-
-You'll then need to either edit the source to listen on the port you want, or use something like nginx as a reverse proxy.
+- Coming Soon -
 
 ## Understanding Headers
 We use a couple of headers to help in understanding how something is served, here they are:
@@ -74,4 +67,4 @@ x-timing:
 - example: 48+0+4=52
 
 ## Thanks
-Big thanks to [lukegb](https://github.com/lukegb) for porting this script from PHP to Go! 
+Big thanks to [lukegb](https://github.com/lukegb) for porting the old version of this script from PHP to Go.

doc.go

@@ -0,0 +1,6 @@
+// minotar project doc.go
+
+/*
+minotar document
+*/
+package main

examples/fetchandtest.go

@@ -1,11 +1,9 @@
 package main
 
-////// THIS CODE IS RELEASED INTO THE PUBLIC DOMAIN. SEE "UNLICENSE" FOR MORE INFORMATION. http://unlicense.org //////
-
 import (
 	"fmt"
-	"github.com/Axxim/Minotar"
 	"github.com/gorilla/mux"
+	"github.com/minotar/minecraft"
 	"image"
 	"io"
 	"log"
@@ -18,21 +16,22 @@ import (
 )
 
 const (
-	DEFAULT_SIZE = uint(180)
-	MAX_SIZE     = uint(300)
-	MIN_SIZE     = uint(8)
+	DefaultSize = uint(180)
+	MaxSize     = uint(300)
+	MinSize     = uint(8)
 
-	STATIC_LOCATION = "static"
+	StaticLocation = "www"
+	SkinCache
 
-	LISTEN_ON = ":9999"
+	ListenOn = ":9999"
 
-	MINUTES              uint = 60
-	HOURS                     = 60 * MINUTES
-	DAYS                      = 24 * HOURS
-	TIMEOUT_ACTUAL_SKIN       = 2 * DAYS
-	TIMEOUT_FAILED_FETCH      = 15 * MINUTES
+	Minutes            uint = 60
+	Hours                   = 60 * Minutes
+	Days                    = 24 * Hours
+	TimeoutActualSkin       = 2 * Days
+	TimeoutFailedFetch      = 15 * Minutes
 
-	SERVICE_VERSION = "0.3"
+	MinotarVersion = "1.0"
 )
 
 func serveStatic(w http.ResponseWriter, r *http.Request, inpath string) error {
@@ -43,7 +42,7 @@ func serveStatic(w http.ResponseWriter, r *http.Request, inpath string) error {
 		inpath = "/" + inpath
 		r.URL.Path = inpath
 	}
-	path := STATIC_LOCATION + inpath
+	path := StaticLocation + inpath
 
 	f, err := os.Open(path)
 	if err != nil {
@@ -102,11 +101,11 @@ func rationalizeSize(inp string) uint {
 	out64, err := strconv.ParseUint(inp, 10, 0)
 	out := uint(out64)
 	if err != nil {
-		return DEFAULT_SIZE
-	} else if out > MAX_SIZE {
-		return MAX_SIZE
-	} else if out < MIN_SIZE {
-		return MIN_SIZE
+		return DefaultSize
+	} else if out > MaxSize {
+		return MaxSize
+	} else if out < MinSize {
+		return MinSize
 	}
 	return out
 }
@@ -124,7 +123,7 @@ func timeBetween(timeA time.Time, timeB time.Time) int64 {
 	return timeB.Sub(timeA).Nanoseconds() / 1000000
 }
 
-func fetchImageProcessThen(callback func(minotar.Skin) (image.Image, error)) func(w http.ResponseWriter, r *http.Request) {
+func fetchImageProcessThen(callback func(minecraft.Skin) (image.Image, error)) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		timeReqStart := time.Now()
 
@@ -134,22 +133,25 @@ func fetchImageProcessThen(callback func(minotar.Skin) (image.Image, error)) fun
 		size := rationalizeSize(vars["size"])
 		ok := true
 
-		var skin minotar.Skin
+		var skin minecraft.Skin
 		var err error
-		if username == "char" {
-			if skin, err = minotar.FetchSkinForSteve(); err != nil {
-				serverErrorPage(w, r)
-				return
-			}
-		} else {
-			if skin, err = minotar.FetchSkinForUser(username); err != nil {
-				ok = false
-				if skin, err = minotar.FetchSkinForSteve(); err != nil {
-					serverErrorPage(w, r)
-					return
-				}
+
+		// Fetch image using username
+		skin, err = minecraft.GetSkin(minecraft.User{Name: username})
+		if err != nil {
+			// Problem with the returned image, probably means we have an incorrect username
+			// Hit the accounts api
+			user, err := minecraft.GetUser(username)
+
+			if err != nil {
+				// There's no account for this person, serve char
+				skin, _ = minecraft.GetSkin(minecraft.User{Name: "char"})
+			} else {
+				// Get valid skin
+				skin, _ = minecraft.GetSkin(user)
 			}
 		}
+
 		timeFetch := time.Now()
 
 		img, err := callback(skin)
@@ -159,41 +161,52 @@ func fetchImageProcessThen(callback func(minotar.Skin) (image.Image, error)) fun
 		}
 		timeProcess := time.Now()
 
-		imgResized := minotar.Resize(size, size, img)
+		imgResized := Resize(size, size, img)
 		timeResize := time.Now()
 
 		w.Header().Add("Content-Type", "image/png")
 		w.Header().Add("X-Requested", "processed")
 		var timeout uint
 		if ok {
 			w.Header().Add("X-Result", "ok")
-			timeout = TIMEOUT_ACTUAL_SKIN
+			timeout = TimeoutActualSkin
 		} else {
 			w.Header().Add("X-Result", "failed")
-			timeout = TIMEOUT_FAILED_FETCH
+			timeout = TimeoutFailedFetch
 		}
-		w.Header().Add("X-Timing", fmt.Sprintf("%d+%d+%d=%d", timeBetween(timeReqStart, timeFetch), timeBetween(timeFetch, timeProcess), timeBetween(timeProcess, timeResize), timeBetween(timeReqStart, timeResize)))
+		w.Header().Add("X-Timing", fmt.Sprintf("%d+%d+%d=%dms", timeBetween(timeReqStart, timeFetch), timeBetween(timeFetch, timeProcess), timeBetween(timeProcess, timeResize), timeBetween(timeReqStart, timeResize)))
 		addCacheTimeoutHeader(w, timeout)
-		minotar.WritePNG(w, imgResized)
+		WritePNG(w, imgResized)
 	}
 }
 func skinPage(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 
 	username := vars["username"]
 
-	userSkinURL := minotar.URLForUser(username)
-	resp, err := http.Get(userSkinURL)
-	if err != nil {
-		notFoundPage(w, r)
-		return
-	}
+	user, _ := minecraft.GetUser(username)
+	skin, _ := minecraft.GetSkin(user)
+
 	w.Header().Add("Content-Type", "image/png")
 	w.Header().Add("X-Requested", "skin")
 	w.Header().Add("X-Result", "ok")
-	addCacheTimeoutHeader(w, TIMEOUT_ACTUAL_SKIN)
-	defer resp.Body.Close()
-	io.Copy(w, resp.Body)
+
+	WritePNG(w, skin.Image)
+
+	/*
+		userSkinURL := minotar.URLForUser(username)
+		resp, err := http.Get(userSkinURL)
+		if err != nil {
+			notFoundPage(w, r)
+			return
+		}
+		w.Header().Add("Content-Type", "image/png")
+		w.Header().Add("X-Requested", "skin")
+		w.Header().Add("X-Result", "ok")
+		addCacheTimeoutHeader(w, TIMEOUT_ACTUAL_SKIN)
+		defer resp.Body.Close()
+		io.Copy(w, resp.Body)
+	*/
 }
 func downloadPage(w http.ResponseWriter, r *http.Request) {
 	headers := w.Header()
@@ -202,33 +215,33 @@ func downloadPage(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-	avatarPage := fetchImageProcessThen(func(skin minotar.Skin) (image.Image, error) {
-		return skin.Head()
+	avatarPage := fetchImageProcessThen(func(skin minecraft.Skin) (image.Image, error) {
+		return GetHead(skin)
 	})
-	helmPage := fetchImageProcessThen(func(skin minotar.Skin) (image.Image, error) {
-		return skin.Helm()
+	helmPage := fetchImageProcessThen(func(skin minecraft.Skin) (image.Image, error) {
+		return GetHelm(skin)
 	})
 
 	r := mux.NewRouter()
 	r.NotFoundHandler = NotFoundHandler{}
 
-	r.HandleFunc("/avatar/{username:"+minotar.VALID_USERNAME_REGEX+"}{extension:(.png)?}", avatarPage)
-	r.HandleFunc("/avatar/{username:"+minotar.VALID_USERNAME_REGEX+"}/{size:[0-9]+}{extension:(.png)?}", avatarPage)
+	r.HandleFunc("/avatar/{username:"+minecraft.ValidUsernameRegex+"}{extension:(.png)?}", avatarPage)
+	r.HandleFunc("/avatar/{username:"+minecraft.ValidUsernameRegex+"}/{size:[0-9]+}{extension:(.png)?}", avatarPage)
 
-	r.HandleFunc("/helm/{username:"+minotar.VALID_USERNAME_REGEX+"}{extension:(.png)?}", helmPage)
-	r.HandleFunc("/helm/{username:"+minotar.VALID_USERNAME_REGEX+"}/{size:[0-9]+}{extension:(.png)?}", helmPage)
+	r.HandleFunc("/helm/{username:"+minecraft.ValidUsernameRegex+"}{extension:(.png)?}", helmPage)
+	r.HandleFunc("/helm/{username:"+minecraft.ValidUsernameRegex+"}/{size:[0-9]+}{extension:(.png)?}", helmPage)
 
-	r.HandleFunc("/download/{username:"+minotar.VALID_USERNAME_REGEX+"}{extension:(.png)?}", downloadPage)
+	r.HandleFunc("/download/{username:"+minecraft.ValidUsernameRegex+"}{extension:(.png)?}", downloadPage)
 
-	r.HandleFunc("/skin/{username:"+minotar.VALID_USERNAME_REGEX+"}{extension:(.png)?}", skinPage)
+	r.HandleFunc("/skin/{username:"+minecraft.ValidUsernameRegex+"}{extension:(.png)?}", skinPage)
 
 	r.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "%s", SERVICE_VERSION)
+		fmt.Fprintf(w, "%s", MinotarVersion)
 	})
 
 	r.HandleFunc("/", indexPage)
 
 	http.Handle("/", r)
 	http.HandleFunc("/assets/", serveAssetPage)
-	log.Fatalln(http.ListenAndServe(LISTEN_ON, nil))
+	log.Fatalln(http.ListenAndServe(ListenOn, nil))
 }