Changeset 29

Timestamp:

07/09/08 08:12:37 (2 months ago)

Author:

simon

Message:

This is a big disruptive change and I'm only half way through it, unfortunately, so everything is broken now. Unfortunately I've got to stop now. We're moving from using playlist.songs() to playlist.items(). Currently broken: the main window; moving songs about in the playlist edit window; everything that uses playlist.songs(). Exporting needs testing.

Files:

• chrome/songbee/edit-pl.xul (modified) (6 diffs)
• chrome/songbee/export.js (modified) (1 diff)
• chrome/songbee/songbee-sql.js (modified) (3 diffs)

chrome/songbee/edit-pl.xul

@@ -85 +85 @@
-    var initial_order = new Array;
-
-songs(function (s
+items(function (i
-        var li = document.createElement("listitem");
-        li.setAttribute("onmousedown", "myDragAndDrop.startDrag(event,liObserver);");
-
-
+
+
+
+
+
-        target.appendChild(li);
-li.songI
+i._i
-    });
-
@@ -97 +100 @@
-var dragging = 0;
-var dragSetup = 0;
-
-function jsdump(str)
-{
-  Components.classes['@mozilla.org/consoleservice;1']
-            .getService(Components.interfaces.nsIConsoleService)
-            .logStringMessage(str);
-}
-
-function beginToDrag (t) {
@@ -123 +119 @@
-
-function doTreeDoubleClick() {
-"", selectedSong()
-
-
-item, song
+selectedSong(), "song", ""
+
+
+song, type, data
-    // Convert to listitem
-
-
-
-
+
-    li.setAttribute("onmousedown", "myDragAndDrop.startDrag(event,liObserver);");
-
-
-
+
+
+
+
+
+
+
+
+
+
-    target.appendChild(li);
-}
@@ -151 +151 @@
-    var newElem = document.createElement("listitem");
-    newElem.setAttribute("label", dragging.label);
-    newElem.songId = dragging.songId
+       for (var a in ["piSong", "piData", "piType"]) newElem[a] = dragging[a]
-    newElem.setAttribute("onmousedown", "myDragAndDrop.startDrag(event,liObserver);");
-    dragSetup = 0;
@@ -182 +182 @@
-    if (children.length != initial_order.length) return 1;
-    for (var i =0; i < children.length; i++) {
-
+
+
-    }
-    return 0;
@@ -204 +205 @@
-    pl.tidy_up();
-    for (var i =0; i < target.childNodes.length; i++) {
-song = target.childNodes[i].songId;
-song, i+1
-    window.arguments[1].setup();
-
+node = target.childNodes[i]
+node.piSong, i+1, node.piType, node.piData
+}
+
-}
-

chrome/songbee/export.js

@@ -27 +27 @@
-    var stylesheet = getXSLT();
-
-
-
-
+
+
-        song_place.appendChild(head);
-frag
+i.transformToHTML(stylesheet, save)
-    });
-    var serializer = new XMLSerializer();

chrome/songbee/songbee-sql.js

@@ -35 +35 @@
-        doSQLStatement("INSERT INTO songbee_system (schema_version) VALUES (2.0)");
-        doSQLStatement("ALTER TABLE play_item ADD COLUMN type");
+        doSQLStatement("UPDATE play_item SET type='song'");
-        doSQLStatement("ALTER TABLE play_item ADD COLUMN data");
-        doSQLStatement("ALTER TABLE playlist ADD COLUMN css");
@@ -131 +132 @@
-
-function doSQLStatement(sql, params) {
-
+
+
-    if (params) {
-        for (var i =0; i < params.length; i++) 
@@ -159 +161 @@
-}
-
-Playlist.prototype.songs = function (callback) {
-    return doSQL("SELECT song.id, song_key, title, first_line, xml FROM song, play_item WHERE play_item.playlist = "+this._id+" AND play_item.song = song.id ORDER BY play_item.position ", Song, callback);
-};
-
-Playlist.prototype.tidy_up = function () {
-    doSQLStatement("DELETE FROM play_item WHERE playlist= (?1)", [this._id]);
-};
-
-Playlist.prototype.add_item = function(song, position) {
-    doSQLStatement("INSERT INTO play_item (playlist, song, position) VALUES ((?1), (?2), (?3))", [this._id, song, position]);
-};
-
-Song.prototype.xmlDOM = function () {
-    var parsed = (new DOMParser()).parseFromString(this.xml(), "text/xml");
-    return parsed;
-};
+
+Playlist.prototype.items = function (callback) {
+    return doSQL("SELECT id, playlist, song, position, type, data FROM play_item WHERE play_item.playlist = "+this._id+" ORDER BY position ", PlayItem, function (pi) { pi.specialize(); if (callback) callback(pi); });
+};
+
+Playlist.prototype.tidy_up = function () {
+    doSQLStatement("DELETE FROM play_item WHERE playlist= (?1)", [this._id]);
+};
+
+Playlist.prototype.add_item = function(song, position, type, data) {
+        if (!type) type = "song";
+        if (!data) data = "";
+        if (type == "song" and !song) { alert("Bug: No song ID given for song item."); return; }
+    doSQLStatement("INSERT INTO play_item (playlist, song, position, type, data) VALUES ((?1), (?2), (?3),(?4),(?5))", [this._id, song, position, type, data]);
+};
+
+PlayItem.prototype.song = function() {
+        if (!this.type == "song") { alert("Bug: song called on playitem "+this._id+" which has type ["+this.type+"]"); }
+        var songlist = doSQL("SELECT song.id, song_key, title, first_line, xml FROM song  WHERE id = "+this._song, Song);
+        if (songlist.length < 1 )  { alert("Retrieving song not in database: has it been deleted?"); }
+        return songlist[0]
+}
+
+/* PlayItem function dispatchers. We are faking specialization here. */
+
+var PlayItemDispatchers = {
+        transformToHTML: {
+                song: function (stylesheet, doc) { return transformDOM(this.song().xmlDOM(), stylesheet, doc) },
+                fallback: function () { return "<p>[Don't know how to transform object of type "+this.type+"]</p>" }
+        },
+        title: {
+                song: function () { return this.song().title() },
+                fallback: function() { return "[PlayItem "+this._id+"/"+this.type()+"]" }
+        }
+};
+
+PlayItem.prototype.specialize = function () {
+        for (var handle in PlayItemDispatchers) {
+                this[handle] = PlayItemDispatchers[handle][this.type()] || PlayItemDispatchers[handle]["fallback"];
+        }
+}