neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-06 01:54:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split getModTime() out of checkRegion()

Browse source
This commit is contained in:
Matthias Schiffer 2020-06-19 20:43:01 +02:00
parent f539d668eb
commit 2f0d1892f4
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/MinedMap.cpp
View file

@ -119,38 +119,43 @@ static void writeImage(const std::string &output, const uint8_t *data, PNG::Form
} }
} }
static int64_t checkRegion(const std::string &input, const std::string &output) { static int64_t getModTime(const std::string &file) {
struct stat s; struct stat s;
if (stat(file.c_str(), &s) < 0) {
if (stat(input.c_str(), &s) < 0) {
if (errno != ENOENT) if (errno != ENOENT)
std::fprintf(stderr, "Unable to stat %s: %s\n", input.c_str(), std::strerror(errno)); std::fprintf(stderr, "Unable to stat %s: %s\n", file.c_str(), std::strerror(errno));
return INT64_MIN; return INT64_MIN;
} }
#ifdef _WIN32 #ifdef _WIN32
int64_t intime = (int64_t)s.st_mtime * 1000000; return (int64_t)s.st_mtime * 1000000;
#else #else
int64_t intime = (int64_t)s.st_mtim.tv_sec * 1000000 + s.st_mtim.tv_nsec / 1000; return (int64_t)s.st_mtim.tv_sec * 1000000 + s.st_mtim.tv_nsec / 1000;
#endif #endif
if (stat(output.c_str(), &s) < 0)
return intime;
int64_t outtime = readStamp(output);
if (intime <= outtime) {
std::printf("%s is up-to-date.\n", output.c_str());
return INT64_MIN;
} }
return intime; static bool checkRegion(int64_t changed, const std::string &file) {
struct stat s;
if (stat(file.c_str(), &s) < 0)
return true;
int64_t outtime = readStamp(file);
if (changed <= outtime) {
std::printf("%s is up-to-date.\n", file.c_str());
return false;
}
return true;
} }
static void doRegionBiome(const std::string &input, const std::string &output) { static void doRegionBiome(const std::string &input, const std::string &output) {
int64_t intime = checkRegion(input, output); int64_t intime = getModTime(input);
if (intime == INT64_MIN) if (intime == INT64_MIN)
return; return;
if (!checkRegion(intime, output))
return;
std::printf("Generating %s from %s...\n", output.c_str(), input.c_str()); std::printf("Generating %s from %s...\n", output.c_str(), input.c_str());
try { try {
@ -166,10 +171,13 @@ static void doRegionBiome(const std::string &input, const std::string &output) {
} }
static void doRegion(const std::string &input, const std::string &output, const std::string &output_light) { static void doRegion(const std::string &input, const std::string &output, const std::string &output_light) {
int64_t intime = checkRegion(input, output); int64_t intime = getModTime(input);
if (intime == INT64_MIN) if (intime == INT64_MIN)
return; return;
if (!checkRegion(intime, output))
return;
std::printf("Generating %s from %s...\n", output.c_str(), input.c_str()); std::printf("Generating %s from %s...\n", output.c_str(), input.c_str());
try { try {