fix magicville

nicho92 · Jan 2, 2024 · 328f7f1 · 328f7f1
1 parent 1e1e953
commit 328f7f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/org/magic/api/decksniffer/impl/MagicVilleDeckSniffer.java b/src/main/java/org/magic/api/decksniffer/impl/MagicVilleDeckSniffer.java
@@ -13,6 +13,7 @@
 import org.jsoup.select.Elements;
 import org.magic.api.beans.MagicDeck;
 import org.magic.api.beans.technical.RetrievableDeck;
+import org.magic.api.exports.impl.Apprentice2DeckExport;
 import org.magic.api.exports.impl.MagicWorkStationDeckExport;
 import org.magic.api.interfaces.abstracts.AbstractDeckSniffer;
 import org.magic.services.network.RequestBuilder;
@@ -48,9 +49,14 @@ public String[] listFilter() {
 	@Override
 	public MagicDeck getDeck(RetrievableDeck info) throws IOException {
 		var doc = RequestBuilder.build().setClient(URLTools.newClient()).get().url(info.getUrl()).toHtml();
-		var urlimport = baseUrl+doc.select("div.lil_menu > a[href^=dl_mws]").first().attr("href");
+		var urlimport = baseUrl+doc.select("div.lil_menu > a[href^=dl_appr]").first().attr("href");
 		var content = RequestBuilder.build().setClient(URLTools.newClient()).get().url(urlimport).toContentString();
-		var imp = new MagicWorkStationDeckExport();
+		var imp = new Apprentice2DeckExport() {
+			@Override
+			protected String getStringPattern() {
+				return "nocomma";
+			}
+		};
 
 		try {
 			imp.addObserver(listObservers().get(0));

diff --git a/src/main/java/org/magic/api/interfaces/abstracts/extra/AbstractFormattedFileCardExport.java b/src/main/java/org/magic/api/interfaces/abstracts/extra/AbstractFormattedFileCardExport.java
@@ -113,6 +113,9 @@ public List<Matcher> matches(String content,boolean removeBlank)
 
 	public List<Matcher> matches(String content,boolean removeBlank, String pattern)
 	{
+
+		logger.info("Reading deck with regex {}", pattern);
+
 		List<Matcher> ret = new ArrayList<>();
 		for(String line : splitLines(content,removeBlank))
 		{

diff --git a/src/main/resources/data/pluginsAliases.json b/src/main/resources/data/pluginsAliases.json
@@ -117,7 +117,8 @@
 	},
 	"Apprentice": {
 		"regex": {
-			"default": "(MD|SB),(\\d+),(\"[^\"]*\"),{0,1}([^\"]*){0,1}$"
+			"default": "(MD|SB),(\\d+),(\"[^\"]*\"),{0,1}([^\"]*){0,1}$",
+			"nocomma": "(SB: )?(\\d+) (.*?)$"
 		}
 	},
 	"Card Kingdom CSV": {