fix(tcp-window): fix download useless data on tcp-window because of t…

…he first connection use 0-infinite range closes #933
lingochamp · Jan 31, 2018 · e175b7b · e175b7b
1 parent 6567402
commit e175b7b
Show file tree

Hide file tree

Showing 3 changed files with 158 additions and 104 deletions.
diff --git a/library/src/main/java/com/liulishuo/filedownloader/download/ConnectionProfile.java b/library/src/main/java/com/liulishuo/filedownloader/download/ConnectionProfile.java
@@ -22,22 +22,25 @@
 /**
  * The connection profile for {@link ConnectTask}.
  */
-
 public class ConnectionProfile {
 
+    static final int RANGE_INFINITE = -1;
+
     final long startOffset;
     final long currentOffset;
     final long endOffset;
     final long contentLength;
 
     private final boolean isForceNoRange;
 
-    ConnectionProfile(long startOffset, long currentOffset, long endOffset, long contentLength) {
+    private ConnectionProfile(long startOffset, long currentOffset, long endOffset,
+                              long contentLength) {
         this(startOffset, currentOffset, endOffset, contentLength, false);
     }
 
-    ConnectionProfile(long startOffset, long currentOffset, long endOffset, long contentLength,
-                      boolean isForceNoRange) {
+    private ConnectionProfile(long startOffset, long currentOffset, long endOffset,
+                              long contentLength,
+                              boolean isForceNoRange) {
         if ((startOffset != 0 || endOffset != 0) && isForceNoRange) {
             throw new IllegalArgumentException();
         }
@@ -53,7 +56,7 @@ public void addRangeHeader(FileDownloadConnection connection) {
         if (isForceNoRange) return;
 
         final String range;
-        if (endOffset == 0) {
+        if (endOffset == RANGE_INFINITE) {
             range = FileDownloadUtils.formatString("bytes=%d-", currentOffset);
         } else {
             range = FileDownloadUtils
@@ -67,4 +70,31 @@ public String toString() {
         return FileDownloadUtils.formatString("range[%d, %d) current offset[%d]",
                 startOffset, endOffset, currentOffset);
     }
+
+    public static class ConnectionProfileBuild {
+        public static ConnectionProfile buildTrialConnectionProfile() {
+            return new ConnectionProfile(0, 0, 0, 0);
+        }
+
+        public static ConnectionProfile buildTrialConnectionProfileNoRange() {
+            return new ConnectionProfile(0, 0, 0, 0, true);
+        }
+
+        public static ConnectionProfile buildBeginToEndConnectionProfile(long contentLength) {
+            return new ConnectionProfile(0, 0, RANGE_INFINITE, contentLength);
+        }
+
+        public static ConnectionProfile buildToEndConnectionProfile(long startOffset,
+                                                                    long currentOffset,
+                                                                    long contentLength) {
+            return new ConnectionProfile(startOffset, currentOffset, RANGE_INFINITE, contentLength);
+        }
+
+        public static ConnectionProfile buildConnectionProfile(long startOffset,
+                                                               long currentOffset,
+                                                               long endOffset,
+                                                               long contentLength) {
+            return new ConnectionProfile(startOffset, currentOffset, endOffset, contentLength);
+        }
+    }
 }