miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support for resuming download of partially-downloaded files, only for non-unzipped files.

Browse Source
This commit is contained in:
pelya
2012-10-30 15:31:13 +02:00
parent eaeaa0042f
commit e38cf2f06f
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
project/java/DataDownloader.java
View File

@@ -277,6 +277,7 @@ class DataDownloader extends Thread
boolean DoNotUnzip = false; boolean DoNotUnzip = false;
boolean FileInAssets = false; boolean FileInAssets = false;
String url = ""; String url = "";
long partialDownloadLen = 0;
int downloadUrlIndex = 1; int downloadUrlIndex = 1;
while( downloadUrlIndex < downloadUrls.length ) while( downloadUrlIndex < downloadUrls.length )
@@ -286,8 +287,12 @@ class DataDownloader extends Thread
DoNotUnzip = false; DoNotUnzip = false;
if(url.indexOf(":") == 0) if(url.indexOf(":") == 0)
{ {
path = getOutFilePath(url.substring( 1, url.indexOf(":", 1) ));
url = url.substring( url.indexOf(":", 1) + 1 ); url = url.substring( url.indexOf(":", 1) + 1 );
DoNotUnzip = true; DoNotUnzip = true;
File partialDownload = new File( path );
if( partialDownload.exists() && !partialDownload.isDirectory() )
partialDownloadLen = partialDownload.length();
} }
Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.connecting_to, url) ); Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.connecting_to, url) );
if( url.indexOf("http://") == -1 && url.indexOf("https://") == -1 ) // File inside assets if( url.indexOf("http://") == -1 && url.indexOf("https://") == -1 ) // File inside assets
@@ -315,6 +320,8 @@ class DataDownloader extends Thread
System.out.println("Connecting to: " + url); System.out.println("Connecting to: " + url);
request = new HttpGet(url); request = new HttpGet(url);
request.addHeader("Accept", "*/*"); request.addHeader("Accept", "*/*");
if( partialDownloadLen > 0 )
request.addHeader("Range", "bytes=" + partialDownloadLen + "-");
try { try {
DefaultHttpClient client = HttpWithDisabledSslCertCheck(); DefaultHttpClient client = HttpWithDisabledSslCertCheck();
client.getParams().setBooleanParameter("http.protocol.handle-redirects", true); client.getParams().setBooleanParameter("http.protocol.handle-redirects", true);
@@ -325,10 +332,10 @@ class DataDownloader extends Thread
}; };
if( response != null ) if( response != null )
{ {
if( response.getStatusLine().getStatusCode() != 200 ) if( response.getStatusLine().getStatusCode() != 200 && response.getStatusLine().getStatusCode() != 206 )
{ {
response = null; response = null;
System.out.println("Failed to connect to " + url); System.out.println("Failed to connect to " + url + " with error " + response.getStatusLine().getStatusCode() + " " + response.getStatusLine().getReasonPhrase() );
downloadUrlIndex++; downloadUrlIndex++;
} }
else else
@@ -398,8 +405,6 @@ class DataDownloader extends Thread
if(DoNotUnzip) if(DoNotUnzip)
{ {
path = getOutFilePath(downloadUrls[downloadUrlIndex].substring( 1,
downloadUrls[downloadUrlIndex].indexOf(":", 1) ));
System.out.println("Saving file '" + path + "'"); System.out.println("Saving file '" + path + "'");
OutputStream out = null; OutputStream out = null;
try { try {
@@ -409,7 +414,27 @@ class DataDownloader extends Thread
outDir.mkdirs(); outDir.mkdirs();
} catch( SecurityException e ) { }; } catch( SecurityException e ) { };
out = new FileOutputStream( path ); if( partialDownloadLen > 0 )
{
try {
Header[] range = response.getHeaders("Content-Range");
if( range.length > 0 && range[0].getValue().indexOf("bytes") == 0 )
{
//System.out.println("Resuming download of file '" + path + "': Content-Range: " + range[0].getValue());
String[] skippedBytes = range[0].getValue().split("/")[0].split("-")[0].split(" ");
if( skippedBytes.length >= 2 && Long.parseLong(skippedBytes[1]) == partialDownloadLen )
{
out = new FileOutputStream( path, true );
System.out.println("Resuming download of file '" + path + "' at pos " + partialDownloadLen);
}
}
} catch (Exception e) { }
}
if( out == null )
{
out = new FileOutputStream( path );
partialDownloadLen = 0;
}
} catch( FileNotFoundException e ) { } catch( FileNotFoundException e ) {
System.out.println("Saving file '" + path + "' - error creating output file: " + e.toString()); System.out.println("Saving file '" + path + "' - error creating output file: " + e.toString());
} catch( SecurityException e ) { } catch( SecurityException e ) {
@@ -432,7 +457,7 @@ class DataDownloader extends Thread
float percent = 0.0f; float percent = 0.0f;
if( totalLen > 0 ) if( totalLen > 0 )
percent = stream.getBytesRead() * 100.0f / totalLen; percent = (stream.getBytesRead() + partialDownloadLen) * 100.0f / (totalLen + partialDownloadLen);
Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.dl_progress, percent, path) ); Status.setText( downloadCount + "/" + downloadTotal + ": " + res.getString(R.string.dl_progress, percent, path) );
} }
out.flush(); out.flush();