Append a router in rule.cidr

Author: mohanson

cmd/daze/main.go

@@ -45,7 +45,7 @@ const helpGen = `Usage: daze gen <region>
 Supported region:
   CN         China
 
-If no region is specified, an empty cidr list is generated.
+Executing this command will update rule.cidr by remote data source.
 `
 
 func main() {
@@ -174,8 +174,7 @@ func main() {
 		f := doa.Try(os.OpenFile(filepath.Join(resExec, Conf.PathCIDR), os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644))
 		defer f.Close()
 		for _, e := range cidr {
-			f.WriteString(e.String())
-			f.WriteString("\n")
+			fmt.Fprintln(f, "L", e.String())
 		}
 	case "ver":
 		fmt.Println("daze", Conf.Version)

daze.go

@@ -619,12 +619,21 @@ func (r *RouterIPNet) FromFile(name string) {
 	s := bufio.NewScanner(f)
 	for s.Scan() {
 		line := s.Text()
-		if line == "" || strings.HasPrefix(line, "#") {
+		seps := strings.Fields(line)
+		if len(seps) < 2 {
 			continue
 		}
-		_, cidr, err := net.ParseCIDR(line)
+		_, cidr, err := net.ParseCIDR(seps[1])
 		doa.Nil(err)
-		r.L = append(r.L, cidr)
+		switch seps[0] {
+		case "#":
+		case "L":
+			r.L = append(r.L, cidr)
+		case "R":
+			r.R = append(r.R, cidr)
+		case "B":
+			r.B = append(r.B, cidr)
+		}
 	}
 	doa.Nil(s.Err())
 }