Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor MapInfoRetriever, stop using FileUtils from commons

Browse Source
This commit is contained in:
P0nk
2022-08-11 00:52:51 +02:00
parent 28bc5ee925
commit 7aba5f4578
1 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/tools/mapletools/MapInfoRetriever.java
View File

@@ -1,14 +1,14 @@
package tools.mapletools; package tools.mapletools;
import org.apache.commons.io.FileUtils;
import provider.wz.WZFiles; import provider.wz.WZFiles;
import java.io.*; import java.io.BufferedReader;
import java.nio.charset.StandardCharsets; import java.io.IOException;
import java.io.PrintWriter;
import java.io.UncheckedIOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
/** /**
@@ -21,7 +21,6 @@ public class MapInfoRetriever {
private static final Path OUTPUT_FILE = ToolConstants.getOutputFile("map_info_report.txt"); private static final Path OUTPUT_FILE = ToolConstants.getOutputFile("map_info_report.txt");
private static final List<Integer> missingInfo = new ArrayList<>(); private static final List<Integer> missingInfo = new ArrayList<>();
private static BufferedReader bufferedReader = null;
private static byte status = 0; private static byte status = 0;
private static boolean hasInfo; private static boolean hasInfo;
@@ -41,11 +40,11 @@ public class MapInfoRetriever {
return (d.trim()); return (d.trim());
} }
private static void forwardCursor(int st) { private static void forwardCursor(BufferedReader reader, int st) {
String line = null; String line = null;
try { try {
while (status >= st && (line = bufferedReader.readLine()) != null) { while (status >= st && (line = reader.readLine()) != null) {
simpleToken(line); simpleToken(line);
} }
} catch (Exception e) { } catch (Exception e) {
@@ -61,7 +60,7 @@ public class MapInfoRetriever {
} }
} }
private static boolean translateToken(String token) { private static boolean translateToken(BufferedReader reader, String token) {
String d; String d;
int temp; int temp;
@@ -76,7 +75,7 @@ public class MapInfoRetriever {
} }
temp = status; temp = status;
forwardCursor(temp); forwardCursor(reader, temp);
} }
status += 1; status += 1;
@@ -86,45 +85,40 @@ public class MapInfoRetriever {
} }
private static void searchMapDirectory(int mapArea) { private static void searchMapDirectory(int mapArea) {
final File mapDirectory = new File(WZFiles.MAP.getFilePath() + "/Map/Map" + mapArea); final Path mapDirectory = Path.of(WZFiles.MAP.getFilePath() + "/Map/Map" + Integer.toString(mapArea));
System.out.println("Parsing map area " + mapArea);
try { try {
Iterator<File> iter = FileUtils.iterateFiles(mapDirectory, new String[]{"xml"}, true); Files.walk(mapDirectory)
System.out.println("Parsing map area " + mapArea); .filter(MapInfoRetriever::isRelevantFile)
.forEach(MapInfoRetriever::searchMapFile);
while (iter.hasNext()) { } catch (UncheckedIOException | IOException e) {
File file = iter.next(); System.err.println("Directory " + mapDirectory.getFileName().toString() + " does not exist");
searchMapFile(file);
}
} catch (UncheckedIOException e) {
System.err.println("Directory " + mapDirectory.getPath() + " does not exist");
} }
} }
private static void searchMapFile(File file) { private static boolean isRelevantFile(Path file) {
return file.getFileName().toString().endsWith(".xml");
}
private static void searchMapFile(Path file) {
// This will reference one line at a time // This will reference one line at a time
String line = null; String line = null;
try { try (BufferedReader reader = Files.newBufferedReader(file)) {
InputStreamReader fileReader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8);
bufferedReader = new BufferedReader(fileReader);
hasInfo = false; hasInfo = false;
status = 0; status = 0;
while ((line = bufferedReader.readLine()) != null) { while ((line = reader.readLine()) != null) {
if (translateToken(line)) { if (translateToken(reader, line)) {
break; break;
} }
} }
if (!hasInfo) { if (!hasInfo) {
missingInfo.add(Integer.valueOf(file.getName().split(".img.xml")[0])); missingInfo.add(Integer.valueOf(file.getFileName().toString().split(".img.xml")[0]));
} }
bufferedReader.close();
fileReader.close();
} catch (IOException ex) { } catch (IOException ex) {
System.out.println("Error reading file '" + file.getName() + "'"); System.out.println("Error reading file '" + file.getFileName().toString() + "'");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }