Update importer page, reset sql scripts

diff --git a/src/littlesongplace/sql/schema.sql b/src/littlesongplace/sql/schema.sql
index a85e5d30d404b2400a84d4dbe909554d38440ebe..73c620c258af45deae69bb8e57e7b0131b884450 100644 (file)
--- a/src/littlesongplace/sql/schema.sql
+++ b/src/littlesongplace/sql/schema.sql
@@ -187,5 +187,14 @@ CREATE VIEW songs_view AS
     LEFT JOIN collaborators_agg ON collaborators_agg.songid = songs.songid
     LEFT JOIN jam_events ON jam_events.eventid = songs.eventid;
 
-PRAGMA user_version = 6;
+DROP TABLE IF EXISTS users_push_subscriptions
+CREATE TABLE users_push_subscriptions (
+    subid INTEGER PRIMARY KEY,
+    userid INTEGER NOT NULL,
+    subscription TEXT NOT NULL,
+    settings INTEGER NOT NULL,
+    FOREIGN KEY(userid) REFERENCES users(userid) ON DELETE CASCADE
+);
+
+PRAGMA user_version = 7;
 

diff --git a/src/littlesongplace/sql/schema_revert.sql b/src/littlesongplace/sql/schema_revert.sql
index a1b7bc619ad70c493b072030e8ed01dff114c6f4..fcb8d5309e21f264c4dc514f58e751fc316be5d5 100644 (file)
--- a/src/littlesongplace/sql/schema_revert.sql
+++ b/src/littlesongplace/sql/schema_revert.sql
@@ -1,4 +1,3 @@
-DROP TABLE users_push_subscriptions;
 
-PRAGMA user_version = 6;
+PRAGMA user_version = 7;
 

diff --git a/src/littlesongplace/sql/schema_update.sql b/src/littlesongplace/sql/schema_update.sql
index 421a13c1d0fe32a461ba20d229190da99c7abe18..c489d9d3197aea11b2b98a9b6924076b73047de9 100644 (file)
--- a/src/littlesongplace/sql/schema_update.sql
+++ b/src/littlesongplace/sql/schema_update.sql
@@ -1,10 +1,3 @@
--- DROP TABLE IF EXISTS users_push_subscriptions
-CREATE TABLE users_push_subscriptions (
-    subid INTEGER PRIMARY KEY,
-    userid INTEGER NOT NULL,
-    subscription TEXT NOT NULL,
-    settings INTEGER NOT NULL,
-    FOREIGN KEY(userid) REFERENCES users(userid) ON DELETE CASCADE
-);
 
-PRAGMA user_version = 7;
+PRAGMA user_version = 8;
+

diff --git a/src/littlesongplace/static/dreams_importer.png b/src/littlesongplace/static/dreams_importer.png
new file mode 100644 (file)
index 0000000..b8c9944
Binary files /dev/null and b/src/littlesongplace/static/dreams_importer.png differ

diff --git a/src/littlesongplace/templates/dreams-importer.html b/src/littlesongplace/templates/dreams-importer.html
index 374e5e02e01f40fa5fa6e25b381743f12ef45fe4..f23f9b3f03f0dd5fde76d6e1992ed9017ecc9452 100644 (file)
--- a/src/littlesongplace/templates/dreams-importer.html
+++ b/src/littlesongplace/templates/dreams-importer.html
@@ -32,14 +32,17 @@ The script performs the following sequence for each song in the queue:
     <li>Upload the song to LSP</li>
 </ol>
 </p>
+<p style="text-align:center;">
+    <img src="/static/dreams_importer.png" style="width:70%;" title="Dreams importer block diagram. It looks a little like a conspiracy theorist's corkboard."><br>
+</p>
 <p>
 <i>
-(For the audio nerds: The audio is recorded through a pair of high-quality USB
-audio interfaces, one connected to the PS5 and one to my PC.  Both interfaces
-operate at 24 bits/48 kHz.  The audio signal gets converted from digital to
-analog and back again, so there will be some inherent losses in this process.
-But in general it should be better than the lossy compressed audio you get from
-most HDMI capture cards or a screen recording.)
+(For the audio nerds: The audio is recorded through a pair of USB audio
+interfaces, one connected to the PS5 and one to the PC.  Audio is recorded at
+24 bits/48 kHz.  The audio signal gets converted from digital to analog and
+back again, so there will be some inherent losses in this process. But in
+general it should be better than the lossy compressed audio you get from most
+HDMI capture cards or the built-in screen recordings.)
 </i>
 </p>
 
@@ -49,8 +52,8 @@ For best results:
     <li>Make sure your timeline doesn't loop if it isn't supposed to.</li>
     <li>If it <i>is</i> supposed to loop, use the Fade Out option in the
         importer to fade out the last 10 seconds of the recording.</li>
-    <li>I have all three audio settings in Dreams turned all the way up.  Make
-        sure your song sounds correct in this configuration.</li>
+    <li>Make sure your song sounds correct with all of the Dreams volume
+        settings turned all the way up - that's how it will be recorded.</li>
     <li>When setting the duration in the importer, make sure to leave enough
         time for any reverb/effect trails at the end.  If in doubt, add extra
         time - any extra silence at the end will be removed automatically.</li>