ファイル名の禁則文字置換ルールをコンフィグへ定義

[coroid/NicoBrowser.git] / src / nicobrowser / Config.java

diff --git a/src/nicobrowser/Config.java b/src/nicobrowser/Config.java
index fd11219..d5c895e 100644 (file)
--- a/src/nicobrowser/Config.java
+++ b/src/nicobrowser/Config.java
@@ -57,7 +57,9 @@ public final class Config {
     private static final File FEEDURL_FILE = new File(APP_HOME, FEEDURL_NAME);
     public static final String P_PATH_DB = "path.db";
     public static final String P_PATH_SAVEFILE = "path.savefile";
-    public static final String P_SAVEFILE_PATTERN = "savefile.pattern";
+    public static final String P_SAVEFILE_PATTERN = "savefilename.pattern";
+    public static final String P_SAVEFILE_REPLACE_FROM = "savefilename.replace.from";
+    public static final String P_SAVEFILE_REPLACE_TO = "savefilename.replace.to";
     public static final String P_FILE_ENCODING = "encoding";
     public static final String P_NICOVIDEO_MAIL = "nicovideo.mail";
     public static final String P_NICOVIDEO_PASSWORD = "nicovideo.password";
@@ -110,6 +112,8 @@ public final class Config {
         updatePropertyValue(p, P_PATH_DB);
         updatePropertyValue(p, P_PATH_SAVEFILE);
         updatePropertyValue(p, P_SAVEFILE_PATTERN);
+        updatePropertyValue(p, P_SAVEFILE_REPLACE_FROM);
+        updatePropertyValue(p, P_SAVEFILE_REPLACE_TO);
 
         updatePropertyValue(p, P_DOWNLOAD_RETRY);
         updatePropertyValue(p, P_DOWNLOAD_WAIT);
@@ -159,6 +163,8 @@ public final class Config {
         props.add(savepath);
 
         props.add(P_SAVEFILE_PATTERN + "={title}");
+        props.add(P_SAVEFILE_REPLACE_FROM + "=\\/\\\\:*?\"<>|.");
+        props.add(P_SAVEFILE_REPLACE_TO + "=_");
 
         props.add(P_FILE_ENCODING + "=" + System.getProperty("file.encoding"));
 
@@ -237,6 +243,14 @@ public final class Config {
         return properties.getString(P_SAVEFILE_PATTERN, "{title}");
     }
 
+    public String getFileNameReplaceFrom(){
+        return properties.getString(P_SAVEFILE_REPLACE_FROM, "=\\/\\\\:*?\"<>|.");
+    }
+
+    public String getFileNameReplaceTo(){
+        return properties.getString(P_SAVEFILE_REPLACE_TO, "_");
+    }
+
     /** @return feedurl.txtの文字エンコーディング. */
     public String getEncoding() {
         String res = properties.getString(P_FILE_ENCODING, System.getProperty("file.encoding"));