now actually does something

storage/fs.go

@@ -11,18 +11,6 @@ import (
 	"git.eeqj.de/sneak/feta/toot"
 )
 
-// TootStorageBackend is the interface to which storage backends must
-// conform for storing toots
-type TootStorageBackend interface {
-	TootExists(t toot.Toot) bool
-	StoreToot(t toot.Toot) error
-	StoreToots(tc []*toot.Toot) error
-}
-
-type TootDBStorage struct {
-	db string
-}
-
 // TootFSStorage is a TootStorageBackend that writes to the local
 // filesystem.
 type TootFSStorage struct {
@@ -41,7 +29,7 @@ func NewTootFSStorage(root string) *TootFSStorage {
 func (ts *TootFSStorage) StoreToots(tc []*toot.Toot) error {
 	var returnErrors []string
 	for _, item := range tc {
-		err := ts.StoreToot(*item)
+		err := ts.StoreToot(item)
 		if err != nil {
 			returnErrors = append(returnErrors, err.Error())
 			continue
@@ -56,7 +44,7 @@ func (ts *TootFSStorage) StoreToots(tc []*toot.Toot) error {
 // TootExists checks to see if we have already written a toot to disk or
 // not.  Note that the ingester de-dupes with a table in memory so that this
 // will only really get used on app restarts
-func (ts *TootFSStorage) TootExists(t toot.Toot) bool {
+func (ts *TootFSStorage) TootExists(t *toot.Toot) bool {
 	path := t.DiskStoragePath()
 	full := ts.root + "/" + path
 	_, err := os.Stat(full)
@@ -67,7 +55,7 @@ func (ts *TootFSStorage) TootExists(t toot.Toot) bool {
 }
 
 // StoreToot writes a single toot to disk
-func (ts *TootFSStorage) StoreToot(t toot.Toot) error {
+func (ts *TootFSStorage) StoreToot(t *toot.Toot) error {
 	path := t.DiskStoragePath()
 	full := ts.root + "/" + path
 	dir := filepath.Dir(full)
@@ -82,7 +70,7 @@ func (ts *TootFSStorage) StoreToot(t toot.Toot) error {
 // toots in ram forever until the computer fills up and catches fire and explodes
 type TootMemoryStorage struct {
 	sync.Mutex
-	toots map[toot.Hash]toot.Toot
+	toots map[string]*toot.Toot
 	//maxSize uint   // FIXME support eviction
 }
 
@@ -90,12 +78,12 @@ type TootMemoryStorage struct {
 // ram forever
 func NewTootMemoryStorage() *TootMemoryStorage {
 	ts := new(TootMemoryStorage)
-	ts.toots = make(map[toot.Hash]toot.Toot)
+	ts.toots = make(map[string]*toot.Toot)
 	return ts
 }
 
 // StoreToot saves a single toot into an in-memory hashtable
-func (ts *TootMemoryStorage) StoreToot(t toot.Toot) {
+func (ts *TootMemoryStorage) StoreToot(t *toot.Toot) {
 	if ts.TootExists(t) {
 		return
 	}
@@ -106,7 +94,7 @@ func (ts *TootMemoryStorage) StoreToot(t toot.Toot) {
 }
 
 // TootExists checks to see if we have a toot in memory already
-func (ts *TootMemoryStorage) TootExists(t toot.Toot) bool {
+func (ts *TootMemoryStorage) TootExists(t *toot.Toot) bool {
 	ts.Lock()
 	defer ts.Unlock()
 	if _, ok := ts.toots[t.Hash]; ok { //this syntax is so gross

storage/interface.go

@@ -0,0 +1,13 @@
+package storage
+
+import (
+	"git.eeqj.de/sneak/feta/toot"
+)
+
+// TootStorageBackend is the interface to which storage backends must
+// conform for storing toots
+type TootStorageBackend interface {
+	TootExists(t *toot.Toot) bool
+	StoreToot(t *toot.Toot) error
+	StoreToots(tc []*toot.Toot) error
+}