From 0ce8269b1bacc93373152597740ffb111af8eeff Mon Sep 17 00:00:00 2001
From: yuki <yuki@bdf3b611-c98c-6041-8292-703d9c9adbe7>
Date: Tue, 2 Feb 2010 17:57:31 +0000
Subject: [PATCH] =?utf8?q?GetFlvResult=E3=81=AB=E5=8F=96=E5=BE=97=E3=81=97?=
 =?utf8?q?=E3=81=9F=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D=E3=82=92?=
 =?utf8?q?=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89?=
 =?utf8?q?=E6=9B=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://192.168.11.7/svn/repository/NicoBrowser/branches/dev20100201_comment_download@282 bdf3b611-c98c-6041-8292-703d9c9adbe7
---
 src/nicobrowser/GetFlvResult.java   | 31 +++++++++++++++++++++++--------
 src/nicobrowser/NicoHttpClient.java |  8 ++++----
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/nicobrowser/GetFlvResult.java b/src/nicobrowser/GetFlvResult.java
index ce758dc..f073d22 100644
--- a/src/nicobrowser/GetFlvResult.java
+++ b/src/nicobrowser/GetFlvResult.java
@@ -1,15 +1,30 @@
 /** $Id$ */
+package nicobrowser;
 
-package nicobrowser
+import java.io.File;
+import nicobrowser.entity.NicoContent.Status;
 
-import nicobrowser.entity.NicoContent.Status
+public class GetFlvResult {
 
-class GetFlvResult{
-    final Status status
-    final String author
+    private final File file;
+    private final Status status;
+    private final String author;
 
-    GetFlvResult(status, author){
-        this.status = status
-        this.author = author
+    GetFlvResult(File file, Status status, String author) {
+        this.file = file;
+        this.status = status;
+        this.author = author;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public Status getStatus() {
+        return status;
     }
 }
diff --git a/src/nicobrowser/NicoHttpClient.java b/src/nicobrowser/NicoHttpClient.java
index f792baf..0cec404 100644
--- a/src/nicobrowser/NicoHttpClient.java
+++ b/src/nicobrowser/NicoHttpClient.java
@@ -589,7 +589,7 @@ public class NicoHttpClient {
         if (nowStatus == Status.GET_LOW || !needLowFile) {
             if (url.toString().contains("low")) {
                 log.info("エコノミー動画のためスキップ: " + vi.getRealVideoId());
-                return new GetFlvResult(nowStatus, userName);
+                return new GetFlvResult(null, nowStatus, userName);
             }
         }
 
@@ -601,7 +601,7 @@ public class NicoHttpClient {
         if ("text/plain".equals(contentType) || "text/html".equals(contentType)) {
             log.error("取得できませんでした. サーバが混みあっている可能性があります: " + vi.getRealVideoId());
             response.getEntity().consumeContent();
-            return new GetFlvResult(Status.GET_INFO, userName);
+            return new GetFlvResult(null, Status.GET_INFO, userName);
         }
         String ext = Util.getExtention(contentType);
         final long fileSize = response.getEntity().getContentLength();
@@ -624,9 +624,9 @@ public class NicoHttpClient {
         out.close();
         in.close();
         if (url.toString().contains("low")) {
-            return new GetFlvResult(Status.GET_LOW, userName);
+            return new GetFlvResult(file, Status.GET_LOW, userName);
         }
-        return new GetFlvResult(Status.GET_FILE, userName);
+        return new GetFlvResult(file, Status.GET_FILE, userName);
     }
 
     /**
-- 
2.11.0