ログインが必要なときのみログイン処理を行う.

動画ダウンロード処理ごとにログインが必要かどうか確認する.

diff --git a/src/nicobrowser/main/Main.java b/src/nicobrowser/main/Main.java
index ffc1656..c64a307 100644 (file)
--- a/src/nicobrowser/main/Main.java
+++ b/src/nicobrowser/main/Main.java
@@ -175,7 +175,6 @@ public class Main {
                     setParameter(1, NicoContent.Status.GET_FILE);
             @SuppressWarnings("unchecked")
             List<NicoContent> results = query.getResultList();
-            instance.login(config.getNicoMail(), config.getNicoPassword());
             Date prevDate = null;
             for (NicoContent c : results) {
                 if (c.getFailTimes() >= config.getMaxRetry()) {
@@ -199,6 +198,11 @@ public class Main {
                 NamePattern np = new NamePattern(config.getFileNamePattern(), config.getFileNameReplaceFrom(), config.
                         getFileNameReplaceTo(), c.getTitle());
                 log.info("ファイルを取得します: " + c.getNicoId() + " " + c.getTitle());
+                final boolean authed = instance.challengeAuth();
+                if (!authed) {
+                    log.info("ログインします");
+                    instance.login(config.getNicoMail(), config.getNicoPassword());
+                }
                 try {
                     VideoInfo vi = instance.getVideoInfo(c.getNicoId());
                     GetFlvResult result = instance.getFlvFile(vi, saveDir, np, c.getStatus(), config.needLowFile(),