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

Add: forgesvc for Curse Mod Detection fallback

Browse Source
This commit is contained in:
huanghongxun
2019-10-10 16:46:32 +08:00
parent 944d88b8af
commit 4737240c91
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseCompletionTask.java
View File

@@ -23,7 +23,8 @@ import org.jackhuang.hmcl.game.DefaultGameRepository;
import org.jackhuang.hmcl.mod.ModManager; import org.jackhuang.hmcl.mod.ModManager;
import org.jackhuang.hmcl.task.FileDownloadTask; import org.jackhuang.hmcl.task.FileDownloadTask;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.*; import org.jackhuang.hmcl.util.Logging;
import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.NetworkUtils; import org.jackhuang.hmcl.util.io.NetworkUtils;
@@ -124,10 +125,16 @@ public final class CurseCompletionTask extends Task<Void> {
CurseMetaMod mod = JsonUtils.fromNonNullJson(result, CurseMetaMod.class); CurseMetaMod mod = JsonUtils.fromNonNullJson(result, CurseMetaMod.class);
return file.withFileName(mod.getFileNameOnDisk()).withURL(mod.getDownloadURL()); return file.withFileName(mod.getFileNameOnDisk()).withURL(mod.getDownloadURL());
} catch (IOException | JsonParseException e2) { } catch (IOException | JsonParseException e2) {
try {
String result = NetworkUtils.doGet(NetworkUtils.toURL(String.format("https://addons-ecs.forgesvc.net/api/v2/addon/%d/file/%d", file.getProjectID(), file.getFileID())));
CurseMetaMod mod = JsonUtils.fromNonNullJson(result, CurseMetaMod.class);
return file.withFileName(mod.getFileName()).withURL(mod.getDownloadURL());
} catch (IOException | JsonParseException e3) {
Logging.LOG.log(Level.WARNING, "Could not query cursemeta for deleted mods: " + file.getUrl(), e2); Logging.LOG.log(Level.WARNING, "Could not query cursemeta for deleted mods: " + file.getUrl(), e2);
notFound.set(true); notFound.set(true);
return file; return file;
} }
}
} catch (IOException ioe) { } catch (IOException ioe) {
Logging.LOG.log(Level.WARNING, "Unable to fetch the file name of URL: " + file.getUrl(), ioe); Logging.LOG.log(Level.WARNING, "Unable to fetch the file name of URL: " + file.getUrl(), ioe);

13
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseMetaMod.java
View File

@@ -20,18 +20,23 @@ package org.jackhuang.hmcl.mod.curse;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.util.Immutable; import org.jackhuang.hmcl.util.Immutable;
/**
* CurseMetaMod is JSON structure for
* https://cursemeta.dries007.net/&lt;projectID&gt;/&lt;fileID&gt;.json
* https://addons-ecs.forgesvc.net/api/v2/addon/&lt;projectID&gt;/file/<fileID&gt;
*/
@Immutable @Immutable
public final class CurseMetaMod { public final class CurseMetaMod {
@SerializedName("Id") @SerializedName(value = "Id", alternate = "id")
private final int id; private final int id;
@SerializedName("FileName") @SerializedName(value = "FileName", alternate = "fileName")
private final String fileName; private final String fileName;
@SerializedName("FileNameOnDisk") @SerializedName(value = "FileNameOnDisk")
private final String fileNameOnDisk; private final String fileNameOnDisk;
@SerializedName("DownloadURL") @SerializedName(value = "DownloadURL", alternate = "downloadUrl")
private final String downloadURL; private final String downloadURL;
public CurseMetaMod() { public CurseMetaMod() {