Skip to content

Commit 1fc9997

Browse files
committed
Auto change download source to default if the using one is not existed
1 parent d387cd9 commit 1fc9997

4 files changed

Lines changed: 15 additions & 3 deletions

File tree

core/src/bms/player/beatoraja/Config.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import java.nio.charset.StandardCharsets;
88
import java.nio.file.*;
99
import java.text.ParseException;
10+
11+
import bms.tool.mdprocessor.HttpDownloadSourceMeta;
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214

@@ -870,6 +872,7 @@ public boolean validate() {
870872
playerpath = playerpath != null ? playerpath : PLAYERPATH_DEFAULT;
871873
skinpath = skinpath != null ? skinpath : SKINPATH_DEFAULT;
872874
downloadDirectory = validatePath(downloadDirectory) ? downloadDirectory : DEFAULT_DOWNLOAD_DIRECTORY;
875+
downloadSource = validateDownloadSource(downloadSource) ? downloadSource : HttpDownloadProcessor.getDefaultDownloadSource().getName();
873876
return true;
874877
}
875878

@@ -983,4 +986,8 @@ private boolean validatePath(String path) {
983986
}
984987
return true;
985988
}
989+
990+
private boolean validateDownloadSource(String downloadSource) {
991+
return HttpDownloadProcessor.DOWNLOAD_SOURCES.containsKey(downloadSource);
992+
}
986993
}

core/src/bms/player/beatoraja/launcher/PlayConfigurationView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import java.net.URL;
99
import java.nio.file.*;
1010
import java.util.*;
11+
12+
import bms.tool.mdprocessor.HttpDownloadSource;
13+
import bms.tool.mdprocessor.HttpDownloadSourceMeta;
1114
import org.slf4j.Logger;
1215
import org.slf4j.LoggerFactory;
1316
import java.util.function.Supplier;

core/src/bms/tool/mdprocessor/HttpDownloadProcessor.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ public class HttpDownloadProcessor {
4646
// Ginger
4747
HttpDownloadSourceMeta gingerDownloadSourceMeta = GingerDownloadSource.META;
4848
DOWNLOAD_SOURCES.put(gingerDownloadSourceMeta.getName(), gingerDownloadSourceMeta);
49-
// Wriggle
50-
HttpDownloadSourceMeta wriggleDownloadSourceMeta = WriggleDownloadSource.META;
51-
DOWNLOAD_SOURCES.put(wriggleDownloadSourceMeta.getName(), wriggleDownloadSourceMeta);
5249
// Konmai
5350
HttpDownloadSourceMeta konmaiDownloadSourceMeta = KonmaiDownloadSource.META;
5451
DOWNLOAD_SOURCES.put(konmaiDownloadSourceMeta.getName(), konmaiDownloadSourceMeta);

core/src/bms/tool/mdprocessor/WriggleDownloadSource.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
import bms.player.beatoraja.Config;
44

5+
/**
6+
* Wriggle download source is shutdown during the development of 0.4.0. It's not an usable download source
7+
* anymore. The code retained here is only for use of reference.
8+
*/
9+
@Deprecated
510
public class WriggleDownloadSource implements HttpDownloadSource {
611
public static final HttpDownloadSourceMeta META = new HttpDownloadSourceMeta(
712
"wriggle",

0 commit comments

Comments
 (0)