fixed speedup for missing tapes when auto-playing/testing/uploading

[rocksndiamonds.git] / src / tape.c

diff --git a/src/tape.c b/src/tape.c
index cf65474af537c6af772c7ab44f81eaac952222fb..03ecf68944bc6cec9726be31cd6e6ff808d70b49 100644 (file)
--- a/src/tape.c
+++ b/src/tape.c
@@ -1400,7 +1400,7 @@ static void AutoPlayTapes_SetScoreEntry(int score, int time)
   server_scores.uploaded = FALSE;
 }
 
-static void AutoPlayTapes_WaitForUpload(void)
+static boolean AutoPlayTapes_WaitForUpload(void)
 {
   unsigned int upload_delay = 0;
   unsigned int upload_delay_value = 10000;
@@ -1415,7 +1415,10 @@ static void AutoPlayTapes_WaitForUpload(void)
       PrintNoLog("\r");
       Print("- uploading score tape to score server - TIMEOUT.\n");
 
-      Fail("cannot upload score tape to score server");
+      if (program.headless)
+       Fail("cannot upload score tape to score server");
+
+      return FALSE;
     }
 
     UPDATE_BUSY_STATE();
@@ -1425,6 +1428,8 @@ static void AutoPlayTapes_WaitForUpload(void)
 
   PrintNoLog("\r");
   Print("- uploading score tape to score server - uploaded.\n");
+
+  return TRUE;
 }
 
 static int AutoPlayTapesExt(boolean initialize)
@@ -1464,7 +1469,9 @@ static int AutoPlayTapesExt(boolean initialize)
 
     -1
   };
+  LevelDirTree *leveldir_current_last = leveldir_current;
   boolean init_level_set = FALSE;
+  int level_nr_last = level_nr;
   int i;
 
   if (!initialize)
@@ -1533,7 +1540,7 @@ static int AutoPlayTapesExt(boolean initialize)
       // * solution tape may have native format (like Supaplex solution files)
 
       SaveScoreTape(level_nr);
-      SaveServerScore(level_nr);
+      SaveServerScore(level_nr, TRUE);
 
       AutoPlayTapes_WaitForUpload();
     }
@@ -1605,6 +1612,7 @@ static int AutoPlayTapesExt(boolean initialize)
         global.autoplay_level[tape.level_nr] = TRUE;
 
       global.autoplay_all = FALSE;
+      options.mytapes = FALSE;
     }
 
     if (autoplay.all_levelsets)
@@ -1694,6 +1702,16 @@ static int AutoPlayTapesExt(boolean initialize)
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
+    // speed things up in case of missing private tapes (skip loading level)
+    if (options.mytapes && !fileExists(getTapeFilename(level_nr)))
+    {
+      autoplay.num_tape_missing++;
+
+      Print("Tape %03d: (no tape found)\n", level_nr);
+
+      continue;
+    }
+
     TapeErase();
     TapeRewind();      // needed to reset "tape.auto_play_level_solved"
 
@@ -1811,9 +1829,9 @@ static int AutoPlayTapesExt(boolean initialize)
        }
       }
 
-      SaveServerScoreFromFile(level_nr, autoplay.tape_filename);
+      SaveServerScoreFromFile(level_nr, TRUE, autoplay.tape_filename);
 
-      AutoPlayTapes_WaitForUpload();
+      boolean success = AutoPlayTapes_WaitForUpload();
 
       if (use_temporary_tape_file)
         unlink(autoplay.tape_filename);
@@ -1821,6 +1839,13 @@ static int AutoPlayTapesExt(boolean initialize)
       // required for uploading multiple tapes
       autoplay.tape_filename = NULL;
 
+      if (!success)
+      {
+       num_tapes = -1;
+
+       break;
+      }
+
       continue;
     }
 
@@ -1837,12 +1862,30 @@ static int AutoPlayTapesExt(boolean initialize)
     return num_tapes;
   }
 
+  if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+  {
+    Print("\n");
+    PrintLine("=", 79);
+
+    if (num_tapes >= 0)
+      Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+    else
+      Print("SUMMARY: Uploading tapes failed.\n");
+
+    PrintLine("=", 79);
+  }
+
   // clear timestamp for batch tape upload (required after interactive upload)
   global.autoplay_time = 0;
 
-  if (program.headless)
+  // exit if running headless or if visually auto-playing tapes
+  if (program.headless || global.autoplay_mode != AUTOPLAY_MODE_UPLOAD)
     CloseAllAndExit(0);
 
+  // when running interactively, restore last selected level set and number
+  leveldir_current = leveldir_current_last;
+  level_nr = level_nr_last;
+
   return num_tapes;
 }