From 4537f9e48f75e93b96ceec26a4d9b9b75d432073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=97=E5=AE=AB=E4=B8=B4=E9=A3=8E?= Date: Wed, 29 Jun 2016 15:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=AD=A3library=E8=A1=A5=E5=85=A8B?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/version/LibraryDownloadInfo.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java index 7ae1f8960..c91090ea6 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java @@ -39,33 +39,35 @@ public class LibraryDownloadInfo extends GameDownloadInfo { IDownloadProvider provider = dt.getProvider(); String downloadUrl = (forgeURL == null ? provider.getLibraryDownloadURL() : forgeURL); if (StrUtils.isNotBlank(url) && allowSelf) { - downloadUrl = provider.getParsedDownloadURL(url); + downloadUrl = url; } - return getUrlWithBaseUrl(downloadUrl); + return provider.getParsedDownloadURL(getUrlWithBaseUrl(downloadUrl)); } - public String getUrlWithBaseUrl(String baseUrl) { - if (!baseUrl.endsWith(".jar")) { - if (path == null) - return null; - else - baseUrl = IOUtils.addURLSeparator(baseUrl) + path.replace('\\', '/'); - } - return baseUrl; - } - public String getRetryUrl(DownloadType dt) { IDownloadProvider provider = dt.getProvider(); String retryBaseUrl = provider.getRetryLibraryDownloadURL(); - if (StrUtils.isBlank(retryBaseUrl)) { - return null; - } String downloadUrl = (forgeURL == null ? retryBaseUrl : forgeURL); if (StrUtils.isNotBlank(url) && provider.isAllowedToUseSelfURL()) { downloadUrl = url; } - return getUrlWithBaseUrl(downloadUrl); + if (StrUtils.isBlank(downloadUrl)) { + return null; + } + + return provider.getParsedDownloadURL(getUrlWithBaseUrl(downloadUrl)); + } + + private String getUrlWithBaseUrl(String baseUrl) { + if (!baseUrl.endsWith(".jar")) { + if (path == null) { + return null; + } else { + baseUrl = IOUtils.addURLSeparator(baseUrl) + path.replace('\\', '/'); + } + } + return baseUrl; } }