merge.

[coroid/inqubus.git] / frontend / src / saccubus / converter / filegetter / FileInstanciator.java

diff --git a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
index 195cbe8..76f4635 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
@@ -5,8 +5,8 @@ import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FilenameUtils;
 import saccubus.ConvertStopFlag;
-import saccubus.converter.FileSetting;
-import saccubus.converter.Profile;
+import saccubus.converter.profile.InputFileSetting;
+import saccubus.converter.profile.Profile;
 import saccubus.net.TextProgressListener;
 
 /**
@@ -91,7 +91,7 @@ public class FileInstanciator {
         }
         String baseName = FilenameUtils.getBaseName(fileName);
         int s = baseName.indexOf(getVideoIdWithBracket());
-        return baseName.substring(s + 1);
+        return baseName.replace(getVideoIdWithBracket(), "");
     }
 
     /**
@@ -146,7 +146,7 @@ public class FileInstanciator {
         /**
          * \83t\83@\83C\83\8b\82ð\83C\83\93\83X\83^\83\93\83X\89»\82·\82é\95û\96@\82ð\8ew\92è\82·\82é\83N\83\89\83X.
          */
-        public InstanciationType(FileSetting fileSetting) {
+        public InstanciationType(InputFileSetting fileSetting) {
             this.download = fileSetting.isDownload();
             this.autoFileName = !fileSetting.getFile().isFile();
             this.initFile = fileSetting.getFile().getFile();
@@ -170,7 +170,7 @@ public class FileInstanciator {
         private final boolean autoCommentNum;
         private final int backComment;
 
-        public CommentInstanciationType(FileSetting fileSetting, boolean autoCommentNum, int backComment) {
+        public CommentInstanciationType(InputFileSetting fileSetting, boolean autoCommentNum, int backComment) {
             super(fileSetting);
             this.autoCommentNum = autoCommentNum;
             this.backComment = backComment;