package shuffling: models -> storage, old storage -> web

storage/storage.go

@@ -2,96 +2,53 @@
 // Use of this source code is governed by the BSD 2-Clause license,
 // which can be found in the LICENSE file.
 
-// Package storage provides a generic interface for manipulating a
-// BitTorrent tracker's web application data.
+// Package storage implements a high-level abstraction over the multiple
+// data stores used by a BitTorrent tracker.
 package storage
 
 import (
-	"fmt"
-
-	"github.com/pushrax/chihaya/config"
-	"github.com/pushrax/chihaya/models"
+	"strconv"
 )
 
-var drivers = make(map[string]Driver)
+type Peer struct {
+	ID        string `json:"id"`
+	UserID    uint64 `json:"user_id"`
+	TorrentID uint64 `json:"torrent_id"`
 
-type Driver interface {
-	New(*config.DataStore) Conn
+	IP   string `json:"ip"`
+	Port uint64 `json:"port"`
+
+	Uploaded     uint64 `json:"uploaded"`
+	Downloaded   uint64 `json:"downloaded`
+	Left         uint64 `json:"left"`
+	LastAnnounce int64  `json:"last_announce"`
 }
 
-// Register makes a database driver available by the provided name.
-// If Register is called twice with the same name or if driver is nil,
-// it panics.
-func Register(name string, driver Driver) {
-	if driver == nil {
-		panic("storage: Register driver is nil")
-	}
-	if _, dup := drivers[name]; dup {
-		panic("storage: Register called twice for driver " + name)
-	}
-	drivers[name] = driver
+func PeerMapKey(peer *Peer) string {
+	return peer.ID + ":" + strconv.FormatUint(peer.UserID, 36)
 }
 
-// Open creates a connection specified by a storage configuration.
-func Open(conf *config.DataStore) (Conn, error) {
-	driver, ok := drivers[conf.Driver]
-	if !ok {
-		return nil, fmt.Errorf(
-			"storage: unknown driver %q (forgotten import?)",
-			conf.Driver,
-		)
-	}
-	pool := driver.New(conf)
-	return pool, nil
+type Torrent struct {
+	ID       uint64 `json:"id"`
+	Infohash string `json:"infohash"`
+	Active   bool   `json:"active"`
+
+	Seeders  map[string]Peer `json:"seeders"`
+	Leechers map[string]Peer `json:"leechers"`
+
+	Snatches       uint64  `json:"snatches"`
+	UpMultiplier   float64 `json:"up_multiplier"`
+	DownMultiplier float64 `json:"down_multiplier"`
+	LastAction     int64   `json:"last_action"`
 }
 
-// Conn represents a connection to the data store.
-type Conn interface {
-	// Start is called once when the server starts.
-	// It starts any necessary goroutines a given driver requires, and sets
-	// up the driver's initial state
-	Start() error
+type User struct {
+	ID      uint64 `json:"id"`
+	Passkey string `json:"passkey"`
 
-	// Close terminates connections to the database(s) and gracefully shuts
-	// down the driver
-	Close() error
-
-	// RecordAnnounce is called once per announce, and is passed the delta in
-	// statistics for the client peer since its last announce.
-	RecordAnnounce(delta *AnnounceDelta) error
-
-	// LoadTorrents fetches and returns the specified torrents.
-	LoadTorrents(ids []uint64) ([]*models.Torrent, error)
-
-	// LoadAllTorrents fetches and returns all torrents.
-	LoadAllTorrents() ([]*models.Torrent, error)
-
-	// LoadUsers fetches and returns the specified users.
-	LoadUsers(ids []uint64) ([]*models.User, error)
-
-	// LoadAllUsers fetches and returns all users.
-	LoadAllUsers(ids []uint64) ([]*models.User, error)
-}
-
-// AnnounceDelta contains a difference in statistics for a peer.
-// It is used for communicating changes to be recorded by the storage driver.
-type AnnounceDelta struct {
-	Peer    *models.Peer
-	Torrent *models.Torrent
-	User    *models.User
-
-	// Created is true if this announce created a new peer or changed an existing peer's address
-	Created bool
-
-	// Uploaded contains the raw upload delta for this announce, in bytes
-	Uploaded uint64
-
-	// Downloaded contains the raw download delta for this announce, in bytes
-	Downloaded uint64
-
-	// Timestamp is the unix timestamp this announce occurred at
-	Timestamp float64
-
-	// Snatched is true if this announce completed the download
-	Snatched bool
+	UpMultiplier   float64 `json:"up_multiplier"`
+	DownMultiplier float64 `json:"down_multiplier"`
+	Slots          int64   `json:"slots"`
+	SlotsUsed      int64   `json:"slots_used"`
+	Snatches       uint64  `json:"snatches"`
 }