7 files changed, 346 insertions, 5 deletions

diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 791ea5e..116b689 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -159,16 +159,71 @@ func (m *GrilsModule) FromID(id int) (*Gril, error) {
         gril := &Gril{
                 ID: id,
         }
-        var tags []byte
-        var otherNames []byte
-        err := m.g.DB.QueryRow(`SELECT kanji_name, romaji_name, other_names, updated_at, age, birthday, tags FROM grilist.grils_flattened WHERE id = $1`, id).Scan(&gril.KanjiName, &gril.RomajiName, &otherNames, &gril.UpdatedAt, &gril.Age, &gril.Birthday, &tags)
+    t1 := time.Now()
+        err := m.g.DB.QueryRow(`SELECT updated_at, age, birthday FROM grilist.grils WHERE id = $1`, id).Scan(&gril.UpdatedAt, &gril.Age, &gril.Birthday)
+        log.Printf("get_gril_from_id_raw: %dms", time.Since(t1).Nanoseconds()/1000000)
 
-        gril.Tags = pgArray(tags)
-        gril.OtherNames = pgArray(otherNames)
         if err != nil {
                 return nil, err
         }
+    
+    // Namen rausholen
+    rows, err := m.g.DB.Query(`SELECT name, name_type FROM grilist.gril_names WHERE gril_id = $1`, id)
+        if err != nil {
+                return nil, err
+        }
+        log.Printf("get_gril_from_id_names: %dms", time.Since(t1).Nanoseconds()/1000000)
+    defer rows.Close()
+    
+    for rows.Next() {
+        var name string
+        var name_type int
+        if err := rows.Scan(&name, &name_type); err != nil {
+            return nil, err
+        }
+        
+        switch name_type {
+        case 0:
+            gril.KanjiName = name
+            break
+        case 1:
+            gril.RomajiName = name
+        default:
+            gril.OtherNames = append(gril.OtherNames, name)
+        }
+    }
+    /*rows, err := m.g.DB.Query(`SELECT name FROM grilist.gril_names WHERE gril_id = $1 AND name_type > 1`, id)
+        if err != nil {
+                return nil, err
+        }
+    defer rows.Close()
+    
+    for rows.Next() {
+        var name string
+        if err := rows.Scan(&name); err != nil {
+            return nil, err
+        }
+        gril.OtherNames = append(gril.OtherNames, name)
+    }
+    rows.Close()
+    
+    // Tags holen
+    rows, err := m.g.DB.Query(`SELECT name FROM grilist.tags WHERE id IN (SELECT tag_id FROM grilist.grils_tags WHERE gril_id = $1)`, id)
+        if err != nil {
+                return nil, err
+        }
+    defer rows.Close()
+    
+    for rows.Next() {
+        var name string
+        if err := rows.Scan(&name); err != nil {
+            return nil, err
+        }
+        gril.Tags = append(gril.Tags, name)
+    }*/
+
     m.c.Insert(id, gril)
+        log.Printf("get_gril_from_id: %dms", time.Since(t1).Nanoseconds()/1000000)
         return gril, nil
 }
 
diff --git a/tools/charcrawler/.gitignore b/tools/charcrawler/.gitignore
new file mode 100644
index 0000000..961f545
--- /dev/null
+++ b/tools/charcrawler/.gitignore
@@ -0,0 +1,3 @@
+data/
+*.txt
+charcrawler
diff --git a/tools/charcrawler/crawler/acd.go b/tools/charcrawler/crawler/acd.go
new file mode 100644
index 0000000..14f22a2
--- /dev/null
+++ b/tools/charcrawler/crawler/acd.go
@@ -0,0 +1,84 @@
+package crawler
+
+import (
+        "log"
+        "strconv"
+        "strings"
+
+        "github.com/PuerkitoBio/goquery"
+)
+
+type ACDCrawler struct{}
+
+func (a ACDCrawler) Name() string {
+        return "ACD"
+}
+
+func (a ACDCrawler) Crawl(id int) (CharacterData, error) {
+        c := make(CharacterData)
+        doc, err := goquery.NewDocument("http://www.animecharactersdatabase.com/character.php?id=" + strconv.Itoa(id))
+        if err != nil {
+                log.Println(err)
+                return nil, CrawlError
+        }
+        text := doc.Text()
+        if strings.Contains(text, "bad character : try") {
+                return nil, CharacterNotFound
+        }
+        if strings.Contains(text, "Your IP has been blocked") {
+                return nil, Banned
+        }
+        dataTr := doc.Find("#profile").ChildrenFiltered("table").Eq(0).ChildrenFiltered("tbody").ChildrenFiltered("tr")
+        leftSide := dataTr.Children().Eq(0)
+        rightSide := dataTr.Children().Eq(1)
+        imageCols := rightSide.ChildrenFiltered("table").First().Find("tbody > tr > td")
+        val, _ := imageCols.Eq(0).Find("img").Attr("src")
+        c["__thumb"] = val
+        val, _ = imageCols.Eq(1).Find("a").Attr("href")
+        c["__img"] = val
+        leftSide.ChildrenFiltered("table").Eq(1).Find("tr").Each(func(i int, s *goquery.Selection) {
+                c[s.Find("th").Text()] = s.Find("td").Text()
+        })
+        var key string
+        leftSide.
+                ChildrenFiltered("table").
+                Eq(0).
+                Find("td").
+                Eq(1).
+                Find("dl").
+                Children().
+                Each(func(i int, s *goquery.Selection) {
+                switch goquery.NodeName(s) {
+                case "dt":
+                        key = s.Text()
+                case "dd":
+                        c[key] = s.Text()
+                }
+        })
+        tags := make([]string, 0)
+        leftSide.ChildrenFiltered("div").Eq(0).Find("a").Each(func(i int, s *goquery.Selection) {
+                tags = append(tags, s.Text())
+        })
+        c["__tags"] = tags
+        vas := make([]string, 0)
+        leftSide.ChildrenFiltered("div").Eq(1).Find("a").Each(func(i int, s *goquery.Selection) {
+                vas = append(vas, s.Text())
+        })
+        c["__vas"] = vas
+        leftSide.ChildrenFiltered("dl").Children().Each(func(i int, s *goquery.Selection) {
+                switch goquery.NodeName(s) {
+                case "dt":
+                        key = s.Text()
+                case "dd":
+                        c[key] = s.Text()
+                }
+        })
+        apps := make([]int, 0)
+        rightSide.Find(".tile3top").Each(func(i int, s *goquery.Selection) {
+                val, _ = s.Find("a").Attr("href")
+                id, _ := strconv.Atoi(strings.Split(val, "=")[1])
+                apps = append(apps, id)
+        })
+        c["__appearances"] = apps
+        return c, nil
+}
diff --git a/tools/charcrawler/crawler/acd_anime.go b/tools/charcrawler/crawler/acd_anime.go
new file mode 100644
index 0000000..c697b43
--- /dev/null
+++ b/tools/charcrawler/crawler/acd_anime.go
@@ -0,0 +1,44 @@
+package crawler
+
+import (
+        "log"
+        "strconv"
+        "strings"
+
+        "github.com/PuerkitoBio/goquery"
+)
+
+type ACDAnimeCrawler struct{}
+
+func (a ACDAnimeCrawler) Name() string {
+        return "ACDAnime"
+}
+
+func (a ACDAnimeCrawler) Crawl(id int) (CharacterData, error) {
+        c := make(CharacterData)
+        doc, err := goquery.NewDocument("http://www.animecharactersdatabase.com/series.php?id=" + strconv.Itoa(id))
+        if err != nil {
+                log.Println(err)
+                return nil, CrawlError
+        }
+        text := doc.Text()
+        if strings.Contains(text, "bad series : try") {
+                return nil, CharacterNotFound
+        }
+        if strings.Contains(text, "Your IP has been blocked") {
+                return nil, Banned
+        }
+        tds := doc.Find("#besttable > table > tbody > tr > td")
+        val, _ := tds.Eq(0).Find("img").Attr("src")
+        c["__thumb"] = val
+        tds.Eq(1).Find("tr").Each(func(i int, s *goquery.Selection) {
+                key := s.Find("th").Text()
+                value := s.Find("td").Text()
+                if key == "Home Page" {
+                        val, _ = s.Find("td > a").Attr("href")
+                        value = val
+                }
+                c[key] = value
+        })
+        return c, nil
+}
diff --git a/tools/charcrawler/crawler/anidb.go b/tools/charcrawler/crawler/anidb.go
new file mode 100644
index 0000000..12bf05b
--- /dev/null
+++ b/tools/charcrawler/crawler/anidb.go
@@ -0,0 +1,69 @@
+package crawler
+
+import (
+        "log"
+        "strconv"
+        "strings"
+
+        "github.com/PuerkitoBio/goquery"
+)
+
+type AniDBCrawler struct{}
+
+func (a AniDBCrawler) Name() string {
+        return "AniDB"
+}
+
+func (a AniDBCrawler) Crawl(id int) (CharacterData, error) {
+        c := make(CharacterData)
+        doc, err := goquery.NewDocument("http://anidb.net/perl-bin/animedb.pl?show=character&charid=" + strconv.Itoa(id))
+        if err != nil {
+                log.Println(err)
+                return nil, CrawlError
+        }
+        siteErr, _ := doc.Find(".error p").Html()
+        if strings.Contains(siteErr, "Unknown character id") {
+                return nil, CharacterNotFound
+        } else if strings.Contains(siteErr, "BANNED") {
+                return nil, CrawlError
+        }
+        first := true
+        links := make([]string, 0)
+        doc.Find(".characters").Each(func(i int, s *goquery.Selection) {
+                if first {
+                        s.Find(".g_definitionlist tr").Each(func(i int, s *goquery.Selection) {
+                                keyHtml, _ := s.Find("th").Html()
+                                valueHtml, _ := s.Find("td").Html()
+                                key := strings.TrimSpace(keyHtml)
+                                value := strings.TrimSpace(valueHtml)
+                                c[key] = value
+                        })
+                        desc, _ := s.Find(".desc").Html()
+                        c["__desc"] = strings.TrimSpace(desc)
+                        imgUrl, _ := s.Find(".image img").Attr("src")
+                        c["__img"] = imgUrl
+                        animes := make([]map[string]string, 0)
+                        s.Find(".animelist tr").Each(func(i int, s *goquery.Selection) {
+                                if s.HasClass("header") {
+                                        return
+                                }
+                                anime := make(map[string]string)
+                                relHtml, _ := s.Find(".relation").Html()
+                                nameHtml, _ := s.Find(".name a").Html()
+                                rel := strings.TrimSpace(relHtml)
+                                name := strings.TrimSpace(nameHtml)
+                                anime["rel"] = rel
+                                anime["name"] = name
+                                animes = append(animes, anime)
+                        })
+                        c["__animes"] = animes
+                } else {
+                        link, _ := s.Find(".mainname a").Attr("href")
+                        links = append(links, strings.Replace(link, "http://anidb.net/ch", "", 1))
+                }
+                first = false
+        })
+        c["__links"] = links
+
+        return c, nil
+}
diff --git a/tools/charcrawler/crawler/crawler.go b/tools/charcrawler/crawler/crawler.go
new file mode 100644
index 0000000..3d27ea2
--- /dev/null
+++ b/tools/charcrawler/crawler/crawler.go
@@ -0,0 +1,70 @@
+package crawler
+
+import (
+        "encoding/json"
+        "errors"
+        "io/ioutil"
+        "log"
+        "os"
+        "strconv"
+        "strings"
+        "time"
+)
+
+type CharacterData map[string]interface{}
+
+type Crawler interface {
+        Name() string
+        Crawl(id int) (CharacterData, error)
+}
+
+var Instances []Crawler
+
+var (
+        CrawlError        = errors.New("Error while crawling")
+        CharacterNotFound = errors.New("Character not found")
+        Banned            = errors.New("Crawler banned from source")
+)
+
+func Start(c Crawler) {
+        name := c.Name()
+        os.MkdirAll("data/"+name, 0755)
+        log.Printf("Starting Crawler %s...", name)
+        ticker := time.NewTicker(time.Second * 1)
+        current := 1
+        if save, err := ioutil.ReadFile(name + ".txt"); err == nil {
+                s := strings.TrimSpace(string(save))
+                if i, err := strconv.Atoi(s); err == nil {
+                        current = i
+                }
+        }
+        faultCounter := 0
+        for range ticker.C {
+                if faultCounter > 100 {
+                        faultCounter = 0
+                        log.Printf("[%s] Exiting after 100 fails", name)
+                        break
+                }
+                log.Printf("[%s] Crawling %d", name, current)
+                char, err := c.Crawl(current)
+                switch err {
+                case CharacterNotFound:
+                        log.Printf("[%s] Char %d not found!", name, current)
+                        faultCounter++
+                case CrawlError:
+                        panic(err)
+                case Banned:
+                        panic(err)
+                default:
+                        cData, _ := json.Marshal(char)
+                        ioutil.WriteFile("data/"+name+"/"+strconv.Itoa(current)+".json", cData, 0755)
+                }
+
+                current++
+                ioutil.WriteFile(name+".txt", []byte(strconv.Itoa(current)), os.ModePerm)
+        }
+}
+
+func init() {
+        Instances = append(Instances, new(ACDCrawler), new(ACDAnimeCrawler))
+}
diff --git a/tools/charcrawler/main.go b/tools/charcrawler/main.go
new file mode 100644
index 0000000..a87c13c
--- /dev/null
+++ b/tools/charcrawler/main.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+        "time"
+
+        "fagott.pw/grilist/tools/charcrawler/crawler"
+)
+
+func main() {
+        for _, c := range crawler.Instances {
+                go crawler.Start(c)
+        }
+        for {
+                time.Sleep(time.Minute)
+        }
+}