X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=2a1a3ec345e5b65e85279bae23234da2ed97f801;hb=7a8e465114815815796c2ebbe5f2e018a9265a3f;hp=68eeaccf0cd1267159d239005ce76870d7b1e6a6;hpb=08064fe872e3dd46ce0850b82fc535944f9bd0c2;p=rocksndiamonds.git

diff --git a/src/tape.c b/src/tape.c
index 68eeaccf..2a1a3ec3 100644
--- 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)
@@ -1535,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();
     }
@@ -1607,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)
@@ -1662,6 +1668,41 @@ static int AutoPlayTapesExt(boolean initialize)
       init_level_set = FALSE;
     }
 
+    if (autoplay.all_levelsets && global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+    {
+      boolean skip_levelset = FALSE;
+
+      if (!directoryExists(getTapeDir(autoplay.leveldir->subdir)))
+      {
+	Print("No tape directory for this level set found -- skipping.\n");
+
+	skip_levelset = TRUE;
+      }
+
+      if (CheckTapeDirectoryUploadsComplete(autoplay.leveldir->subdir))
+      {
+	Print("All tapes for this level set already uploaded -- skipping.\n");
+
+	skip_levelset = TRUE;
+      }
+
+      if (skip_levelset)
+      {
+	PrintTapeReplaySummary(&autoplay);
+
+	// continue with next level set
+	autoplay.leveldir = getNextValidAutoPlayEntry(autoplay.leveldir);
+
+	// all level sets processed
+	if (autoplay.leveldir == NULL)
+	  break;
+
+	init_level_set = TRUE;
+
+	continue;
+      }
+    }
+
     if (global.autoplay_mode != AUTOPLAY_MODE_FIX || patch_nr == 0)
       level_nr = autoplay.level_nr++;
 
@@ -1675,6 +1716,9 @@ static int AutoPlayTapesExt(boolean initialize)
       if (!autoplay.all_levelsets)
 	break;
 
+      if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD)
+	MarkTapeDirectoryUploadsAsComplete(autoplay.leveldir->subdir);
+
       // continue with next level set
       autoplay.leveldir = getNextValidAutoPlayEntry(autoplay.leveldir);
 
@@ -1696,12 +1740,8 @@ static int AutoPlayTapesExt(boolean initialize)
     if (!global.autoplay_all && !global.autoplay_level[level_nr])
       continue;
 
-    char *tape_filename = (autoplay.tape_filename ? autoplay.tape_filename :
-                           options.mytapes ? getTapeFilename(level_nr) :
-                           getSolutionTapeFilename(level_nr));
-
-    // speed things up in case of missing tapes (by skipping loading level)
-    if (!fileExists(tape_filename))
+    // speed things up in case of missing private tapes (skip loading level)
+    if (options.mytapes && !fileExists(getTapeFilename(level_nr)))
     {
       autoplay.num_tape_missing++;
 
@@ -1739,7 +1779,7 @@ static int AutoPlayTapesExt(boolean initialize)
     {
       autoplay.num_tape_missing++;
 
-      Print("Tape %03d: (invalid tape)\n", level_nr);
+      Print("Tape %03d: (no tape found)\n", level_nr);
 
       continue;
     }
@@ -1827,9 +1867,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);
@@ -1837,6 +1877,13 @@ static int AutoPlayTapesExt(boolean initialize)
       // required for uploading multiple tapes
       autoplay.tape_filename = NULL;
 
+      if (!success)
+      {
+	num_tapes = -num_tapes;
+
+	break;
+      }
+
       continue;
     }
 
@@ -1857,7 +1904,12 @@ static int AutoPlayTapesExt(boolean initialize)
   {
     Print("\n");
     PrintLine("=", 79);
-    Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+
+    if (num_tapes >= 0)
+      Print("SUMMARY: %d tapes uploaded.\n", num_tapes);
+    else
+      Print("SUMMARY: Uploading tapes failed.\n");
+
     PrintLine("=", 79);
   }