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

Factor out filename check

Browse source
This commit is contained in:
Matthias Schiffer 2015-02-02 04:47:40 +01:00
parent 213124ec57
commit 8bdbfd3ec0
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/MinedMap.cpp
View file

@ -33,6 +33,7 @@
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>
#include <set>
#include <system_error> #include <system_error>
#include <sys/types.h> #include <sys/types.h>
@ -138,6 +139,20 @@ static void doRegion(const std::string &input, const std::string &output) {
} }
} }
static bool checkFilename(const char *name, int *x, int *z) {
if (std::sscanf(name, "r.%i.%i.mca", x, z) != 2)
return false;
size_t l = strlen(name) + 1;
char buf[l];
std::snprintf(buf, l, "r.%i.%i.mca", *x, *z);
if (std::memcmp(name, buf, l))
return false;
return true;
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
if (argc < 3) { if (argc < 3) {
std::fprintf(stderr, "Usage: %s <data directory> <output directory>\n", argv[0]); std::fprintf(stderr, "Usage: %s <data directory> <output directory>\n", argv[0]);
@ -155,32 +170,24 @@ int main(int argc, char *argv[]) {
return 1; return 1;
} }
std::set<std::pair<int, int>> regions;
int minX = INT_MAX, maxX = INT_MIN, minZ = INT_MAX, maxZ = INT_MIN; int minX = INT_MAX, maxX = INT_MIN, minZ = INT_MAX, maxZ = INT_MIN;
struct dirent *entry; struct dirent *entry;
while ((entry = readdir(dir)) != nullptr) { while ((entry = readdir(dir)) != nullptr) {
int x, z; int x, z;
if (std::sscanf(entry->d_name, "r.%i.%i.mca", &x, &z) == 2) { if (!checkFilename(entry->d_name, &x, &z))
size_t l = strlen(entry->d_name) + 1; continue;
char buf[l];
std::snprintf(buf, l, "r.%i.%i.mca", x, z);
if (std::memcmp(entry->d_name, buf, l))
continue;
if (x < minX) if (x < minX) minX = x;
minX = x; if (x > maxX) maxX = x;
if (x > maxX) if (z < minZ) minZ = z;
maxX = x; if (z > maxZ) maxZ = z;
if (z < minZ) regions.insert(std::make_pair(x, z));
minZ = z;
if (z > maxZ)
maxZ = z;
std::string name(entry->d_name); std::string name(entry->d_name);
doRegion(inputdir + "/" + name, outputdir + "/" + name.substr(0, name.length()-3) + "png");
doRegion(inputdir + "/" + name, outputdir + "/" + name.substr(0, name.length()-3) + "png");
}
} }
closedir(dir); closedir(dir);