lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: retry url in LibraryDownloadTask

Browse Source
This commit is contained in:
huanghongxun
2020-06-01 13:26:28 +08:00
parent 0984c23253
commit 6eb0c16fcc
1 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibraryDownloadTask.java
View File

@@ -25,7 +25,6 @@ import org.jackhuang.hmcl.task.DownloadException;
import org.jackhuang.hmcl.task.FileDownloadTask;
import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.IOUtils;
import org.jackhuang.hmcl.util.io.NetworkUtils;
@@ -42,6 +41,7 @@ import java.util.logging.Level;
import static org.jackhuang.hmcl.util.DigestUtils.digest;
import static org.jackhuang.hmcl.util.Hex.encodeHex;
import static org.jackhuang.hmcl.util.Logging.LOG;
public class LibraryDownloadTask extends Task<Void> {
private FileDownloadTask task;
@@ -111,7 +111,7 @@ public class LibraryDownloadTask extends Task<Void> {
}
@Override
public void preExecute() throws Exception {
public void preExecute() {
Optional<Path> libPath = cacheRepository.getLibrary(originalLibrary);
if (libPath.isPresent()) {
try {
@@ -119,15 +119,13 @@ public class LibraryDownloadTask extends Task<Void> {
cached = true;
return;
} catch (IOException e) {
Logging.LOG.log(Level.WARNING, "Failed to copy file from cache", e);
LOG.log(Level.WARNING, "Failed to copy file from cache", e);
// We cannot copy cached file to current location
// so we try to download a new one.
}
}
try {
URL packXz = NetworkUtils.toURL(dependencyManager.getDownloadProvider().injectURL(url) + ".pack.xz");
if (NetworkUtils.urlExists(packXz)) {
if (testURLExistence(url)) {
List<URL> urls = dependencyManager.getDownloadProvider().injectURLWithCandidates(url + ".pack.xz");
task = new FileDownloadTask(urls, xzFile, null);
task.setCacheRepository(cacheRepository);
@@ -142,9 +140,21 @@ public class LibraryDownloadTask extends Task<Void> {
task.addIntegrityCheckHandler(FileDownloadTask.ZIP_INTEGRITY_CHECK_HANDLER);
xz = false;
}
} catch (IOException e) {
throw new LibraryDownloadException(library, e);
}
private boolean testURLExistence(String rawUrl) {
List<URL> urls = dependencyManager.getDownloadProvider().injectURLWithCandidates(rawUrl);
for (URL url : urls) {
URL xzURL = NetworkUtils.toURL(url.toString() + ".pack.xz");
for (int retry = 0; retry < 3; retry++) {
try {
return NetworkUtils.urlExists(xzURL);
} catch (IOException e) {
LOG.log(Level.WARNING, "Failed to test for url existence: " + rawUrl + ".pack.xz", e);
}
}
}
return false; // maybe some ugly implementation will give timeout for not existent url.
}
@Override
@@ -201,11 +211,11 @@ public class LibraryDownloadTask extends Task<Void> {
String target = hash.substring(validChecksum.length() + 1);
String checksum = files.get(target);
if ((!files.containsKey(target)) || (checksum == null)) {
Logging.LOG.warning(" " + target + " : missing");
LOG.warning(" " + target + " : missing");
failed = true;
break;
} else if (!checksum.equals(validChecksum)) {
Logging.LOG.warning(" " + target + " : failed (" + checksum + ", " + validChecksum + ")");
LOG.warning(" " + target + " : failed (" + checksum + ", " + validChecksum + ")");
failed = true;
break;
}