From d5b83371214584e92af72df8afd562e9f477818f Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 26 Jun 2016 19:26:52 +0800 Subject: [PATCH] support importing forge decks --- .../mtg/Android/src/net/wagic/utils/DeckImporter.java | 9 ++++++++- projects/mtg/Android/src/org/libsdl/app/SDLActivity.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java b/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java index 7341cf4ee..5062c439d 100644 --- a/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java +++ b/projects/mtg/Android/src/net/wagic/utils/DeckImporter.java @@ -17,6 +17,7 @@ public class DeckImporter String message = ""; String deck = ""; String deckname = ""; + String prefix = "#SB:"; if(f.exists() && !f.isDirectory()) { deckname = f.getName(); @@ -33,15 +34,21 @@ public class DeckImporter { while (scanner.hasNext()) { + boolean foundSideboard = false; String line = scanner.nextLine(); + if(line.toLowerCase().contains("sideboard")) + foundSideboard = true; String[] slines = line.split("\\s+"); String arranged = ""; for(int idx = 1; idx < slines.length; idx++) { arranged += slines[idx] + " "; } - if (isNumeric(slines[0]) && arranged != null) + if ((isNumeric(slines[0])||foundSideboard) && arranged != null) { + if (foundSideboard) + deck += prefix; + if (slines[1] != null && slines[1].startsWith("[")) { arranged = arranged.substring(5); diff --git a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java index 1d35cb15b..4c4d166ba 100644 --- a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java +++ b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java @@ -221,7 +221,7 @@ public class SDLActivity extends Activity implements OnKeyListener File[] files = root.listFiles(); for( File f : files) { - if( !myresult.contains(f.toString()) && (f.toString().contains(".txt")||f.toString().contains(".dec"))) + if( !myresult.contains(f.toString()) && (f.toString().contains(".txt")||f.toString().contains(".dck")||f.toString().contains(".dec"))) myresult.add(f.toString()); }