Refactor into client + server backends

database/db.go

@@ -9,22 +9,21 @@ import (
 	"github.com/op/go-logging"
 )
 
+var log = logging.MustGetLogger("mediasrv-server")
 
-var log = logging.MustGetLogger("ikinuki-server")
-
-func OpenDatabase(data_dir string) (*sql.DB, error) {
+func OpenDatabase(data_dir string) (*sql.DB, bool, error) {
 	// create data directory
 	err := os.MkdirAll(data_dir, 0755)
 	if err != nil {
-		return nil, fmt.Errorf("Could not create data directory: %v", err)
+		return nil, false, fmt.Errorf("Could not create data directory: %v", err)
 	}
 
 	// open database
-	db_path := filepath.Join(data_dir, "ikinuki-server.db")
+	db_path := filepath.Join(data_dir, "server.db")
 
 	db, err := sql.Open("sqlite3", db_path)
 	if err != nil {
-		return nil, fmt.Errorf("Could not open database: %v", err)
+		return nil, false, fmt.Errorf("Could not open database: %v", err)
 	}
 
 	// check if the database is new
@@ -37,7 +36,9 @@ CREATE TABLE tvshows(
     title TEXT,
     original_title TEXT,
     show_title TEXT,
-    year INTEGER
+    year INTEGER,
+    description TEXT,
+    poster TEXT
 );
 CREATE TABLE episodes(
     id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -52,14 +53,14 @@ CREATE TABLE episodes(
 	// transaction new check isn't racy
 	tx, err := db.Begin()
 	if err != nil {
-		return nil, fmt.Errorf("Could not begin db transaction: %v", err)
+		return nil, false, fmt.Errorf("Could not begin db transaction: %v", err)
 	}
 	defer tx.Commit()
 
 	// check if the database is new
 	rows, err := tx.Query(is_db_new)
 	if err != nil {
-		return nil, fmt.Errorf("Could not check if database was new: %v", err)
+		return nil, false, fmt.Errorf("Could not check if database was new: %v", err)
 	}
 	defer rows.Close()
 
@@ -73,11 +74,12 @@ CREATE TABLE episodes(
 		// initalize database
 		_, err = tx.Exec(db_init)
 		if err != nil {
-			return nil, fmt.Errorf("Could not initalize database: %v", err)
+			return nil, false, fmt.Errorf("Could not initalize database: %v", err)
 		}
+		return db, true, nil
 	} else {
 		log.Infof("Existing database found at %v", db_path)
+		return db, false, nil
 	}
 
-	return db, nil
 }

database/scan.go

@@ -15,6 +15,15 @@ type TVShow struct {
 	OriginalTile string   `xml:"originaltitle"`
 	ShowTitle    string   `xml:"showtitle"`
 	Year         int      `xml:"year"`
+	Description  string   `xml:"plot"`
+	Thumb        []Thumb  `xml:"thumb"`
+}
+
+type Thumb struct {
+	Aspect string `xml:"aspect,attr"`
+	Season string `xml:"season,attr"`
+	Type   string `xml:"type,attr"`
+	Value  string `xml:",chardata"`
 }
 
 func ScanTvshowRoot(root string, db *sql.DB) error {
@@ -31,7 +40,7 @@ func ScanTvshowRoot(root string, db *sql.DB) error {
 	}
 	defer tx.Commit()
 
-	stmt, err := tx.Prepare("insert into tvshows(title, original_title, show_title, year) values(?, ?, ?, ?)")
+	stmt, err := tx.Prepare("insert into tvshows(title, original_title, show_title, year, description, poster) values(?, ?, ?, ?, ?, ?)")
 	if err != nil {
 		return fmt.Errorf("Could not prepare statement: %v", err)
 	}
@@ -81,7 +90,7 @@ func insert_tvshow_nfo(show_dir string, stmt *sql.Stmt) bool {
 	log.Debugf("    Original Title: %v\n", tvshow.OriginalTile)
 	log.Debugf("    Show Title: %v\n", tvshow.ShowTitle)
 
-	_, err = stmt.Exec(tvshow.Title, tvshow.OriginalTile, tvshow.ShowTitle, tvshow.Year)
+	_, err = stmt.Exec(tvshow.Title, tvshow.OriginalTile, tvshow.ShowTitle, tvshow.Year, tvshow.Description, tvshow.Thumb[0].Value)
 	if err != nil {
 		log.Debugf("Could not insert tvshow \"%v\" into database: %v\n", tvshow.Title, err)
 		return false