clean code: github.go

doc/github.go

@@ -5,17 +5,16 @@
 package doc
 
 import (
-	/*"archive/zip"
+	"archive/zip"
 	"bytes"
-	"fmt"
-	"io"*/
+	"io"
 	"net/http"
-	/*"os"
-	"path"*/
+	"os"
+	"path"
 	"regexp"
-	//"strings"
+	"strings"
 
-	//"github.com/GPMGo/gpm/utils"
+	"github.com/GPMGo/gpm/utils"
 )
 
 var (
@@ -33,23 +32,27 @@ func GetGithubDoc(client *http.Client, match map[string]string, commit string) (
 	SetGithubCredentials("1862bcb265171f37f36c", "308d71ab53ccd858416cfceaed52d5d5b7d53c5f")
 	match["cred"] = githubCred
 
-	/*
+	// JSON struct for github.com.
 	var refs []*struct {
+		Ref    string
+		Url    string
 		Object struct {
-				Type string
 			Sha  string
+			Type string
 			Url  string
 		}
-			Ref string
-			Url string
 	}
 
-		// Check if has specific commit.
-		if len(commit) == 0 {
+	// bundle and snapshot will have commit 'B' and 'S',
+	// but does not need to download dependencies.
+	isCheckImport := len(commit) == 0
+
+	// Check if download with specific revision.
+	if isCheckImport || len(commit) == 1 {
 		// Get up-to-date version.
 		err := httpGetJSON(client, expand("https://api.github.com/repos/{owner}/{repo}/git/refs?{cred}", match), &refs)
 		if err != nil {
-				return nil, err
+			return nil, nil, err
 		}
 
 		tags := make(map[string]string)
@@ -65,34 +68,39 @@ func GetGithubDoc(client *http.Client, match map[string]string, commit string) (
 		// Check revision tag.
 		match["tag"], commit, err = bestTag(tags, "master")
 		if err != nil {
-				return nil, err
+			return nil, nil, err
 		}
 	}
 
+	// We use .zip here.
+	// zip : https://github.com/{owner}/{repo}/archive/{sha}.zip
+	// tarball : https://github.com/{owner}/{repo}/tarball/{sha}
+
 	match["sha"] = commit
-		// Download zip.
+	// Downlaod archive.
 	p, err := httpGetBytes(client, expand("https://github.com/{owner}/{repo}/archive/{sha}.zip", match), nil)
 	if err != nil {
-			return nil, err
+		return nil, nil, err
 	}
 
 	r, err := zip.NewReader(bytes.NewReader(p), int64(len(p)))
 	if err != nil {
-			return nil, err
+		return nil, nil, err
 	}
-		//defer r.Close()
 
 	shaName := expand("{repo}-{sha}", match)
 	paths := utils.GetGOPATH()
 	importPath := "github.com/" + expand("{owner}/{repo}", match)
 	installPath := paths[0] + "/src/" + importPath
-		// Create destination directory
+
+	// Remove old files.
+	os.RemoveAll(installPath)
+	// Create destination directory.
 	os.Mkdir(installPath, os.ModePerm)
 
 	dirs := make([]string, 0, 5)
 	for _, f := range r.File {
 		absPath := strings.Replace(f.FileInfo().Name(), shaName, installPath, 1)
-			fmt.Printf("Unzipping %s...", absPath)
 
 		// Check if it is directory or not.
 		if strings.HasSuffix(absPath, "/") {
@@ -101,10 +109,10 @@ func GetGithubDoc(client *http.Client, match map[string]string, commit string) (
 			continue
 		}
 
-			// Get files from archive
+		// Get files from archive.
 		rc, err := f.Open()
 		if err != nil {
-				return nil, err
+			return nil, nil, err
 		}
 
 		// Create diretory before create file
@@ -112,14 +120,13 @@ func GetGithubDoc(client *http.Client, match map[string]string, commit string) (
 		// Write data to file
 		fw, _ := os.Create(absPath)
 		if err != nil {
-				return nil, err
+			return nil, nil, err
 		}
 
-			n, err := io.Copy(fw, rc)
+		_, err = io.Copy(fw, rc)
 		if err != nil {
-				return nil, err
+			return nil, nil, err
 		}
-			fmt.Println(n)
 
 		/*localF, _ := os.Open(absPath)
 		fbytes := make([]byte, f.FileInfo().Size())
@@ -132,9 +139,15 @@ func GetGithubDoc(client *http.Client, match map[string]string, commit string) (
 				data: fbytes,
 			})
 		}*/
-	/*	}
+	}
 
-		pkg := &Package{
+	// Check if need to check imports.
+	if isCheckImport {
+
+	} else {
+
+	}
+	/*pkg := &Package{
 		ImportPath: importPath,
 		AbsPath:    installPath,
 		Commit:     commit,