Merge pull request #8 from 117503445/117503445/json-output

output json for debug & view

Author: lyc8503

.gitignore

@@ -0,0 +1,2 @@
+rule-set
+*.db

sing-geoip/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"io"
 	"net"
 	"net/http"
@@ -239,6 +240,22 @@ func release(source string, destination string, output string, ruleSetOutput str
 			return err
 		}
 		outputRuleSet.Close()
+
+		srsPath, _ = filepath.Abs(filepath.Join(ruleSetOutput, "geoip-"+countryCode+".json"))
+		os.Stderr.WriteString("write " + srsPath + "\n")
+		outputRuleSet, err = os.Create(srsPath)
+		if err != nil {
+			return err
+		}
+		je := json.NewEncoder(outputRuleSet)
+		je.SetEscapeHTML(false)
+		je.SetIndent("", "    ")
+		err = je.Encode(plainRuleSet)
+		if err != nil {
+			outputRuleSet.Close()
+			return err
+		}
+		outputRuleSet.Close()
 	}
 
 	setActionOutput("tag", *sourceRelease.Name)

sing-geosite/main.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
+	"encoding/json"
 	"io"
 	"net/http"
 	"os"
@@ -238,6 +239,22 @@ func generate(release *github.RepositoryRelease, output string, cnOutput string,
 			return err
 		}
 		outputRuleSet.Close()
+
+		srsPath, _ = filepath.Abs(filepath.Join(ruleSetOutput, "geosite-"+code+".json"))
+		os.Stderr.WriteString("write " + srsPath + "\n")
+		outputRuleSet, err = os.Create(srsPath)
+		if err != nil {
+			return err
+		}
+		je := json.NewEncoder(outputRuleSet)
+		je.SetEscapeHTML(false)
+		je.SetIndent("", "    ")
+		err = je.Encode(plainRuleSet)
+		if err != nil {
+			outputRuleSet.Close()
+			return err
+		}
+		outputRuleSet.Close()
 	}
 	return nil
 }