moparisthebest
/
MoparScape
mirror of https://github.com/moparisthebest/MoparScape
1
0
Fork 0
Code Issues Releases Wiki Activity

More work on checksum downloading, pretty much done with that.

This commit is contained in:
Travis Burtrum 2011-04-23 02:17:06 -04:00 committed by moparisthebest
parent 1acda7c09c
commit abe668019d
3 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/moparscape/res/DownloadListener.java
View File

@ -37,5 +37,5 @@ public interface DownloadListener {
public void finished(String savePath, String... filesDownloaded);
public void stopped();
public void error(String msg, Exception e);
public boolean download(String url, String savePath, boolean extract, ChecksumInfo ci) throws java.net.MalformedURLException;
}

13
src/org/moparscape/res/ResourceGrabber.java
View File

@ -135,7 +135,7 @@ public class ResourceGrabber {
Downloader dlr = getSupportedDownloader(url);
int uid = getUID();
DlListener dll = new DlListener(uid, extract, ci);
DlListener dll = new DlListener(uid, extract, ci, this);
dlr.download(url, savePath, dll);
synchronized (downloadItems) {
downloadItems.add(dll);
@ -262,11 +262,13 @@ public class ResourceGrabber {
boolean extract;
ChecksumInfo ci;
DownloadItemPanel dip = null;
ResourceGrabber rg = null;
public DlListener(int uid, boolean extract, ChecksumInfo ci) {
public DlListener(int uid, boolean extract, ChecksumInfo ci, ResourceGrabber rg) {
this.uid = uid;
this.extract = extract;
this.ci = ci;
this.rg = rg;
}
@Override
@ -277,6 +279,7 @@ public class ResourceGrabber {
dip.setProgress(progress);
}
@Override
public void finished(String savePath, String... filesDownloaded) {
// if we are supposed to extract it, do so
if (extract)
@ -294,8 +297,12 @@ public class ResourceGrabber {
}
}
public boolean download(String url, String savePath, boolean extract, ChecksumInfo ci) throws MalformedURLException {
return rg.wait(rg.download(url, savePath, extract, ci));
}
/**
* This needs to be hacked to be equal to either another DlListener, or an integer uid value
* Checks equality with another Object
*
* @param other
* @return

51
src/org/moparscape/res/impl/BTDownloader.java
View File

@ -20,8 +20,10 @@
package org.moparscape.res.impl;
import org.moparscape.res.ChecksumInfo;
import org.moparscape.res.DownloadListener;
import java.net.MalformedURLException;
import java.util.HashMap;
/**
@ -35,7 +37,10 @@ public class BTDownloader extends Downloader {
private final Object lock = this;
private String binDir = "";
private String remoteBinDir = "http://www.moparscape.org/libs/";
private String remoteBinSuffix = ".gz";
private String binDir = "/home/mopar/.moparscape/bin/";
private String binName = "java_client.";
private Process proc = null;
private HashMap<String, DownloadListener> activeDls = new HashMap<String, DownloadListener>();
@ -44,14 +49,50 @@ public class BTDownloader extends Downloader {
@Override
public void download(String url, String savePath, DownloadListener callback) {
synchronized (lock){
if (callback == null)
return;
synchronized (lock) {
// if the download is already running, return
if(activeDls.containsKey(url))
if (activeDls.containsKey(url))
return;
// if the process hasn't been started yet, boot it up
if(proc == null){
if (proc == null) {
String osName = System.getProperty("os.name").toLowerCase();
String osArch = System.getProperty("os.arch").toLowerCase();
String osArch = System.getProperty("os.arch").toLowerCase();
long crc;
// if it's windows, run 32-bit windows executable
if (osName.contains("win")) {
binName += "win32.exe";
crc = 9089203;
// if it's a mac, we want to either ppc or i386
} else if (osName.contains("mac")) {
if (osArch.contains("ppc")) {
binName += "osx.ppc";
crc = 9089203;
} else {
binName += "osx.i386";
crc = 9089203;
}
} else {
if (!osName.contains("linux"))
System.out.println("ATTENTION: Could not find a supported OS/Architecture, trying the Linux executable...");
binName += "linux.x86";
crc = 9089203;
}
try {
if(!callback.download(remoteBinDir + binName + remoteBinSuffix, binDir, true, new ChecksumInfo(crc, new String[]{binName}))){
callback.error("Failed to download '"+remoteBinDir + binName + remoteBinSuffix+"', cannot continue.", null);
return;
}
} catch (MalformedURLException e) {
callback.error("Invalid URL", e);
return;
}
}
}
}