Fix: remove ':' and other illegal chars from filenames

twanvl · Sep 12, 2018 · d4c8fa1 · d4c8fa1
1 parent 8bdf9b6
commit d4c8fa1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### 0.3.1
 * Fix mod pages on case sensitive file systems
+* Fix invalid characters in filenames (issue #1)
 
 ### 0.3.0
 * Use BaseMod.customMonsters to also export custom monsters

diff --git a/src/main/java/sts_exporter/CardExportData.java b/src/main/java/sts_exporter/CardExportData.java
@@ -99,15 +99,11 @@ public CardExportData(AbstractCard card, String imageDir, String smallImageDir,
     }
 
     private void exportImageToDir(String imageDir, String smallImageDir) {
-        String safename = this.name;
-        safename = safename.replace(" ","");
-        safename = safename.replace("/","");
-        safename = safename.replace("+","Plus");
-        this.image = safename + ".png";
-        this.absImage = imageDir + "/" + safename + ".png";
-        this.relImage = "card-images/" + safename + ".png";
-        this.absSmallImage = smallImageDir + "/" + safename + ".png";
-        this.relSmallImage = "small-card-images/" + safename + ".png";
+        this.image = Exporter.makeFilename(this.name) + ".png";
+        this.absImage = imageDir + "/" + this.image;
+        this.relImage = "card-images/" + this.image;
+        this.absSmallImage = smallImageDir + "/" + this.image;
+        this.relSmallImage = "small-card-images/" + this.image;
         exportImageToFile(this.absImage, this.absSmallImage);
     }
 

diff --git a/src/main/java/sts_exporter/CreatureExportData.java b/src/main/java/sts_exporter/CreatureExportData.java
@@ -42,13 +42,7 @@ public CreatureExportData(AbstractCreature creature, String imageDir) {
     }
 
     private void exportImageToDir(String imageDir) {
-        String safename = creature.getClass().getSimpleName();
-        if (creature.id != null) {
-            safename = creature.id;
-        }
-        safename = safename.replace(" ","");
-        safename = safename.replace("/","");
-        this.image = safename + ".png";
+        this.image = Exporter.makeFilename(creature.id != null ? creature.id : creature.getClass().getSimpleName()) + ".png";
         this.absImage = imageDir + "/" + this.image;
         this.relImage = "creatures/" + this.image;
         exportImageToFile(this.absImage);

diff --git a/src/main/java/sts_exporter/Exporter.java b/src/main/java/sts_exporter/Exporter.java
@@ -64,6 +64,13 @@ static void mkdir(String dir) {
         f.mkdir();
     }
 
+    static String makeFilename(String id) {
+        id = id.replaceAll(":","-");
+        id = id.replace("+","Plus");
+        id = id.replace("*","Star");
+        return id.replaceAll("[\\s\\\\/:*?\"\'<>|+%]", "");
+    }
+
     public static void exportAll(String outdir) {
         logger.info("Exporting all cards to " + outdir);
         mkdir(outdir);

diff --git a/src/main/java/sts_exporter/PotionExportData.java b/src/main/java/sts_exporter/PotionExportData.java
@@ -31,12 +31,9 @@ class PotionExportData implements Comparable<PotionExportData> {
     }
 
     private void exportImageToDir(String imageDir) {
-        String safename = id;
-        safename = safename.replace(" ","");
-        safename = safename.replace("/","");
-        this.image = safename + ".png";
-        this.absImage = imageDir + "/" + safename + ".png";
-        this.relImage = "potions/" + safename + ".png";
+        this.image = Exporter.makeFilename(this.name) + ".png";
+        this.absImage = imageDir + "/" + this.image;
+        this.relImage = "potions/" + this.image;
         exportImageToFile(this.absImage);
     }
 

diff --git a/src/main/java/sts_exporter/RelicExportData.java b/src/main/java/sts_exporter/RelicExportData.java
@@ -48,9 +48,7 @@ class RelicExportData implements Comparable<RelicExportData> {
     }
 
     private void exportImageToDir(String imageDir) {
-        String safename = relic.relicId;
-        safename = safename.replace(" ","");
-        safename = safename.replace("/","");
+        String safename = Exporter.makeFilename(relic.relicId);
         this.image = safename + ".png";
         this.absImage = imageDir + "/" + this.image;
         this.relImage = "relics/" + this.image;