external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send URL to github snapshots

Browse Source
This commit is contained in:
Chris H
2025-02-20 14:18:12 -05:00
parent 9054e01273
commit 40882c20d6
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/control/FControl.java
View File

@@ -72,7 +72,7 @@ import forge.util.TextUtil;
import forge.view.FFrame; import forge.view.FFrame;
import forge.view.FView; import forge.view.FView;
import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; import static forge.localinstance.properties.ForgeConstants.GITHUB_SNAPSHOT_URL;
/** /**
* <p> * <p>
@@ -246,9 +246,9 @@ public enum FControl implements KeyEventDispatcher {
//get version string //get version string
try { try {
if (isSnapshot && prefs.getPrefBoolean(FPref.CHECK_SNAPSHOT_AT_STARTUP)) { if (isSnapshot && prefs.getPrefBoolean(FPref.CHECK_SNAPSHOT_AT_STARTUP)) {
URL url = new URL(DAILY_SNAPSHOT_URL + "version.txt"); URL url = new URL(GITHUB_SNAPSHOT_URL + "version.txt");
snapsVersion = FileUtil.readFileToString(url); snapsVersion = FileUtil.readFileToString(url);
url = new URL(DAILY_SNAPSHOT_URL + "build.txt"); url = new URL(GITHUB_SNAPSHOT_URL + "build.txt");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
snapsTimestamp = simpleDateFormat.parse(FileUtil.readFileToString(url)); snapsTimestamp = simpleDateFormat.parse(FileUtil.readFileToString(url));
buildTimeStamp = BuildInfo.getTimestamp(); buildTimeStamp = BuildInfo.getTimestamp();

6
forge-gui-mobile/src/forge/assets/AssetsDownloader.java
View File

@@ -23,7 +23,7 @@ import forge.util.FileUtil;
import static forge.localinstance.properties.ForgeConstants.ADV_TEXTURE_BG_FILE; import static forge.localinstance.properties.ForgeConstants.ADV_TEXTURE_BG_FILE;
import static forge.localinstance.properties.ForgeConstants.ASSETS_DIR; import static forge.localinstance.properties.ForgeConstants.ASSETS_DIR;
import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; import static forge.localinstance.properties.ForgeConstants.GITHUB_SNAPSHOT_URL;
import static forge.localinstance.properties.ForgeConstants.DEFAULT_SKINS_DIR; import static forge.localinstance.properties.ForgeConstants.DEFAULT_SKINS_DIR;
import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM; import static forge.localinstance.properties.ForgeConstants.GITHUB_COMMITS_ATOM;
import static forge.localinstance.properties.ForgeConstants.GITHUB_FORGE_URL; import static forge.localinstance.properties.ForgeConstants.GITHUB_FORGE_URL;
@@ -51,7 +51,7 @@ public class AssetsDownloader {
final String apkSize = "12MB"; final String apkSize = "12MB";
final boolean isSnapshots = versionString.contains("SNAPSHOT"); final boolean isSnapshots = versionString.contains("SNAPSHOT");
final String snapsURL = DAILY_SNAPSHOT_URL; final String snapsURL = GITHUB_SNAPSHOT_URL;
// desktop and mobile-dev share the same package // desktop and mobile-dev share the same package
final String guiChannel = GuiBase.isAndroid() ? "forge/forge-gui-android/" : "forge/forge-gui-desktop/"; final String guiChannel = GuiBase.isAndroid() ? "forge/forge-gui-android/" : "forge/forge-gui-desktop/";
final String releaseURL = RELEASE_URL + guiChannel; final String releaseURL = RELEASE_URL + guiChannel;
@@ -82,7 +82,7 @@ public class AssetsDownloader {
//current release on github is tar.bz2, update this to jar installer in the future... //current release on github is tar.bz2, update this to jar installer in the future...
filename = isSnapshots ? "forge-installer-" + version + ".jar" : releaseTag.replace("forge-", "forge-gui-desktop-") + ".tar.bz2"; filename = isSnapshots ? "forge-installer-" + version + ".jar" : releaseTag.replace("forge-", "forge-gui-desktop-") + ".tar.bz2";
String releaseBZ2URL = GITHUB_FORGE_URL + "releases/download/" + releaseTag + "/" + filename; String releaseBZ2URL = GITHUB_FORGE_URL + "releases/download/" + releaseTag + "/" + filename;
String snapsBZ2URL = DAILY_SNAPSHOT_URL + filename; String snapsBZ2URL = GITHUB_SNAPSHOT_URL + filename;
installerURL = isSnapshots ? snapsBZ2URL : releaseBZ2URL; installerURL = isSnapshots ? snapsBZ2URL : releaseBZ2URL;
} }
String snapsBuildDate = "", buildDate = ""; String snapsBuildDate = "", buildDate = "";

8
forge-gui/src/main/java/forge/download/AutoUpdater.java
View File

@@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static forge.localinstance.properties.ForgeConstants.DAILY_SNAPSHOT_URL; import static forge.localinstance.properties.ForgeConstants.GITHUB_SNAPSHOT_URL;
import static forge.localinstance.properties.ForgeConstants.RELEASE_URL; import static forge.localinstance.properties.ForgeConstants.RELEASE_URL;
public class AutoUpdater { public class AutoUpdater {
@@ -96,7 +96,7 @@ public class AutoUpdater {
return false; return false;
} }
versionUrlString = DAILY_SNAPSHOT_URL + "version.txt"; versionUrlString = GITHUB_SNAPSHOT_URL + "version.txt";
} else { } else {
if (!updateChannel.equalsIgnoreCase(localizer.getMessageorUseDefault("lblRelease", "Release"))) { if (!updateChannel.equalsIgnoreCase(localizer.getMessageorUseDefault("lblRelease", "Release"))) {
System.out.println("Release build versions must use release update channel to work"); System.out.println("Release build versions must use release update channel to work");
@@ -128,7 +128,7 @@ public class AutoUpdater {
try { try {
retrieveVersion(); retrieveVersion();
if (buildVersion.contains("SNAPSHOT")) { if (buildVersion.contains("SNAPSHOT")) {
URL url = new URL(DAILY_SNAPSHOT_URL + "build.txt"); URL url = new URL(GITHUB_SNAPSHOT_URL + "build.txt");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date snapsTimestamp = simpleDateFormat.parse(FileUtil.readFileToString(url)); Date snapsTimestamp = simpleDateFormat.parse(FileUtil.readFileToString(url));
snapsBuildDate = snapsTimestamp.toString(); snapsBuildDate = snapsTimestamp.toString();
@@ -161,7 +161,7 @@ public class AutoUpdater {
if (updateChannel.equalsIgnoreCase(localizer.getMessageorUseDefault("lblRelease", "Release"))) { if (updateChannel.equalsIgnoreCase(localizer.getMessageorUseDefault("lblRelease", "Release"))) {
packageUrl = RELEASE_URL + "forge/forge-gui-desktop/" + version + "/forge-gui-desktop-" + version + ".tar.bz2"; packageUrl = RELEASE_URL + "forge/forge-gui-desktop/" + version + "/forge-gui-desktop-" + version + ".tar.bz2";
} else { } else {
packageUrl = DAILY_SNAPSHOT_URL + "forge-installer-" + version + ".jar"; packageUrl = GITHUB_SNAPSHOT_URL + "forge-installer-" + version + ".jar";
} }
} }

2
forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java
View File

@@ -28,7 +28,7 @@ public final class ForgeConstants {
public static final String GITHUB_FORGE_URL = "https://github.com/Card-Forge/forge/"; public static final String GITHUB_FORGE_URL = "https://github.com/Card-Forge/forge/";
public static final String GITHUB_RELEASES_ATOM = GITHUB_FORGE_URL + "releases.atom"; public static final String GITHUB_RELEASES_ATOM = GITHUB_FORGE_URL + "releases.atom";
public static final String GITHUB_COMMITS_ATOM = GITHUB_FORGE_URL + "commits/master.atom"; public static final String GITHUB_COMMITS_ATOM = GITHUB_FORGE_URL + "commits/master.atom";
public static final String DAILY_SNAPSHOT_URL = "https://downloads.cardforge.org/dailysnapshots/"; public static final String GITHUB_SNAPSHOT_URL = GITHUB_FORGE_URL + "releases/download/daily-snapshots/";
public static final String RELEASE_URL = "https://releases.cardforge.org/"; public static final String RELEASE_URL = "https://releases.cardforge.org/";
public static final String PATH_SEPARATOR = File.separator; public static final String PATH_SEPARATOR = File.separator;
public static final String ASSETS_DIR = GuiBase.getInterface().getAssetsDir(); public static final String ASSETS_DIR = GuiBase.getInterface().getAssetsDir();