添加设置默认 Git CDN 功能

## 新增
1. `setcdn <gitcdn>`、`getcdn`、`delcdn` 功能

Author: 50percent

NetCoreBeautyGlobalTool/NetCoreBeautyGlobalTool.csproj

@@ -9,7 +9,7 @@
     <ToolCommandName>ncbeauty</ToolCommandName>
     <PackageOutputPath>.nupkg</PackageOutputPath>
 
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
 
     <Authors>LiesAuer</Authors>
     <Description>Move a .NET Core app runtime components and dependencies into a sub-directory and make it beauty.</Description>

NetCoreBeautyNuget/NetCoreBeauty.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>nulastudio.NetCoreBeauty</id>
     <description>Move a .NET Core app runtime components and dependencies into a sub-directory and make it beauty.</description>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <authors>LiesAuer</authors>
     <owners>nulastudio</owners>
     <projectUrl>https://github.com/nulastudio/NetCoreBeauty</projectUrl>

README.md

@@ -52,6 +52,9 @@ when you run `dotnet publish -r` (only works with `SCD` mode), everything is don
 ```
 Usage:
 ncbeauty [--<force=True|False>] [--<gitcdn>] [--<loglevel=Error|Detail|Info>] [--<nopatch=True|False>] <beautyDir> [<libsDir>]
+ncbeauty [--<loglevel=Error|Detail|Info>] setcdn <gitcdn>
+ncbeauty [--<loglevel=Error|Detail|Info>] getcdn
+ncbeauty [--<loglevel=Error|Detail|Info>] delcdn
 ```
 for example
 ```
@@ -69,3 +72,15 @@ if you have troble in connecting github, use this mirror
 ```
 https://gitee.com/liesauer/HostFXRPatcher
 ```
+
+## Default Git CDN
+`ncbeauty` [1.2.1](https://github.com/nulastudio/NetCoreBeauty/releases/tag/v1.2.1)  supports setting default Git CDN now, you don't need `--gitcdn` all the time if you are using binary distribution. but how ever default git cdn can be override by `--gitcdn`.
+Usage:
+```
+ncbeauty [--<loglevel=Error|Detail|Info>] setcdn <gitcdn>
+  set current default git cdn, can be override by --gitcdn.
+ncbeauty [--<loglevel=Error|Detail|Info>] getcdn
+  print current default git cdn.
+ncbeauty [--<loglevel=Error|Detail|Info>] delcdn
+  remove current default git cdn, after removed, use --gitcdn to specify.
+```

src/main/beauty.go

@@ -42,14 +42,6 @@ func main() {
 	// 设置CDN
 	manager.GitCDN = gitcdn
 
-	// 设置LogLevel
-	log.DefaultLogger.LogLevel = map[string]log.LogLevel{
-		errorLevel:  log.Error,
-		detailLevel: log.Detail,
-		infoLevel:   log.Info,
-	}[loglevel]
-	manager.Logger.LogLevel = log.DefaultLogger.LogLevel
-
 	log.LogInfo("running ncbeauty...")
 
 	beautyCheck := path.Join(beautyDir, "NetCoreBeauty")
@@ -122,7 +114,7 @@ func initCLI() {
 	flag.CommandLine = flag.NewFlagSet("ncbeauty", flag.ContinueOnError)
 	flag.CommandLine.Usage = usage
 	flag.CommandLine.SetOutput(os.Stdout)
-	flag.StringVar(&gitcdn, "gitcdn", "https://github.com/nulastudio/HostFXRPatcher", `specify a HostFXRPatcher mirror repo if you have troble in connecting github.
+	flag.StringVar(&gitcdn, "gitcdn", "", `specify a HostFXRPatcher mirror repo if you have troble in connecting github.
 RECOMMEND https://gitee.com/liesauer/HostFXRPatcher for mainland china users.
 `)
 	flag.StringVar(&loglevel, "loglevel", "Error", `log level. valid values: Error/Detail/Info
@@ -152,30 +144,96 @@ hostfxr patch fixes https://github.com/nulastudio/NetCoreBeauty/issues/1`)
 		usage()
 		os.Exit(0)
 	}
-	beautyDir = args[0]
 
-	if len(args) >= 2 {
-		libsDir = flag.Arg(1)
+	// logLevel检查
+	if loglevel != errorLevel && loglevel != detailLevel && loglevel != infoLevel {
+		loglevel = errorLevel
 	}
 
-	beautyDir = strings.Trim(beautyDir, `"`)
-	libsDir = strings.Trim(libsDir, `"`)
-	absDir, err := filepath.Abs(beautyDir)
-	if err != nil {
-		log.LogPanic(fmt.Errorf("invalid beautyDir: %s", err.Error()), 1)
+	// 设置LogLevel
+	log.DefaultLogger.LogLevel = map[string]log.LogLevel{
+		errorLevel:  log.Error,
+		detailLevel: log.Detail,
+		infoLevel:   log.Info,
+	}[loglevel]
+	manager.Logger.LogLevel = log.DefaultLogger.LogLevel
+
+	switch args[0] {
+	case "setcdn":
+		checkArgumentsCount(2, argv)
+		if manager.SetCDN(strings.Trim(args[1], `"`)) {
+			fmt.Println("set default git cdn successfully")
+		} else {
+			fmt.Println("set default git cdn failed")
+		}
+		exit()
+	case "getcdn":
+		checkArgumentsCount(1, argv)
+		cdn := manager.GetCDN()
+		if cdn == "" {
+			fmt.Println("default git cdn has not been set yet")
+		} else {
+			fmt.Printf("current default git cdn: %s\n", cdn)
+		}
+		exit()
+	case "delcdn":
+		checkArgumentsCount(1, argv)
+		cdn := manager.GetCDN()
+		if cdn == "" {
+			fmt.Println("default git cdn has not been set yet")
+		} else {
+			manager.DelCDN()
+			fmt.Printf("current default git cdn has been deleted, it was: [%s] before\n", cdn)
+		}
+		exit()
+	default:
+		if gitcdn == "" {
+			cdn := manager.GetCDN()
+			if cdn == "" {
+				gitcdn = "https://github.com/nulastudio/HostFXRPatcher"
+			} else {
+				gitcdn = cdn
+			}
+		}
+
+		beautyDir = args[0]
+
+		if len(args) >= 2 {
+			libsDir = flag.Arg(1)
+		}
+
+		beautyDir = strings.Trim(beautyDir, `"`)
+		libsDir = strings.Trim(libsDir, `"`)
+		absDir, err := filepath.Abs(beautyDir)
+		if err != nil {
+			log.LogPanic(fmt.Errorf("invalid beautyDir: %s", err.Error()), 1)
+		}
+		beautyDir = absDir
 	}
-	beautyDir = absDir
+}
 
-	// logLevel检查
-	if loglevel != errorLevel && loglevel != detailLevel && loglevel != infoLevel {
-		loglevel = errorLevel
+func checkArgumentsCount(excepted int, got int) bool {
+	if excepted == got {
+		return true
 	}
+	log.LogPanic(fmt.Errorf("Too few or many arguments, expected %d, got %d", excepted, got), 1)
+	return false
 }
 
 func usage() {
 	fmt.Println("Usage:")
 	fmt.Println("ncbeauty [--<force=True|False>] [--<gitcdn>] [--<loglevel=Error|Detail|Info>] [--<nopatch=True|False>] <beautyDir> [<libsDir>]")
 	flag.PrintDefaults()
+	fmt.Println("ncbeauty [--<loglevel=Error|Detail|Info>] setcdn <gitcdn>")
+	fmt.Println("  set current default git cdn, can be override by --gitcdn.")
+	fmt.Println("ncbeauty [--<loglevel=Error|Detail|Info>] getcdn")
+	fmt.Println("  print current default git cdn.")
+	fmt.Println("ncbeauty [--<loglevel=Error|Detail|Info>] delcdn")
+	fmt.Println("  remove current default git cdn, after removed, use --gitcdn to specify.")
+}
+
+func exit() {
+	os.Exit(0)
 }
 
 func patch(fxrVersion string, rid string) bool {

src/manager/manager.go

@@ -29,9 +29,11 @@ var timeout = 60 * time.Second
 var localPath = filepath.Clean(os.TempDir()) + "/NetCoreBeauty"
 var localArtifactsPath = localPath + "/artifacts"
 var artifactsVersionTXT = "/ArtifactsVersion.txt"
+var gitCDNTXT = "/git.cdn"
 var artifactsVersionJSON = "/ArtifactsVersion.json"
 var onlineArtifactsVersionJSON = "/OnlineArtifactsVersion.json"
 var artifactsVersionOldPath = localArtifactsPath + artifactsVersionTXT
+var gitCDNPath = localPath + gitCDNTXT
 var artifactsVersionPath = localArtifactsPath + artifactsVersionJSON
 var onlineArtifactsVersionPath = localArtifactsPath + onlineArtifactsVersionJSON
 
@@ -571,3 +573,29 @@ func FixDeps(deps string) ([]string, string, string) {
 
 	return files, "v" + fxrVersion, rid
 }
+
+// SetCDN 设置默认CDN
+func SetCDN(cdn string) bool {
+	if err := ioutil.WriteFile(gitCDNPath, []byte(cdn), 0666); err != nil {
+		log.LogError(err, false)
+		return false
+	}
+	return true
+}
+
+// GetCDN 获取默认CDN
+func GetCDN() string {
+	if gitcdn, err := ioutil.ReadFile(gitCDNPath); err == nil {
+		return string(gitcdn)
+	}
+	return ""
+}
+
+// DelCDN 删除默认CDN
+func DelCDN() bool {
+	if err := os.Remove(gitCDNPath); err != nil {
+		log.LogError(err, false)
+		return false
+	}
+	return true
+}