デフォルト保存フォルダを変更

diff --git a/frontend/[out]comment/.gitignore b/frontend/[out]comment/.gitignore
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/frontend/[out]converted/.gitignore b/frontend/[out]converted/.gitignore
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/frontend/[out]tcomment/.gitignore b/frontend/[out]tcomment/.gitignore
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/frontend/[out]video/.gitignore b/frontend/[out]video/.gitignore
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/frontend/src/saccubus/properties/InputCommentSetting.java b/frontend/src/saccubus/properties/InputCommentSetting.java
index 027410b..6e8db98 100644 (file)
--- a/frontend/src/saccubus/properties/InputCommentSetting.java
+++ b/frontend/src/saccubus/properties/InputCommentSetting.java
@@ -51,7 +51,7 @@ public class InputCommentSetting extends InputFileSetting<Boolean> {
         boolean adjustNumOfComment = Boolean.parseBoolean(prop.getProperty(PROP_FIX_COMMENT_NUM, "true"));
         String numOfComment = prop.getProperty(PROP_BACK_COMMENT, "500");
         boolean autoNaming = Boolean.parseBoolean(prop.getProperty(PROP_COMMENT_FIX_FILE_NAME, "true"));
-        String folder = prop.getProperty(PROP_COMMENT_FOLDER, "[out]comment");
+        String folder = prop.getProperty(PROP_COMMENT_FOLDER, "out/comment");
         String file = prop.getProperty(PROP_COMMENT_FILE, "comment.xml");
 
         return new InputCommentSetting(download, autoNaming, new File(folder), new File(file), delete,

diff --git a/frontend/src/saccubus/properties/InputTcommentSetting.java b/frontend/src/saccubus/properties/InputTcommentSetting.java
index c714382..5e430de 100644 (file)
--- a/frontend/src/saccubus/properties/InputTcommentSetting.java
+++ b/frontend/src/saccubus/properties/InputTcommentSetting.java
@@ -30,7 +30,7 @@ public class InputTcommentSetting extends InputFileSetting<Boolean> {
         boolean del = Boolean.valueOf(str);
         str = prop.getProperty(PROP_AUTOFILENAME, Boolean.toString(true));
         boolean naming = Boolean.valueOf(str);
-        String dir = prop.getProperty(PROP_DIRECTORYNAME, "[out]tcomment");
+        String dir = prop.getProperty(PROP_DIRECTORYNAME, "out/commentowner");
         String f = prop.getProperty(PROP_FILENAME, "tcomment.xml");
         return new InputTcommentSetting(down, naming, dir, f, del);
     }

diff --git a/frontend/src/saccubus/properties/InputVideoSetting.java b/frontend/src/saccubus/properties/InputVideoSetting.java
index e608984..fa676e0 100644 (file)
--- a/frontend/src/saccubus/properties/InputVideoSetting.java
+++ b/frontend/src/saccubus/properties/InputVideoSetting.java
@@ -37,7 +37,7 @@ public class InputVideoSetting extends InputFileSetting<VideoSaveKind> {
     public static InputVideoSetting load(Properties prop) {
         final VideoSaveKind kind = convertVideoSaveKind(prop);
         boolean autoNaming = Boolean.parseBoolean(prop.getProperty(PROP_VIDEO_FIX_FILE_NAME, "true"));
-        String folder = prop.getProperty(PROP_VIDEO_FIX_FILE_NAME_FOLDER, "[out]video");
+        String folder = prop.getProperty(PROP_VIDEO_FIX_FILE_NAME_FOLDER, "out/movie");
         String file = prop.getProperty(PROP_VIDEO_FILE, "video.flv");
         boolean delete = Boolean.parseBoolean(prop.getProperty(PROP_DEL_VIDEO_AFTER_CONV, "false"));
         String nibrFile = prop.getProperty(PROP_NICO_BROWSER_FILE_NAME, "");

diff --git a/frontend/src/saccubus/properties/OutputVideoSetting.java b/frontend/src/saccubus/properties/OutputVideoSetting.java
index b984cd4..f539dcb 100644 (file)
--- a/frontend/src/saccubus/properties/OutputVideoSetting.java
+++ b/frontend/src/saccubus/properties/OutputVideoSetting.java
@@ -56,7 +56,7 @@ public class OutputVideoSetting extends ProcessFileSetting<Boolean> {
         String file = prop.getProperty(PROP_CONVERTED_FILE, "video.avi");
         boolean cutId = Boolean.parseBoolean(prop.getProperty(PROP_NOT_ADD_VIDEOID_CONV, "false"));
         boolean autoNaming = Boolean.parseBoolean(prop.getProperty(PROP_CONV_FIX_FILE_NAME, "true"));
-        String folder = prop.getProperty(PROP_CONV_FIX_FILE_NAME_FOLDER, "[out]converted");
+        String folder = prop.getProperty(PROP_CONV_FIX_FILE_NAME_FOLDER, "out/converted");
 
         return new OutputVideoSetting(process, autoNaming, new File(folder), new File(file), cutId, addComment,
                 addTcomment);

diff --git a/frontend/test/saccubus/SaccubusTest.java b/frontend/test/saccubus/SaccubusTest.java
index bba3011..c0786a3 100644 (file)
--- a/frontend/test/saccubus/SaccubusTest.java
+++ b/frontend/test/saccubus/SaccubusTest.java
@@ -189,7 +189,7 @@ public class SaccubusTest {
         window.tabbedPane("saveTabbedPane").selectTab("入力動画");
         window.button("showSavingVideoFileDialogButton").click();
         JFileChooserFixture chooser = JFileChooserFinder.findFileChooser().using(robot);
-        File folder = new File("F:\\docs\\NetBeansProjects\\saccubus_frontend\\[out]video\\aa.flv");
+        File folder = new File("F:\\docs\\NetBeansProjects\\saccubus_frontend\\out\\movie\\aa.flv");
         chooser.selectFile(folder).approve();
         assertThat(folder.getAbsolutePath()).isEqualTo(window.textBox("videoSavedFileField").text());
     }