#122: support for 2Gb+ files

Author: danikula

library/src/main/java/com/danikula/videocache/ByteArrayCache.java

@@ -33,7 +33,7 @@ public int read(byte[] buffer, long offset, int length) throws ProxyCacheExcepti
     }
 
     @Override
-    public int available() throws ProxyCacheException {
+    public long available() throws ProxyCacheException {
         return data.length;
     }
 

library/src/main/java/com/danikula/videocache/ByteArraySource.java

@@ -22,12 +22,12 @@ public int read(byte[] buffer) throws ProxyCacheException {
     }
 
     @Override
-    public int length() throws ProxyCacheException {
+    public long length() throws ProxyCacheException {
         return data.length;
     }
 
     @Override
-    public void open(int offset) throws ProxyCacheException {
+    public void open(long offset) throws ProxyCacheException {
         arrayInputStream = new ByteArrayInputStream(data);
         arrayInputStream.skip(offset);
     }

library/src/main/java/com/danikula/videocache/Cache.java

@@ -7,7 +7,7 @@
  */
 public interface Cache {
 
-    int available() throws ProxyCacheException;
+    long available() throws ProxyCacheException;
 
     int read(byte[] buffer, long offset, int length) throws ProxyCacheException;
 

library/src/main/java/com/danikula/videocache/HttpProxyCache.java

@@ -49,17 +49,17 @@ public void processRequest(GetRequest request, Socket socket) throws IOException
     }
 
     private boolean isUseCache(GetRequest request) throws ProxyCacheException {
-        int sourceLength = source.length();
+        long sourceLength = source.length();
         boolean sourceLengthKnown = sourceLength > 0;
-        int cacheAvailable = cache.available();
+        long cacheAvailable = cache.available();
         // do not use cache for partial requests which too far from available cache. It seems user seek video.
         return !sourceLengthKnown || !request.partial || request.rangeOffset <= cacheAvailable + sourceLength * NO_CACHE_BARRIER;
     }
 
     private String newResponseHeaders(GetRequest request) throws IOException, ProxyCacheException {
         String mime = source.getMime();
         boolean mimeKnown = !TextUtils.isEmpty(mime);
-        int length = cache.isCompleted() ? cache.available() : source.length();
+        long length = cache.isCompleted() ? cache.available() : source.length();
         boolean lengthKnown = length >= 0;
         long contentLength = request.partial ? length - request.rangeOffset : length;
         boolean addRange = lengthKnown && request.partial;

library/src/main/java/com/danikula/videocache/HttpUrlSource.java

@@ -55,33 +55,38 @@ public HttpUrlSource(HttpUrlSource source) {
     }
 
     @Override
-    public synchronized int length() throws ProxyCacheException {
+    public synchronized long length() throws ProxyCacheException {
         if (sourceInfo.length == Integer.MIN_VALUE) {
             fetchContentInfo();
         }
         return sourceInfo.length;
     }
 
     @Override
-    public void open(int offset) throws ProxyCacheException {
+    public void open(long offset) throws ProxyCacheException {
         try {
             connection = openConnection(offset, -1);
             String mime = connection.getContentType();
             inputStream = new BufferedInputStream(connection.getInputStream(), DEFAULT_BUFFER_SIZE);
-            int length = readSourceAvailableBytes(connection, offset, connection.getResponseCode());
+            long length = readSourceAvailableBytes(connection, offset, connection.getResponseCode());
             this.sourceInfo = new SourceInfo(sourceInfo.url, length, mime);
             this.sourceInfoStorage.put(sourceInfo.url, sourceInfo);
         } catch (IOException e) {
             throw new ProxyCacheException("Error opening connection for " + sourceInfo.url + " with offset " + offset, e);
         }
     }
 
-    private int readSourceAvailableBytes(HttpURLConnection connection, int offset, int responseCode) throws IOException {
-        int contentLength = connection.getContentLength();
+    private long readSourceAvailableBytes(HttpURLConnection connection, long offset, int responseCode) throws IOException {
+        long contentLength = getContentLength(connection);
         return responseCode == HTTP_OK ? contentLength
                 : responseCode == HTTP_PARTIAL ? contentLength + offset : sourceInfo.length;
     }
 
+    private long getContentLength(HttpURLConnection connection) {
+        String contentLengthValue = connection.getHeaderField("Content-Length");
+        return contentLengthValue == null ? -1 : Long.parseLong(contentLengthValue);
+    }
+
     @Override
     public void close() throws ProxyCacheException {
         if (connection != null) {
@@ -116,7 +121,7 @@ private void fetchContentInfo() throws ProxyCacheException {
         InputStream inputStream = null;
         try {
             urlConnection = openConnection(0, 10000);
-            int length = urlConnection.getContentLength();
+            long length = getContentLength(urlConnection);
             String mime = urlConnection.getContentType();
             inputStream = urlConnection.getInputStream();
             this.sourceInfo = new SourceInfo(sourceInfo.url, length, mime);
@@ -132,7 +137,7 @@ private void fetchContentInfo() throws ProxyCacheException {
         }
     }
 
-    private HttpURLConnection openConnection(int offset, int timeout) throws IOException, ProxyCacheException {
+    private HttpURLConnection openConnection(long offset, int timeout) throws IOException, ProxyCacheException {
         HttpURLConnection connection;
         boolean redirected;
         int redirectCount = 0;

library/src/main/java/com/danikula/videocache/ProxyCache.java

@@ -103,7 +103,7 @@ private void notifyNewCacheDataAvailable(long cacheAvailable, long sourceAvailab
 
     protected void onCacheAvailable(long cacheAvailable, long sourceLength) {
         boolean zeroLengthSource = sourceLength == 0;
-        int percents = zeroLengthSource ? 100 : (int) (cacheAvailable * 100 / sourceLength);
+        int percents = zeroLengthSource ? 100 : (int) (cacheAvailable / sourceLength * 100);
         boolean percentsChanged = percents != percentsAvailable;
         boolean sourceLengthKnown = sourceLength >= 0;
         if (sourceLengthKnown && percentsChanged) {
@@ -116,8 +116,8 @@ protected void onCachePercentsAvailableChanged(int percentsAvailable) {
     }
 
     private void readSource() {
-        int sourceAvailable = -1;
-        int offset = 0;
+        long sourceAvailable = -1;
+        long offset = 0;
         try {
             offset = cache.available();
             source.open(offset);

library/src/main/java/com/danikula/videocache/Source.java

@@ -13,15 +13,15 @@ public interface Source {
      * @param offset offset in bytes for source.
      * @throws ProxyCacheException if error occur while opening source.
      */
-    void open(int offset) throws ProxyCacheException;
+    void open(long offset) throws ProxyCacheException;
 
     /**
      * Returns length bytes or <b>negative value</b> if length is unknown.
      *
      * @return bytes length
      * @throws ProxyCacheException if error occur while fetching source data.
      */
-    int length() throws ProxyCacheException;
+    long length() throws ProxyCacheException;
 
     /**
      * Read data to byte buffer from source with current offset.

library/src/main/java/com/danikula/videocache/SourceInfo.java

@@ -8,10 +8,10 @@
 public class SourceInfo {
 
     public final String url;
-    public final int length;
+    public final long length;
     public final String mime;
 
-    public SourceInfo(String url, int length, String mime) {
+    public SourceInfo(String url, long length, String mime) {
         this.url = url;
         this.length = length;
         this.mime = mime;

library/src/main/java/com/danikula/videocache/file/FileCache.java

@@ -41,7 +41,7 @@ public FileCache(File file, DiskUsage diskUsage) throws ProxyCacheException {
     }
 
     @Override
-    public synchronized int available() throws ProxyCacheException {
+    public synchronized long available() throws ProxyCacheException {
         try {
             return (int) dataFile.length();
         } catch (IOException e) {

library/src/main/java/com/danikula/videocache/sourcestorage/DatabaseSourceInfoStorage.java

@@ -83,7 +83,7 @@ public void release() {
     private SourceInfo convert(Cursor cursor) {
         return new SourceInfo(
                 cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_URL)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_LENGTH)),
+                cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_LENGTH)),
                 cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_MIME))
         );
     }