Add source to songs and playlist_items

data/data.qrc

@@ -3,6 +3,7 @@
         <file>schema/schema.sql</file>
         <file>schema/schema-1.sql</file>
         <file>schema/schema-2.sql</file>
+        <file>schema/schema-3.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
         <file>misc/playing_tooltip.txt</file>

data/schema/device-schema.sql

@@ -11,8 +11,6 @@ CREATE TABLE device_%deviceid_subdirectories (
 
 CREATE TABLE device_%deviceid_songs (
 
-  /* Metadata from taglib */
-
   title TEXT NOT NULL,
   album TEXT NOT NULL,
   artist TEXT NOT NULL,
@@ -27,6 +25,7 @@ CREATE TABLE device_%deviceid_songs (
   performer TEXT NOT NULL,
   grouping TEXT NOT NULL,
   comment TEXT NOT NULL,
+  lyrics TEXT NOT NULL,
 
   beginning INTEGER NOT NULL DEFAULT 0,
   length INTEGER NOT NULL DEFAULT 0,
@@ -35,8 +34,7 @@ CREATE TABLE device_%deviceid_songs (
   samplerate INTEGER NOT NULL DEFAULT 0,
   bitdepth INTEGER NOT NULL DEFAULT 0,
 
-  /* Information about the file on disk */
-
+  source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL,
   filename TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
@@ -45,8 +43,6 @@ CREATE TABLE device_%deviceid_songs (
   ctime INTEGER NOT NULL,
   unavailable INTEGER DEFAULT 0,
 
-  /* Other */
-
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT 0,

data/schema/schema-3.sql

@@ -0,0 +1,65 @@
+ALTER TABLE songs ADD COLUMN source INTEGER NOT NULL DEFAULT 0;
+
+UPDATE songs SET source = 2 WHERE source = 0;
+
+DROP TABLE playlist_items;
+
+CREATE TABLE IF NOT EXISTS playlist_items (
+
+  playlist INTEGER NOT NULL,
+  type INTEGER NOT NULL DEFAULT 0,
+  collection_id INTEGER,
+  url TEXT,
+
+  title TEXT NOT NULL,
+  album TEXT NOT NULL,
+  artist TEXT NOT NULL,
+  albumartist TEXT NOT NULL,
+  track INTEGER NOT NULL DEFAULT -1,
+  disc INTEGER NOT NULL DEFAULT -1,
+  year INTEGER NOT NULL DEFAULT -1,
+  originalyear INTEGER NOT NULL DEFAULT 0,
+  genre TEXT NOT NULL,
+  compilation INTEGER NOT NULL DEFAULT -1,
+  composer TEXT NOT NULL,
+  performer TEXT NOT NULL,
+  grouping TEXT NOT NULL,
+  comment TEXT NOT NULL,
+  lyrics TEXT NOT NULL,
+
+  beginning INTEGER NOT NULL DEFAULT 0,
+  length INTEGER NOT NULL DEFAULT 0,
+
+  bitrate INTEGER NOT NULL DEFAULT 0,
+  samplerate INTEGER NOT NULL DEFAULT 0,
+  bitdepth INTEGER NOT NULL DEFAULT 0,
+
+  source INTEGER NOT NULL DEFAULT 0,
+  directory_id INTEGER,
+  filename TEXT,
+  filetype INTEGER NOT NULL DEFAULT 0,
+  filesize INTEGER,
+  mtime INTEGER,
+  ctime INTEGER,
+  unavailable INTEGER DEFAULT 0,
+
+  playcount INTEGER NOT NULL DEFAULT 0,
+  skipcount INTEGER NOT NULL DEFAULT 0,
+  lastplayed INTEGER NOT NULL DEFAULT 0,
+
+  compilation_detected INTEGER DEFAULT 0,
+  compilation_on INTEGER NOT NULL DEFAULT 0,
+  compilation_off INTEGER NOT NULL DEFAULT 0,
+  compilation_effective INTEGER NOT NULL DEFAULT 0,
+
+  art_automatic TEXT,
+  art_manual TEXT,
+
+  effective_albumartist TEXT,
+  effective_originalyear INTEGER NOT NULL DEFAULT 0,
+
+  cue_path TEXT
+
+);
+
+UPDATE schema_version SET version=3;

data/schema/schema.sql

@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS schema_version (
 
 DELETE FROM schema_version;
 
-INSERT INTO schema_version (version) VALUES (2);
+INSERT INTO schema_version (version) VALUES (3);
 
 CREATE TABLE IF NOT EXISTS directories (
   path TEXT NOT NULL,
@@ -19,8 +19,6 @@ CREATE TABLE IF NOT EXISTS subdirectories (
 
 CREATE TABLE IF NOT EXISTS songs (
 
-  /* Metadata from taglib */
-
   title TEXT NOT NULL,
   album TEXT NOT NULL,
   artist TEXT NOT NULL,
@@ -44,8 +42,7 @@ CREATE TABLE IF NOT EXISTS songs (
   samplerate INTEGER NOT NULL DEFAULT 0,
   bitdepth INTEGER NOT NULL DEFAULT 0,
 
-  /* Information about the file on disk */
-
+  source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER NOT NULL,
   filename TEXT NOT NULL,
   filetype INTEGER NOT NULL DEFAULT 0,
@@ -54,8 +51,6 @@ CREATE TABLE IF NOT EXISTS songs (
   ctime INTEGER NOT NULL,
   unavailable INTEGER DEFAULT 0,
 
-  /* Other */
-
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT 0,
@@ -89,13 +84,10 @@ CREATE TABLE IF NOT EXISTS playlists (
 CREATE TABLE IF NOT EXISTS playlist_items (
 
   playlist INTEGER NOT NULL,
-  type TEXT NOT NULL,
+  type INTEGER NOT NULL DEFAULT 0,
   collection_id INTEGER,
-  internet_service TEXT,
   url TEXT,
 
-  /* Metadata from taglib */
-
   title TEXT NOT NULL,
   album TEXT NOT NULL,
   artist TEXT NOT NULL,
@@ -119,8 +111,7 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   samplerate INTEGER NOT NULL DEFAULT 0,
   bitdepth INTEGER NOT NULL DEFAULT 0,
 
-  /* Information about the file on disk */
-
+  source INTEGER NOT NULL DEFAULT 0,
   directory_id INTEGER,
   filename TEXT,
   filetype INTEGER NOT NULL DEFAULT 0,
@@ -129,8 +120,6 @@ CREATE TABLE IF NOT EXISTS playlist_items (
   ctime INTEGER,
   unavailable INTEGER DEFAULT 0,
 
-  /* Other */
-
   playcount INTEGER NOT NULL DEFAULT 0,
   skipcount INTEGER NOT NULL DEFAULT 0,
   lastplayed INTEGER NOT NULL DEFAULT 0,