Support schedule.db in disorder-dump

diff --git a/server/dump.c b/server/dump.c
index 18a2f6ee8816665f096d8cb8d2e5f61e79ae7987..7b4b3a49a90eb02b7c8e241d5d275d747a0bb9e1 100644 (file)
--- a/server/dump.c
+++ b/server/dump.c
@@ -152,6 +152,24 @@ static void do_dump(FILE *fp, const char *tag,
     }
     if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
     cursor = 0;
     }
     if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
     cursor = 0;

+
+    /* dump the schedule */
+    cursor = trackdb_opencursor(trackdb_scheduledb, tid);
+    err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+                        DB_FIRST);
+    while(err == 0) {
+      if(fputc('W', fp) < 0
+         || urlencode(s, k.data, k.size)
+         || fputc('\n', fp) < 0
+         || urlencode(s, d.data, d.size)
+         || fputc('\n', fp) < 0)
+        fatal(errno, "error writing to %s", tag);
+      err = cursor->c_get(cursor, prepare_data(&k), prepare_data(&d),
+                          DB_NEXT);
+    }
+    if(trackdb_closecursor(cursor)) { cursor = 0; goto fail; }
+    cursor = 0;
+    

     
     if(tracksdb) {
       cursor = trackdb_opencursor(trackdb_tracksdb, tid);
     
     if(tracksdb) {
       cursor = trackdb_opencursor(trackdb_tracksdb, tid);


@@ -298,6 +316,7 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
   if((err = truncdb(tid, trackdb_searchdb))) return err;
   if((err = truncdb(tid, trackdb_tagsdb))) return err;
   if((err = truncdb(tid, trackdb_usersdb))) return err;
   if((err = truncdb(tid, trackdb_searchdb))) return err;
   if((err = truncdb(tid, trackdb_tagsdb))) return err;
   if((err = truncdb(tid, trackdb_usersdb))) return err;

+  if((err = truncdb(tid, trackdb_scheduledb))) return err;

   c = getc(fp);
   while(!ferror(fp) && !feof(fp)) {
     switch(c) {
   c = getc(fp);
   while(!ferror(fp) && !feof(fp)) {
     switch(c) {


@@ -311,6 +330,7 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
     case 'P':
     case 'G':
     case 'U':
     case 'P':
     case 'G':
     case 'U':

+    case 'W':

       switch(c) {
       case 'P':
        which_db = trackdb_prefsdb;
       switch(c) {
       case 'P':
        which_db = trackdb_prefsdb;


@@ -324,13 +344,17 @@ static int undump_from_fp(DB_TXN *tid, FILE *fp, const char *tag) {
        which_db = trackdb_usersdb;
        which_name = "users.db";
        break;
        which_db = trackdb_usersdb;
        which_name = "users.db";
        break;

+      case 'W':                                /* for 'when' */
+       which_db = trackdb_scheduledb;
+       which_name = "scheduledb.db";
+       break;

       default:
        abort();
       }
       if(undump_dbt(fp, tag, prepare_data(&k))
          || undump_dbt(fp, tag, prepare_data(&d)))
         break;
       default:
        abort();
       }
       if(undump_dbt(fp, tag, prepare_data(&k))
          || undump_dbt(fp, tag, prepare_data(&d)))
         break;

-      switch(err = trackdb_prefsdb->put(which_db, tid, &k, &d, 0)) {
+      switch(err = which_db->put(which_db, tid, &k, &d, 0)) {

       case 0:
         break;
       case DB_LOCK_DEADLOCK:
       case 0:
         break;
       case DB_LOCK_DEADLOCK:

diff --git a/tests/schedule.py b/tests/schedule.py
index 178871f04315ddb833aead3027c681b167ff7160..fe3c5c3ffe2698591717a813c7de932d0c158b3a 100755 (executable)
--- a/tests/schedule.py
+++ b/tests/schedule.py
@@ -175,6 +175,13 @@ def test():
     print " checking scheduled events survive restarts"
     c.schedule_add(now + 4, "normal", "play", track)
     dtest.stop_daemon()
     print " checking scheduled events survive restarts"
     c.schedule_add(now + 4, "normal", "play", track)
     dtest.stop_daemon()

+    print " dumping database"
+    dump = "%s/dumpfile" % dtest.testroot
+    print dtest.command(["disorder-dump", "--config", disorder._configfile,
+                         "--dump", dump])
+    print "restoring database"
+    print dtest.command(["disorder-dump", "--config", disorder._configfile,
+                         "--undump", dump])

     dtest.start_daemon()
     c = disorder.client()
     print " waiting for track to play"
     dtest.start_daemon()
     c = disorder.client()
     print " waiting for track to play"