X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftape.c;h=2a1a3ec345e5b65e85279bae23234da2ed97f801;hb=7a8e465114815815796c2ebbe5f2e018a9265a3f;hp=62cb3e0d102785f5d5dec5c879c9ce55bddecd65;hpb=ec32314a7ce9f3ac478d7fdecf85ed949816bdc1;p=rocksndiamonds.git diff --git a/src/tape.c b/src/tape.c index 62cb3e0d..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,11 +1428,14 @@ static void AutoPlayTapes_WaitForUpload(void) PrintNoLog("\r"); Print("- uploading score tape to score server - uploaded.\n"); + + return TRUE; } -static void AutoPlayTapesExt(boolean initialize) +static int AutoPlayTapesExt(boolean initialize) { static struct AutoPlayInfo autoplay; + static int num_tapes = 0; static int patch_nr = 0; static char *patch_name[] = { @@ -1463,7 +1469,9 @@ static void 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) @@ -1528,10 +1536,11 @@ static void AutoPlayTapesExt(boolean initialize) // save score tape to upload to server; may be required for some reasons: // * level set identifier in solution tapes may differ from level set + // * level set identifier is missing (old-style tape without INFO chunk) // * solution tape may have native format (like Supaplex solution files) SaveScoreTape(level_nr); - SaveServerScore(level_nr); + SaveServerScore(level_nr, TRUE); AutoPlayTapes_WaitForUpload(); } @@ -1577,22 +1586,33 @@ static void AutoPlayTapesExt(boolean initialize) { autoplay.tape_filename = global.autoplay_leveldir; + if (!fileExists(autoplay.tape_filename)) + Fail("tape file '%s' does not exist", autoplay.tape_filename); + LoadTapeFromFilename(autoplay.tape_filename); if (tape.no_valid_file) - { - if (!fileExists(autoplay.tape_filename)) - Fail("tape file '%s' does not exist", autoplay.tape_filename); - else - Fail("cannot load tape file '%s'", autoplay.tape_filename); - } + Fail("cannot load tape file '%s'", autoplay.tape_filename); + + if (tape.no_info_chunk && !options.identifier) + Fail("cannot get levelset from tape file '%s'", autoplay.tape_filename); + + if (tape.no_info_chunk && !options.level_nr) + Fail("cannot get level nr from tape file '%s'", autoplay.tape_filename); global.autoplay_leveldir = tape.level_identifier; + if (options.identifier != NULL) + global.autoplay_leveldir = options.identifier; + + if (options.level_nr != NULL) + tape.level_nr = atoi(options.level_nr); + if (tape.level_nr >= 0 && tape.level_nr < MAX_TAPES_PER_SET) global.autoplay_level[tape.level_nr] = TRUE; global.autoplay_all = FALSE; + options.mytapes = FALSE; } if (autoplay.all_levelsets) @@ -1614,6 +1634,11 @@ static void AutoPlayTapesExt(boolean initialize) if (global.autoplay_mode == AUTOPLAY_MODE_FIX) options.mytapes = TRUE; + // set timestamp for batch tape upload + global.autoplay_time = time(NULL); + + num_tapes = 0; + init_level_set = TRUE; } @@ -1643,6 +1668,41 @@ static void 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++; @@ -1656,6 +1716,9 @@ static void 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); @@ -1677,6 +1740,16 @@ static void 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" @@ -1768,6 +1841,8 @@ static void AutoPlayTapesExt(boolean initialize) } } + num_tapes++; + if (global.autoplay_mode == AUTOPLAY_MODE_UPLOAD) { boolean use_temporary_tape_file = FALSE; @@ -1783,7 +1858,7 @@ static void AutoPlayTapesExt(boolean initialize) if (!fileExists(autoplay.tape_filename)) { - // non-standard solution tape -- save to temporary file + // non-standard or incorrect solution tape -- save to temporary file autoplay.tape_filename = getTemporaryTapeFilename(); SaveTapeToFilename(autoplay.tape_filename); @@ -1792,9 +1867,9 @@ static void 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); @@ -1802,6 +1877,13 @@ static void AutoPlayTapesExt(boolean initialize) // required for uploading multiple tapes autoplay.tape_filename = NULL; + if (!success) + { + num_tapes = -num_tapes; + + break; + } + continue; } @@ -1815,21 +1897,44 @@ static void AutoPlayTapesExt(boolean initialize) autoplay.last_level_nr = level_nr; - return; + return num_tapes; } - if (program.headless) + 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; + + // 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; } -void AutoPlayTapes(void) +int AutoPlayTapes(void) { - AutoPlayTapesExt(TRUE); + return AutoPlayTapesExt(TRUE); } -void AutoPlayTapesContinue(void) +int AutoPlayTapesContinue(void) { - AutoPlayTapesExt(FALSE); + return AutoPlayTapesExt(FALSE); }