getWayBackKeyメソッドではwaybackkey取得のみを行うようにインタフェースを定義しなおし

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

diff --git a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
index bcda523..e53a5b9 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
@@ -3,12 +3,14 @@ package saccubus.converter.filegetter;
 
 import java.io.IOException;
 import java.text.Normalizer;
+import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.converter.profile.Proxy;
 import saccubus.net.CommentInfo;
 import saccubus.net.NicoClient;
 import saccubus.net.NicoClientImpl;
 import saccubus.net.VideoInfo;
+import saccubus.util.WayBackTimeParser;
 
 /**
  * 動画ファイル, コメントファイルなど必要なファイルのうち, 1つでもダウンロード処理を必要とする場合のインスタンス化クラス.
@@ -44,7 +46,8 @@ public class WebFileInstanciator extends FileInstanciator {
             port = -1;
         }
         // TODO Implを直接newしている
-        client = new NicoClientImpl(li.getMail(), li.getPass(), stopFlag, host, port) {};
+        client = new NicoClientImpl(li.getMail(), li.getPass(), stopFlag, host, port) {
+        };
 
         if (!client.isLoggedIn()) {
             throw new IOException("ログインに失敗");
@@ -52,7 +55,14 @@ public class WebFileInstanciator extends FileInstanciator {
 
         try {
             videoInfo = client.getVideoInfo(tag);
-            commentInfo = client.getWayBackKey(videoInfo, time);
+            if (StringUtils.isNotBlank(time)) {
+                System.out.print("Setting wayback time...");
+                final String waybacktime = WayBackTimeParser.parse(time);
+                String waybackkey = client.getWayBackKey(videoInfo);
+                commentInfo = new CommentInfo(waybackkey, waybacktime);
+            }else{
+                commentInfo = CommentInfo.DEFAULT;
+            }
 
         } catch (IOException ex) {
             throw new IOException(tag + "の情報の取得に失敗", ex);