leelizk
diff --git a/‎library/build.gradle‎
Lines changed: 1 addition & 1 deletion b/‎library/build.gradle‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎library/src/main/java/com/danikula/videocache/ByteArrayCache.java‎
Lines changed: 0 additions & 4 deletions b/‎library/src/main/java/com/danikula/videocache/ByteArrayCache.java‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎library/src/main/java/com/danikula/videocache/CacheListener.java‎
Lines changed: 7 additions & 3 deletions b/‎library/src/main/java/com/danikula/videocache/CacheListener.java‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎library/src/main/java/com/danikula/videocache/FileCache.java‎
Lines changed: 7 additions & 12 deletions b/‎library/src/main/java/com/danikula/videocache/FileCache.java‎
Lines changed: 7 additions & 12 deletions
diff --git a/‎library/src/main/java/com/danikula/videocache/FileNameGenerator.java‎
Lines changed: 14 additions & 0 deletions b/‎library/src/main/java/com/danikula/videocache/FileNameGenerator.java‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎library/src/main/java/com/danikula/videocache/GetRequest.java‎
Lines changed: 71 additions & 0 deletions b/‎library/src/main/java/com/danikula/videocache/GetRequest.java‎
Lines changed: 71 additions & 0 deletions
@@ -26,7 +26,7 @@ publish {
     userOrg = 'alexeydanilov'
     groupId = 'com.danikula'
     artifactId = 'videocache'
-    publishVersion = '1.0.1'
+    publishVersion = '2.0.7'
     description = 'Cache support for android VideoView'
     website = 'https://github.com/danikula/AndroidVideoCache'
 }
@@ -3,9 +3,6 @@
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 
-import static com.danikula.videocache.Preconditions.checkArgument;
-import static com.danikula.videocache.Preconditions.checkNotNull;
-
 /**
  * Simple memory based {@link Cache} implementation.
  *
@@ -24,7 +21,6 @@ public ByteArrayCache(byte[] data) {
         this.data = Preconditions.checkNotNull(data);
     }
 
-
     @Override
     public int read(byte[] buffer, long offset, int length) throws ProxyCacheException {
         if (offset >= data.length) {
 
@@ -1,10 +1,14 @@
 package com.danikula.videocache;
 
+import java.io.File;
+
 /**
- * @author Egor Makovsky (yahor.makouski@gmail.com).
+ * Listener for cache availability.
+ *
+ * @author Egor Makovsky (yahor.makouski@gmail.com)
+ * @author Alexey Danilov (danikula@gmail.com).
  */
 public interface CacheListener {
-    void onError(ProxyCacheException e);
 
-    void onCacheDataAvailable(int cachePercentage);
+    void onCacheAvailable(File cacheFile, String url, int percentsAvailable);
 }
@@ -15,22 +15,16 @@ public class FileCache implements Cache {
 
     private static final String TEMP_POSTFIX = ".download";
 
+    public File file;
     private RandomAccessFile dataFile;
-    private File file;
 
     public FileCache(File file) throws ProxyCacheException {
         try {
             checkNotNull(file);
-            boolean partialFile = isTempFile(file);
-            boolean completed = file.exists() && !partialFile;
-            if (completed) {
-                this.dataFile = new RandomAccessFile(file, "r");
-                this.file = file;
-            } else {
-                ProxyCacheUtils.createDirectory(file.getParentFile());
-                this.file = partialFile ? file : new File(file.getParentFile(), file.getName() + TEMP_POSTFIX);
-                this.dataFile = new RandomAccessFile(this.file, "rw");
-            }
+            ProxyCacheUtils.createDirectory(file.getParentFile());
+            boolean completed = file.exists();
+            this.file = completed ? file : new File(file.getParentFile(), file.getName() + TEMP_POSTFIX);
+            this.dataFile = new RandomAccessFile(this.file, completed ? "r" : "rw");
         } catch (IOException e) {
             throw new ProxyCacheException("Error using file " + file + " as disc cache", e);
         }
@@ -41,7 +35,7 @@ public synchronized int available() throws ProxyCacheException {
         try {
             return (int) dataFile.length();
         } catch (IOException e) {
-            throw new ProxyCacheException("Error reading length of file " + dataFile, e);
+            throw new ProxyCacheException("Error reading length of file " + file, e);
         }
     }
 
@@ -117,4 +111,5 @@ public File getFile() {
     private boolean isTempFile(File file) {
         return file.getName().endsWith(TEMP_POSTFIX);
     }
+
 }
@@ -0,0 +1,14 @@
+package com.danikula.videocache;
+
+import java.io.File;
+
+/**
+ * Generator for files to be used for caching.
+ *
+ * @author Alexey Danilov (danikula@gmail.com).
+ */
+public interface FileNameGenerator {
+
+    File generate(String url);
+
+}
@@ -0,0 +1,71 @@
+package com.danikula.videocache;
+
+import android.text.TextUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.danikula.videocache.Preconditions.checkNotNull;
+
+/**
+ * Model for Http GET request.
+ *
+ * @author Alexey Danilov (danikula@gmail.com).
+ */
+class GetRequest {
+
+    private static final Pattern RANGE_HEADER_PATTERN = Pattern.compile("[R,r]ange:[ ]?bytes=(\\d*)-");
+    private static final Pattern URL_PATTERN = Pattern.compile("GET /(.*) HTTP");
+
+    public final String uri;
+    public final long rangeOffset;
+    public final boolean partial;
+
+    public GetRequest(String request) {
+        checkNotNull(request);
+        long offset = findRangeOffset(request);
+        this.rangeOffset = Math.max(0, offset);
+        this.partial = offset >= 0;
+        this.uri = findUri(request);
+    }
+
+    public static GetRequest read(InputStream inputStream) throws IOException {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+        StringBuilder stringRequest = new StringBuilder();
+        String line;
+        while (!TextUtils.isEmpty(line = reader.readLine())) { // until new line (headers ending)
+            stringRequest.append(line).append('\n');
+        }
+        return new GetRequest(stringRequest.toString());
+    }
+
+    private long findRangeOffset(String request) {
+        Matcher matcher = RANGE_HEADER_PATTERN.matcher(request);
+        if (matcher.find()) {
+            String rangeValue = matcher.group(1);
+            return Long.parseLong(rangeValue);
+        }
+        return -1;
+    }
+
+    private String findUri(String request) {
+        Matcher matcher = URL_PATTERN.matcher(request);
+        if (matcher.find()) {
+            return matcher.group(1);
+        }
+        throw new IllegalArgumentException("Invalid request `" + request + "`: url not found!");
+    }
+
+    @Override
+    public String toString() {
+        return "GetRequest{" +
+                "uri='" + uri + '\'' +
+                ", rangeOffset=" + rangeOffset +
+                ", partial=" + partial +
+                '}';
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ publish {`
`26`	`26`	`userOrg = 'alexeydanilov'`
`27`	`27`	`groupId = 'com.danikula'`
`28`	`28`	`artifactId = 'videocache'`
`29`		`- publishVersion = '1.0.1'`
	`29`	`+ publishVersion = '2.0.7'`
`30`	`30`	`description = 'Cache support for android VideoView'`
`31`	`31`	`website = 'https://github.com/danikula/AndroidVideoCache'`
`32`	`32`	`}`