From 4687ddde6f1aeb1b558581729c24b4241fd1461b Mon Sep 17 00:00:00 2001
From: Justin Li <jli.justinli@gmail.com>
Date: Fri, 6 Sep 2013 18:51:15 -0400
Subject: [PATCH] Use strings for the database channels and add handling for
 torrents

---
 storage/gazelle/flush.go   |  6 +++---
 storage/gazelle/gazelle.go | 28 +++++++++++++++++-----------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/storage/gazelle/flush.go b/storage/gazelle/flush.go
index d9fd9f7..e0753fd 100644
--- a/storage/gazelle/flush.go
+++ b/storage/gazelle/flush.go
@@ -23,11 +23,11 @@ func (c *Conn) flushTorrents() {
 		query.WriteString("INSERT INTO torrents (ID, Snatched, Seeders, Leechers, last_action) VALUES\n")
 
 		for count = 0; count < length; count++ {
-			b := <-c.torrentChannel
-			if b == nil {
+			s := <-c.torrentChannel
+			if s == "" {
 				break
 			}
-			query.Write(b.Bytes())
+			query.WriteString(s)
 
 			if count != length-1 {
 				query.WriteRune(',')
diff --git a/storage/gazelle/gazelle.go b/storage/gazelle/gazelle.go
index 7f50387..face4dc 100644
--- a/storage/gazelle/gazelle.go
+++ b/storage/gazelle/gazelle.go
@@ -7,7 +7,6 @@
 package gazelle
 
 import (
-	"bytes"
 	"database/sql"
 	"fmt"
 	"sync"
@@ -39,11 +38,11 @@ func (d *driver) New(conf *config.DataStore) storage.Conn {
 	conn := &Conn{db: db}
 
 	// TODO Buffer sizes
-	conn.torrentChannel = make(chan *bytes.Buffer, 1000)
-	conn.userChannel = make(chan *bytes.Buffer, 1000)
-	conn.transferHistoryChannel = make(chan *bytes.Buffer, 1000)
-	conn.transferIpsChannel = make(chan *bytes.Buffer, 1000)
-	conn.snatchChannel = make(chan *bytes.Buffer, 100)
+	conn.torrentChannel = make(chan string, 1000)
+	conn.userChannel = make(chan string, 1000)
+	conn.transferHistoryChannel = make(chan string, 1000)
+	conn.transferIpsChannel = make(chan string, 1000)
+	conn.snatchChannel = make(chan string, 100)
 
 	return conn
 }
@@ -53,11 +52,11 @@ type Conn struct {
 	waitGroup sync.WaitGroup
 	terminate bool
 
-	torrentChannel         chan *bytes.Buffer
-	userChannel            chan *bytes.Buffer
-	transferHistoryChannel chan *bytes.Buffer
-	transferIpsChannel     chan *bytes.Buffer
-	snatchChannel          chan *bytes.Buffer
+	torrentChannel         chan string
+	userChannel            chan string
+	transferHistoryChannel chan string
+	transferIpsChannel     chan string
+	snatchChannel          chan string
 }
 
 func (c *Conn) Start() error {
@@ -76,6 +75,13 @@ func (c *Conn) Close() error {
 }
 
 func (c *Conn) RecordAnnounce(delta *models.AnnounceDelta) error {
+	c.torrentChannel <- fmt.Sprintf(
+		"('%s','%s','%s','%s','%s')",
+		delta.Torrent.ID,
+		len(delta.Torrent.Seeders),
+		len(delta.Torrent.Leechers),
+		delta.Torrent.LastAction,
+	)
 	return nil
 }