From 18cae7e7f308a7287b9f4f0f87f7d7f635afeb7c Mon Sep 17 00:00:00 2001
From: Timothy <yexiaozhou2003@gmail.com>
Date: Tue, 13 May 2014 13:08:43 +0800
Subject: [PATCH] implement get domain id func

---
 dns_handler.go | 56 ++++++++++++++++++++++----------------------------
 godns.go       | 10 ++++-----
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/dns_handler.go b/dns_handler.go
index a8f1db1..5a1896e 100644
--- a/dns_handler.go
+++ b/dns_handler.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"fmt"
-	// "github.com/bitly/go-simplejson"
 	"encoding/json"
+	"fmt"
+	"github.com/bitly/go-simplejson"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -45,9 +45,9 @@ func api_version() {
 	post_data("/Info.Version", nil)
 }
 
-func get_domain(name string) int {
+func get_domain(name string) int64 {
 
-	ret := -1
+	var ret int64
 	values := url.Values{}
 	values.Add("type", "all")
 	values.Add("offset", "0")
@@ -57,39 +57,33 @@ func get_domain(name string) int {
 
 	if err != nil {
 		fmt.Println("Failed to get domain list...")
-		return ret
+		return -1
 	}
 
-	var list domain_list
-	json.Unmarshal([]byte(response), &list)
+	sjson, parse_err := simplejson.NewJson([]byte(response))
 
-	// json, parse_err := simplejson.NewJson([]byte(response))
+	if parse_err != nil {
+		fmt.Println(parse_err.Error())
+		return -1
+	}
 
-	// if parse_err != nil {
-	// 	fmt.Println(parse_err.Error())
-	// }
+	if sjson.Get("status").Get("code").MustString() == "1" {
+		domains, _ := sjson.Get("domains").Array()
 
-	// if json.Get("status").Get("code").MustString() == "1" {
-	// 	domains, _ := json.Get("domains").Array()
+		fmt.Println(domains)
 
-	// 	// fmt.Println(string(domains))
-	// 	for _, d := range domains {
-	// 		m := d.(map[string]interface{})
-	// 		if m["name"] == name {
-	// 			id := simplejson.NewJson(m["id"]).Int()
-	// 			fmt.Println(id)
-	// 		}
-	// 		// if d["name"] == name {
-	// 		// 	fmt.Println(d["name"])
-	// 		// 	ret = d["id"]
-	// 		// }
-	// 		// if d == "name" {
-	// 		// 	if v == name {
-	// 		// 		fmt.Println(v)
-	// 		// 	}
-	// 		// }
-	// 	}
-	// }
+		for _, d := range domains {
+			m := d.(map[string]interface{})
+			if m["name"] == name {
+				id := m["id"]
+
+				switch t := id.(type) {
+				case json.Number:
+					ret, _ = t.Int64()
+				}
+			}
+		}
+	}
 
 	fmt.Printf("Domain id is: %d", ret)
 	return ret
diff --git a/godns.go b/godns.go
index 798f831..ffa0830 100644
--- a/godns.go
+++ b/godns.go
@@ -30,13 +30,13 @@ func dns_loop(loop chan bool) {
 	fmt.Println("Inside the loop...")
 	time.Sleep(time.Second * 2)
 
-	currentIP, _ := get_currentIP(Configuration.IP_Url)
-	fmt.Println("Current IP is" + currentIP)
+	// currentIP, _ := get_currentIP(Configuration.IP_Url)
+	// fmt.Println("Current IP is" + currentIP)
 
 	//Continue to check the IP of sub-domain
-	if len(currentIP) > 0 {
-		get_domain(Configuration.Domain)
-	}
+	// if len(currentIP) > 0 {
+	get_domain(Configuration.Domain)
+	// }
 
 	api_version()
 	loop <- false