import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import saccubus.converter.Download;
-import saccubus.converter.classic.profile.Profile;
+import saccubus.worker.Download;
+import saccubus.worker.classic.profile.Profile;
/**
* <p>
throw new IOException(e);
}
- Download conv = new Download("dummy0", profile);
+ Download conv = new Download(profile, "dummy0");
ExecutorService es = Executors.newSingleThreadExecutor();
Future<Boolean> future = es.submit((Callable<Boolean>) conv);
try {
// SProperties setting = SProperties.loadSetting(mail, pass);
// Converter conv = new Converter(tag, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
// ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
- Download conv = new Download(tag, null/*この部分*/);
+ Download conv = new Download(null/*この部分*/, tag);
System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
System.out.println("Saccubus on CUI");
System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
import java.io.File;
import java.util.Properties;
-import saccubus.converter.classic.profile.User;
+import saccubus.worker.classic.profile.User;
/**
* 基本設定.
import java.io.File;
import java.util.Properties;
-import saccubus.converter.classic.profile.NgSetting;
+import saccubus.worker.classic.profile.NgSetting;
/**
* 変換設定.
import java.io.File;
import java.util.Properties;
-import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.worker.classic.profile.FfmpegOption;
/**
* 動画設定.
/* $Id$ */
-package saccubus.converter;
+package saccubus.worker;
import java.io.BufferedReader;
import java.io.File;
import javax.swing.SwingWorker;
import org.apache.commons.lang.StringUtils;
import saccubus.conv.ConvertToVideoHook;
-import saccubus.converter.profile.ConvertProfile;
-import saccubus.converter.profile.FfmpegProfile;
-import saccubus.converter.profile.GeneralProfile;
+import saccubus.worker.profile.ConvertProfile;
+import saccubus.worker.profile.FfmpegProfile;
+import saccubus.worker.profile.GeneralProfile;
import yukihane.mediainfowrapper.Info;
import yukihane.mediainfowrapper.MediaInfo;
import yukihane.mediainfowrapper.Size;
-import saccubus.converter.profile.ConvertProfile.HideCondition;
-import saccubus.converter.profile.Profile;
+import saccubus.worker.profile.ConvertProfile.HideCondition;
+import saccubus.worker.profile.Profile;
import yukihane.swf.Cws2Fws;
/**
-package saccubus.converter;
+package saccubus.worker;
/**
*
-package saccubus.converter;
+package saccubus.worker;
/**
*
-package saccubus.converter;
+package saccubus.worker;
import java.io.File;
import java.io.IOException;
import nicobrowser.WayBackInfo;
import nicobrowser.entity.NicoContent.Status;
import org.apache.http.HttpException;
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.GeneralProfile;
-import saccubus.converter.profile.OutputProfile;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.ProxyProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.GeneralProfile;
+import saccubus.worker.profile.OutputProfile;
+import saccubus.worker.profile.Profile;
+import saccubus.worker.profile.ProxyProfile;
/**
* <p>タイトル: さきゅばす</p>
-package saccubus.converter;
+package saccubus.worker;
/**
*
-package saccubus.converter;
+package saccubus.worker;
/**
*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package saccubus.converter;
+package saccubus.worker;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.GeneralProfile;
-import saccubus.converter.profile.LoginProfile;
-import saccubus.converter.profile.OutputProfile;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.ProxyProfile;
-import saccubus.converter.profile.VideoProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.GeneralProfile;
+import saccubus.worker.profile.LoginProfile;
+import saccubus.worker.profile.OutputProfile;
+import saccubus.worker.profile.Profile;
+import saccubus.worker.profile.ProxyProfile;
+import saccubus.worker.profile.VideoProfile;
/**
*
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
/**
* コメント取得に関するプロファイルです.
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
import java.io.File;
*
* @author yuki
*/
-public class Ffmpeg implements saccubus.converter.profile.ConvertProfile {
+public class Ffmpeg implements saccubus.worker.profile.ConvertProfile {
private final File ffmpeg;
private final File vhook;
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
import java.io.File;
import java.io.FileInputStream;
*
* @author yuki
*/
-public class FfmpegOption implements saccubus.converter.profile.FfmpegProfile {
+public class FfmpegOption implements saccubus.worker.profile.FfmpegProfile {
private final String extOption;
private final String mainOption;
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
import java.io.File;
-public class GeneralSetting implements saccubus.converter.profile.GeneralProfile {
+public class GeneralSetting implements saccubus.worker.profile.GeneralProfile {
private final File tempDir;
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
import java.io.File;
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.VideoProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.VideoProfile;
/**
*
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
-import saccubus.converter.classic.profile.Proxy;
+import saccubus.worker.classic.profile.Proxy;
/**
*
* @author yuki
*/
-public class LoginInfo implements saccubus.converter.profile.LoginProfile {
+public class LoginInfo implements saccubus.worker.profile.LoginProfile {
private final String mail;
private final String pass;
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
/**
* NG設定.
* @author yuki
*/
-public class NgSetting implements saccubus.converter.profile.ConvertProfile.HideCondition {
+public class NgSetting implements saccubus.worker.profile.ConvertProfile.HideCondition {
private final String word;
private final String id;
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
import java.io.File;
*
* @author yuki
*/
-public class OutputFileSetting implements saccubus.converter.profile.OutputProfile {
+public class OutputFileSetting implements saccubus.worker.profile.OutputProfile {
private final boolean convert;
private final boolean appendPrefixVideoId;
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.VideoProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.VideoProfile;
/**
* Converterに処理させるための設定.
* @author yuki
*/
-public class Profile implements saccubus.converter.profile.Profile {
+public class Profile implements saccubus.worker.profile.Profile {
private final GeneralSetting generalSetting;
private final LoginInfo loginInfo;
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
import org.apache.commons.lang.StringUtils;
*
* @author yuki
*/
-public class Proxy implements saccubus.converter.profile.ProxyProfile {
+public class Proxy implements saccubus.worker.profile.ProxyProfile {
private String host;
private int port;
/* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
/**
* ニコニコ動画ユーザ設定.
* @author yuki
*/
-public class User implements saccubus.converter.profile.LoginProfile {
+public class User implements saccubus.worker.profile.LoginProfile {
private final String mail;
private final String password;
-package saccubus.converter.profile;
+package saccubus.worker.profile;
/**
* 変換対象となるコメントファイル情報を保持するためのプロファイルです.
-package saccubus.converter.profile;
+package saccubus.worker.profile;
import java.io.File;
-package saccubus.converter.profile;
+package saccubus.worker.profile;
/**
*
-package saccubus.converter.profile;
+package saccubus.worker.profile;
import java.io.File;
-package saccubus.converter.profile;
+package saccubus.worker.profile;
import java.io.File;
-package saccubus.converter.profile;
+package saccubus.worker.profile;
/**
* ニコニコ動画サービスへのログイン情報を保持するためのプロファイルです.
-package saccubus.converter.profile;
+package saccubus.worker.profile;
import java.io.File;
-package saccubus.converter.profile;
+package saccubus.worker.profile;
/**
* {@link saccubus.converter.Converter.Converter}が必要とするプロファイルです.
-package saccubus.converter.profile;
+package saccubus.worker.profile;
/**
* プロキシ設定を保持するためのプロファイルです.
-package saccubus.converter.profile;
+package saccubus.worker.profile;
/**
* 変換対象となる動画ファイル情報を保持するためのプロファイルです.
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package saccubus.converter;
+package saccubus.worker;
+import saccubus.worker.Download;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@Test
public void testConverter() throws Exception {
- Download conv = new Download("sm7139747", null);
+ Download conv = new Download(null, "sm7139747");
conv.call();
}
// /**
OSDN Git Service
