Merge lp:~urbanape/bindwood/fixing-broken-migration into lp:bindwood

[Zachery Bir]

This branch fixes particularly broken migrations that got part-way finished but never completed, and so will now get into apparently infinite waits.

[Eric Casteleijn (thisfred)]

Builds, installs, and works as advertised!

review: Approve

[Martin Albisetti (beuno)]

Thanks for the quick fix. It makes it work for me, so YAY.

My only suggestion is maybe filing a bug to track those XXX's, but I don't know if it's too generic (ie "make bindwood migration more robust").

review: Approve

=== modified file 'install.rdf'
--- install.rdf	2010-04-04 14:03:38 +0000
+++ install.rdf	2010-04-14 19:10:39 +0000
@@ -4,7 +4,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>[e-mail]</em:id>
-    <em:version>1.0.3</em:version>
+    <em:version>1.0.4</em:version>
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into,

=== modified file 'modules/bindwood.jsm'
--- modules/bindwood.jsm	2010-04-02 03:29:36 +0000
+++ modules/bindwood.jsm	2010-04-14 19:10:39 +0000
@@ -340,6 +340,8 @@
             // Neither the profile root exists, nor do we have a last_seq.
             // Ergo, we are a first time user. Proceed normally.
 
+            /* Disabling the pop-up window for the time being
+
             Bindwood.statusWindow = windowService.openWindow(
                 null,
                 "chrome://bindwood/content/first-time.html",
@@ -351,12 +353,15 @@
                     var dots = div.innerHTML;
                     div.innerHTML = dots + ".";
                 } }, 1000, Ci.nsITimer.TYPE_REPEATING_SLACK);
+            */
             break;
         case 1:
             // We have a last_seq, but the profile root does not exist.
             // Ergo, we are an old user and must migrate to the new way of
             // doing things.
 
+            /* Disabling the pop-up window for the time being
+
             Bindwood.statusWindow = windowService.openWindow(
                 null,
                 "chrome://bindwood/content/migrate-old-bookmarks.html",
@@ -368,6 +373,7 @@
                     var dots = div.innerHTML;
                     div.innerHTML = dots + ".";
                 } }, 1000, Ci.nsITimer.TYPE_REPEATING_SLACK);
+            */
             // Migrate all existing records in Couch
             Bindwood.migrateOlderBookmarkRecords();
             // Ensure that all local records are pushed
@@ -379,6 +385,8 @@
             // bookmarks look like remote, and ensure that any unaccounted for
             // local bookmarks are sent to CouchDB.
 
+            /* Disabling the pop-up window for the time being
+
             Bindwood.statusWindow = windowService.openWindow(
                 null, 
                 "chrome://bindwood/content/subsequent-client-first-time-sync.html",
@@ -390,6 +398,7 @@
                     var dots = div.innerHTML;
                     div.innerHTML = dots + ".";
                 } }, 1000, Ci.nsITimer.TYPE_REPEATING_SLACK);
+            */
             // Sync all existing records in Couch and local records
             Bindwood.handleSubsequentClientFirstTimeSync();
             // Ensure that all local records are pushed
@@ -502,7 +511,11 @@
             "Let's migrate the remote records and re-sync.");
 
         var additional = [];
-        var all_docs = Bindwood.couch.allDocs();
+        var all_docs = Bindwood.couch.view("bookmarks/profile",
+            {
+                startkey: Bindwood.currentProfile,
+                endkey: Bindwood.currentProfile
+            });
         var rows = all_docs.rows;
 
         //   Pull all records from Couch, and for each:
@@ -515,9 +528,9 @@
             var doc = Bindwood.couch.open(id);
             Bindwood.writeMessage("Got a doc: " + doc);
 
-            if (!Bindwood.recordInCurrentProfile(doc)) {
+            if (doc.record_type_version >= 1) {
                 Bindwood.writeMessage(
-                    "Record isn't in our current profile. Skipping...");
+                    "Record is already migrated Skipping...");
                 continue;
             }
 
@@ -526,6 +539,7 @@
             Bindwood.writeMessage(
                 "Got the old uuid from the record: " + old_uuid);
             // look up itemId by uuid
+            // XXX: This probably needs to be made more robust
             var itemId = Bindwood.itemIdForUUID(old_uuid);
             Bindwood.writeMessage(
                 "Found its local itemID from the map: " + itemId);
@@ -581,6 +595,7 @@
             // populated, and in particular make sure that we've already
             // modified their children's annotations/uuids
             if (doc.record_type == Bindwood.TYPE_FOLDER) {
+                // XXX: This probably needs to be made more robust
                 var itemId = Bindwood.itemIdForUUID(doc._id);
                 doc.children = Bindwood.getUUIDsFromFolder(itemId);
                 Bindwood.writeMessage(
@@ -1047,9 +1062,12 @@
             Bindwood.writeError("Problem setting up repeater.", e);
         }
 
+        /* Disabling pop-up window for the time being.
+
         if (Bindwood.statusWindow) {
             Bindwood.reportDoneInWindow();
         }
+        */
     },
 
     reportDoneInWindow: function() {
@@ -1260,6 +1278,7 @@
                 " to scratch folder");
             for (var i = 0; i<local_children.length; i++) {
                 var child = local_children[i];
+                // XXX: Probably needs to be made more robust
                 var child_itemId = Bindwood.itemIdForUUID(child);
                 try {
                     bookmarksService.moveItem(
@@ -1275,6 +1294,7 @@
                 JSON.stringify(record.children) + " to this folder");
             for (var j = 0; j<record.children.length; j++) {
                 var new_child = record.children[j];
+                // XXX: Probably needs to be made more robust
                 var new_child_itemId = Bindwood.itemIdForUUID(new_child);
                 try {
                     bookmarksService.moveItem(new_child_itemId, itemId, -1);
@@ -1424,8 +1444,6 @@
                 "A new item was created. Its id is: " + aItemId +
                     " at location: " + aIndex +
                     " in folder: " + aFolder );
-            netscape.security.PrivilegeManager.enablePrivilege(
-                "UniversalBrowserRead UniversalBrowserWrite");
 
             switch (Bindwood.push) {
             case 'DISABLED':
@@ -1473,8 +1491,6 @@
                     "Deleted from local uuid map, but not saving back to Couch.");
                 break;
             case 'ENABLED':
-                netscape.security.PrivilegeManager.enablePrivilege(
-                    "UniversalBrowserRead UniversalBrowserWrite");
 
                 var doc = Bindwood.couch.open(uuid);
                 if (!doc.application_annotations) {
@@ -1553,8 +1569,6 @@
             case 'ENABLED':
                 Bindwood.writeMessage(
                     "We will push this change back to Couch.");
-                netscape.security.PrivilegeManager.enablePrivilege(
-                    "UniversalBrowserRead UniversalBrowserWrite");
                 try {
                     var result = Bindwood.updateDocAndSave(
                         uuid, aProperty.toString(), aValue.toString(),