feat: new structure

Author: KevinZonda

.circleci/config.yml

@@ -5,7 +5,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.16
+      - image: circleci/golang:1.18
     working_directory: /go/src/github.com/fastgitorg/fgit-go
     environment:
       CGO_ENABLED: "0"

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.18
 
     - name: Build AMD64
       run: |

go.mod src/go.modgo.mod renamed to src/go.mod

@@ -1,3 +1,3 @@
 module fgit-go
 
-go 1.16
+go 1.19

src/jsdget.go

@@ -1,12 +1,19 @@
 package main
 
 import (
+	"fgit-go/oper"
+	"fgit-go/shared"
 	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 )
 
+var (
+	timestamp = "unknown"
+	version   = "unknown"
+)
+
 func showVersion() {
 	fmt.Println("Version:", version)
 	fmt.Println("Build Time:", timestamp)
@@ -15,49 +22,47 @@ func showVersion() {
 
 func main() {
 	if len(os.Args) == 1 || (len(os.Args) == 2 && (os.Args[1] == "--help" || os.Args[1] == "-h")) {
-		fmt.Println(mainHelpMsg)
+		fmt.Println(shared.MainHelpMsg)
 		os.Exit(0)
 	}
 
 	isConvertToFastGit := false
 
 	switch strings.ToLower(os.Args[1]) {
 	case "debug":
-		runByArgs(&DebugFunc{})
+		runByArgs(&oper.DebugFunc{})
 
 	case "get", "dl", "download":
-		runByArgs(&GetFunc{})
-
-	case "jdl", "jsdget", "jsd":
-		runByArgs(&JsdFunc{})
+		runByArgs(&oper.GetFunc{})
 
 	case "conv", "convert":
-		runByArgs(&ConvFunc{})
+		runByArgs(&oper.ConvFunc{})
 
 	case "-v", "--version", "version":
 		showVersion()
 	}
 
 	if os.Args[2] == "push" || os.Args[2] == "pull" {
-		isConvertToFastGit = convToFastGit()
+		isConvertToFastGit = oper.ConvToFastGit()
 	}
 
 	cmd := exec.Command("git")
 
 	// Combine to new command
 	for i := range os.Args[1:] {
-		cmd.Args = append(cmd.Args, strings.Replace(os.Args[i], "https://github.com", "https://hub.fastgit.org", -1))
+		cmd.Args = append(cmd.Args,
+			strings.Replace(os.Args[i], "https://github.com", shared.GitMirror, -1))
 	}
 
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
 
 	err := cmd.Start()
-	checkErr(err, "Command Start Failed!", 4)
+	shared.CheckErr(err, "Command Start Failed!", 4)
 
 	cmd.Wait()
 	if isConvertToFastGit {
-		convToGitHub()
+		oper.ConvToGitHub()
 	}
 }
 

src/main.go

@@ -1,6 +1,7 @@
-package main
+package oper
 
 import (
+	"fgit-go/shared"
 	"fmt"
 	"os"
 	"os/exec"
@@ -21,22 +22,22 @@ func (c *ConvFunc) Run(args []string) {
 	}
 	os.Exit(0)
 }
-func convToFastGit() bool {
-	return convHelper("https://github.com", gitMirror)
+func ConvToFastGit() bool {
+	return convHelper("https://github.com", shared.GitMirror)
 }
 
-func convToGitHub() bool {
-	return convHelper(gitMirror, "https://github.com")
+func ConvToGitHub() bool {
+	return convHelper(shared.GitMirror, "https://github.com")
 }
 
 func conv(target string) {
 	switch target {
 	case "gh", "github":
-		convToGitHub()
+		ConvToGitHub()
 	case "fg", "fastgit":
-		convToFastGit()
+		ConvToFastGit()
 	case "-h", "--help":
-		fmt.Println(convHelpMsg)
+		fmt.Println(shared.ConvHelpMsg)
 	default:
 		fmt.Println("Invalid args for conv. Use --help to get more information.")
 	}
@@ -47,7 +48,7 @@ func convHelper(oldPrefixValue, newPrefixValue string) bool {
 	buf, err := cmd.Output()
 	sBuf := string(buf)
 	originUrl := ""
-	checkErr(err, "Convert failed.", 8)
+	shared.CheckErr(err, "Convert failed.", 8)
 	tmp := strings.Split(
 		strings.Replace(
 			strings.Replace(sBuf, "\t", " ", -1),
@@ -66,6 +67,6 @@ func convHelper(oldPrefixValue, newPrefixValue string) bool {
 	fmt.Println(originUrl)
 	cmd = exec.Command("git", "remote", "set-url", "origin", strings.Replace(originUrl, oldPrefixValue, newPrefixValue, 1))
 	_, err = cmd.Output()
-	checkErr(err, "Convert failed.", 8)
+	shared.CheckErr(err, "Convert failed.", 8)
 	return true
 }

src/conv.go src/oper/conv.gosrc/conv.go renamed to src/oper/conv.go

@@ -1,6 +1,7 @@
-package main
+package oper
 
 import (
+	"fgit-go/shared"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -57,7 +58,7 @@ func debug(url string) bool {
 		fmt.Println("Remote Address:", url)
 		fmt.Print("IP Address: ")
 
-		addr, err := net.LookupIP(removeHttpAndHttps(url))
+		addr, err := net.LookupIP(shared.RemoveHttpAndHttps(url))
 
 		if err != nil {
 			fmt.Println("Unknown")
@@ -80,7 +81,7 @@ func debug(url string) bool {
 		}
 		return debugConnection(url)
 	} else {
-		fmt.Println(debugHelpMsg)
+		fmt.Println(shared.DebugHelpMsg)
 		return true
 	}
 }

src/debug.go src/oper/debug.gosrc/debug.go renamed to src/oper/debug.go

@@ -1,6 +1,7 @@
-package main
+package oper
 
 import (
+	"fgit-go/shared"
 	"fmt"
 	"os"
 	"path"
@@ -24,7 +25,7 @@ func (g *GetFunc) Run(args []string) {
 
 func get(url, fpath string) {
 	if url == "" || url == "--help" || url == "-h" {
-		fmt.Println(getHelpMsg)
+		fmt.Println(shared.GetHelpMsg)
 	} else {
 		getFile(url, fpath)
 	}
@@ -34,13 +35,13 @@ func getFile(url, fpath string) {
 	urlSplit := strings.Split(url, "/")
 	filename := urlSplit[len(urlSplit)-1]
 	if fpath == "" {
-		downloadFile(url, filename)
+		shared.DownloadFile(url, filename)
 	}
 
-	if isExists(fpath) {
-		if isDir(fpath) {
+	if shared.IsExists(fpath) {
+		if shared.IsDir(fpath) {
 			fpath = path.Join(fpath, filename)
-			downloadFile(url, fpath)
+			shared.DownloadFile(url, fpath)
 		} else {
 			isContinue := ' '
 			fmt.Print(
@@ -68,14 +69,14 @@ func getFile(url, fpath string) {
 
 	fmt.Println("Redirect ->", url)
 
-	newURL := strings.Replace(url, "https://github.com", downloadMirror, -1)
+	newURL := strings.Replace(url, "https://github.com", shared.DownloadMirror, -1)
 	if newURL != url {
 		fmt.Println("Redirect ->", newURL)
 	}
 	fmt.Println("File ->", fpath)
 	fmt.Println("Downloading...")
 
-	downloadFile(newURL, fpath)
+	shared.DownloadFile(newURL, fpath)
 
 	fmt.Println("Finished.")
 }
@@ -84,15 +85,15 @@ func parseToGetUrl(url string) string {
 	if !strings.HasPrefix(url, "https://github.com/") {
 		return url
 	}
-	query := replacePrefix(url, "https://github.com/", "")
+	query := shared.ReplacePrefix(url, "https://github.com/", "")
 
 	querySplit := strings.Split(query, "/")
 
 	if len(querySplit) > 3 {
 		// Source -> fastgitorg/fgit-go/blob/master/fgit.go
 		// Target -> fastgitorg/fgit-go/master/fgit.go
 		if querySplit[2] == "blob" {
-			url = rawMirror
+			url = shared.RawMirror
 			for _i, _s := range querySplit {
 				if _i != 2 {
 					url += "/" + _s

src/get.go src/oper/get.gosrc/get.go renamed to src/oper/get.go

@@ -1,7 +1,7 @@
-package main
+package shared
 
 const (
-	mainHelpMsg = "FastGit Command Line Tool\n" +
+	MainHelpMsg = "FastGit Command Line Tool\n" +
 		"=========================\n" +
 		"REMARKS\n" +
 		"    We will convert GitHub to FastGit automatically\n" +
@@ -13,20 +13,7 @@ const (
 		"    fgit conv [Target<string>] [--help|-h]\n" +
 		"    fgit jsdget [URL<string>] [Path<string>]\n" +
 		"    If you want to known more about extra-syntax, try to use --help"
-	jsdHelpMsg = "FastGit JsdGet Command Line Tool\n" +
-		"=============================\n" +
-		"REMARKS\n" +
-		"    Download with jsDelivr automatically\n" +
-		"SYNTAX\n" +
-		"    fgit jsdget [--help|-h]\n" +
-		"    fgit jsdget [URL<string>]\n" +
-		"    fgit jsdget [URL<string>] [Path<string>]\n" +
-		"ALIASES\n" +
-		"    fgit jdl\n" +
-		"    fgit jdl\n" +
-		"EXAMPLE\n" +
-		"    fgit jsdget https://github.com/fastgitorg/fgit-go/archive/master.zip"
-	getHelpMsg = "FastGit Get Command Line Tool\n" +
+	GetHelpMsg = "FastGit Get Command Line Tool\n" +
 		"=============================\n" +
 		"REMARKS\n" +
 		"    Download with FastGit automatically\n" +
@@ -39,7 +26,7 @@ const (
 		"    fgit download\n" +
 		"EXAMPLE\n" +
 		"    fgit get https://github.com/fastgitorg/fgit-go/archive/master.zip"
-	debugHelpMsg = "FastGit Debug Command Line Tool\n" +
+	DebugHelpMsg = "FastGit Debug Command Line Tool\n" +
 		"===============================\n" +
 		"SYNTAX\n" +
 		"    fgit debug [--help|-h]\n" +
@@ -51,7 +38,7 @@ const (
 		"EXAMPLE\n" +
 		"    fgit debug\n" +
 		"    fgit debug https://fastgit.org"
-	convHelpMsg = "FastGit Conv Command Line Tool\n" +
+	ConvHelpMsg = "FastGit Conv Command Line Tool\n" +
 		"==============================\n" +
 		"REMARKS\n" +
 		"    Convert upstream between GitHub or FastGit UK automatically\n" +