リファクタリング. コメント表示数取得をフィールドでなく動画の長さから都度求めるように変更

diff --git a/src/nicobrowser/NicoHttpClient.java b/src/nicobrowser/NicoHttpClient.java
index e67e3ca..37d0748 100644 (file)
--- a/src/nicobrowser/NicoHttpClient.java
+++ b/src/nicobrowser/NicoHttpClient.java
@@ -842,7 +842,7 @@ public class NicoHttpClient {
         }
         final String officialOption = builder.toString();
 
-        return "<thread " + VideoInfo.KEY_USER_ID + "=\"" + vi.getUserId() + "\" res_from=\"" + vi.getResFrom()
+        return "<thread " + VideoInfo.KEY_USER_ID + "=\"" + vi.getUserId() + "\" res_from=\"" + (-1 * vi.getResFrom())
                 + "\" version=\"20061206\" thread=\"" + vi.getThreadId() + "\" " + tcommStr + officialOption + "/>";
     }
 

diff --git a/src/nicobrowser/VideoInfo.java b/src/nicobrowser/VideoInfo.java
index 07af8b0..3857725 100644 (file)
--- a/src/nicobrowser/VideoInfo.java
+++ b/src/nicobrowser/VideoInfo.java
@@ -28,7 +28,6 @@ public class VideoInfo {
     private final String userId;
     private final int videoLength;
     private final Map<String, String> keyMap;
-    private final String resFrom;
 
     /**
      *
@@ -47,16 +46,6 @@ public class VideoInfo {
             userId = getflvReceivedMap.get(KEY_USER_ID);
             videoLength = Integer.parseInt(getflvReceivedMap.get(KEY_VIDEO_LENGTH));
             this.keyMap = keyMap;
-
-            if (videoLength < 60) {
-                resFrom = "-100";
-            } else if (videoLength >= 60 && videoLength < 300) {
-                resFrom = "-250";
-            } else if (videoLength >= 300 && videoLength < 600) {
-                resFrom = "-500";
-            } else {
-                resFrom = "-1000";
-            }
         } catch (Exception e) {
             throw new IllegalArgumentException(e);
         }
@@ -98,7 +87,18 @@ public class VideoInfo {
         return keyMap;
     }
 
-    public String getResFrom() {
-        return resFrom;
+    /**
+     * 実際のres_fromに設定するにはこの値に-1をかける必要があります.
+     * @return 動画の長さに応じたコメント表示数.
+     */
+    public int getResFrom() {
+        if (videoLength < 60) {
+            return 100;
+        } else if (videoLength < 300) {
+            return 250;
+        } else if (videoLength < 600) {
+            return 500;
+        }
+        return 1000;
     }
 }