ConvertStopFlag, TextProgressListenerクラス削除

[coroid/inqubus.git] / frontend / src / saccubus / prompt / Prompt.java

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 74f09a4..498716b 100644 (file)
--- a/frontend/src/saccubus/prompt/Prompt.java
+++ b/frontend/src/saccubus/prompt/Prompt.java
@@ -1,6 +1,5 @@
 package saccubus.prompt;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -13,20 +12,8 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import saccubus.ConvertStopFlag;
-import saccubus.ConvertStopFlag.State;
 import saccubus.converter.Converter;
-import saccubus.converter.filegetter.LoginInfo;
-import saccubus.converter.profile.CommentGetInfo;
-import saccubus.converter.profile.Ffmpeg;
-import saccubus.converter.profile.FfmpegOption;
-import saccubus.converter.profile.GeneralSetting;
-import saccubus.converter.profile.InputFileSetting;
-import saccubus.converter.profile.OutputFileSetting;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.SFile;
-import saccubus.properties.SProperties;
-import saccubus.net.TextProgressListener;
+import saccubus.converter.classic.profile.Profile;
 
 /**
  * <p>
@@ -61,11 +48,6 @@ public class Prompt {
     }
 
     public void execute(String[] args) throws IOException {
-        execute(args, TextProgressListener.EMPTY_LISTENER, ConvertStopFlag.StateChangeListener.EMPTY_LISTENER);
-    }
-
-    public void execute(String[] args, TextProgressListener tpl, ConvertStopFlag.StateChangeListener scl) throws
-            IOException {
         Options options = createOptions(args);
         Profile profile;
         try {
@@ -79,7 +61,7 @@ public class Prompt {
             throw new IOException(e);
         }
 
-        Converter conv = new Converter("dummy", "", profile, tpl, new ConvertStopFlag(scl));
+        Converter conv = new Converter("dummy0", profile);
         ExecutorService es = Executors.newSingleThreadExecutor();
         Future<Boolean> future = es.submit((Callable<Boolean>) conv);
         try {
@@ -118,39 +100,43 @@ public class Prompt {
     }
 
     private Profile createExecuteOption(CommandLine cmd) throws IOException {
-        final String mail = "dmy";
-        final String pass = "dmy";
-        final String video = cmd.getOptionValue("file_video");
-        final String comm = cmd.getOptionValue("file_comment");
-        final String tcomm = cmd.getOptionValue("file_tcomment");
-        final String output = cmd.getOptionValue("file_output");
-        final String ff = cmd.getOptionValue("ffmpeg");
-
-        SProperties setting = SProperties.loadSetting(mail, pass);
-        Profile p = setting.toProfile();
-        GeneralSetting general = p.getGeneralSetting();
-        LoginInfo loginInfo = p.getLoginInfo();
-//        InputFileSetting videoSetting = p.getVideoSetting();
-//        InputFileSetting commentSetting = p.getCommentSetting();
-        CommentGetInfo commentGetInfo = p.getCommentGetInfo();
-//        InputFileSetting tcommentSetting = p.getTcommentSetting();
-//        OutputFileSetting outputFileSetting = p.getOutputFileSetting();
-        Ffmpeg ffmpeg = p.getFfmpeg();
-
-        FfmpegOption newFfmpegOption = new FfmpegOption(ffmpeg.getFfmpegOption().getExtOption(), "", "", ff, "");
-        InputFileSetting newVideoSetting = new InputFileSetting(new SFile(true, new File(video)), false, false);
-        InputFileSetting newCommentSetting = new InputFileSetting(new SFile(true, new File(comm)), false, false);
-        InputFileSetting newTcommentSetting = new InputFileSetting(new SFile(true, new File(tcomm)), false, false);
-        OutputFileSetting newOutputFileSetting = new OutputFileSetting(new SFile(true, new File(output)), true, false,
-                true, true);
-        Ffmpeg newFfmpeg = new Ffmpeg(ffmpeg.getFfmpeg(), ffmpeg.getVhook(), newFfmpegOption, ffmpeg.isVhookDisabled(), ffmpeg.
-                getMaxNumOfComment(), ffmpeg.getFont(), ffmpeg.getFontIndex(), ffmpeg.getShadowIndex(), ffmpeg.
-                isShowConverting(), ffmpeg.isSelfAdjustFontSize(), ffmpeg.isCommentOpaque(), ffmpeg.getNgSetting());
-
-        p = new Profile(general, loginInfo, newVideoSetting, newCommentSetting, commentGetInfo, newTcommentSetting,
-                newOutputFileSetting, newFfmpeg);
-
-        return p;
+//        final String mail = "dmy";
+//        final String pass = "dmy";
+//        final String video = cmd.getOptionValue("file_video");
+//        final String comm = cmd.getOptionValue("file_comment");
+//        final String tcomm = cmd.getOptionValue("file_tcomment");
+//        final String output = cmd.getOptionValue("file_output");
+//        final String ff = cmd.getOptionValue("ffmpeg");
+//
+//        // TODO 後で実装
+////        SProperties setting = SProperties.loadSetting(mail, pass);
+////        Profile p = setting.toProfile();
+//        Profile p = null;
+//        GeneralSetting general = p.getGeneralSetting();
+//        LoginInfo loginInfo = p.getLoginInfo();
+////        InputFileSetting videoSetting = p.getVideoSetting();
+////        InputFileSetting commentSetting = p.getCommentSetting();
+//        CommentGetInfo commentGetInfo = p.getCommentGetInfo();
+////        InputFileSetting tcommentSetting = p.getTcommentSetting();
+////        OutputFileSetting outputFileSetting = p.getOutputFileSetting();
+//        Ffmpeg ffmpeg = p.getFfmpeg();
+//
+//        FfmpegOption newFfmpegOption = new FfmpegOption(ffmpeg.getFfmpegOption().getExtOption(), "", "", ff, "", false,
+//                "", "", false);
+//        InputFileSetting newVideoSetting = new InputFileSetting(new SFile(true, new File(video)), false, false, commentGetInfo, -1);
+//        InputFileSetting newCommentSetting = new InputFileSetting(new SFile(true, new File(comm)), false, false, commentGetInfo, -1);
+//        InputFileSetting newTcommentSetting = new InputFileSetting(new SFile(true, new File(tcomm)), false, false, commentGetInfo, -1);
+//        OutputFileSetting newOutputFileSetting = new OutputFileSetting(new SFile(true, new File(output)), true, false,
+//                true, true);
+//        Ffmpeg newFfmpeg = new Ffmpeg(ffmpeg.getFfmpeg(), ffmpeg.getVhook(), newFfmpegOption, ffmpeg.isVhookDisabled(), ffmpeg.
+//                getMaxNumOfComment(), ffmpeg.getFont(), ffmpeg.getFontIndex(), ffmpeg.getShadowIndex(), ffmpeg.
+//                isShowConverting(), ffmpeg.isSelfAdjustFontSize(), ffmpeg.isCommentOpaque(), ffmpeg.getNgSetting());
+//
+//        p = new Profile(general, loginInfo, newVideoSetting, newCommentSetting, commentGetInfo, newTcommentSetting,
+//                newOutputFileSetting, newFfmpeg);
+//
+//        return p;
+        return null;
     }
 
     /**
@@ -161,9 +147,11 @@ public class Prompt {
         String pass = args[1];
         String tag = args[2];
         String time = args.length < 4 ? "" : args[3];
-        SProperties setting = SProperties.loadSetting(mail, pass);
-        Converter conv = new Converter(tag, time, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
-                ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
+        // TODO
+//        SProperties setting = SProperties.loadSetting(mail, pass);
+//        Converter conv = new Converter(tag, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
+//                ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
+        Converter conv = new Converter(tag, null/*この部分*/);
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
         System.out.println("Saccubus on CUI");
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");