External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 04:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: improved deck editor exports:

Browse source 
* added deck export to files (#4243);
 * fixed wrong card sorting in deck files after save (#3719);
This commit is contained in:
Oleg Agafonov 2019-03-21 19:17:41 +04:00
parent 8b5993805a
commit 04cb20f46a
14 changed files with 482 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Mage/src/main/java/mage/cards/decks/DeckFileFilter.java Normal file
View file

@ -0,0 +1,40 @@
package mage.cards.decks;
import javax.swing.filechooser.FileFilter;
import java.io.File;
import java.util.Locale;
/**
* @author JayDi85
*/
public class DeckFileFilter extends FileFilter {
private final String ext;
private final String description;
public DeckFileFilter(String ext, String description) {
this.ext = ext.toLowerCase(Locale.ENGLISH);
this.description = description;
}
@Override
public boolean accept(File f) {
if (f.isDirectory()) {
return true;
}
String fileExt = null;
String s = f.getName();
int i = s.lastIndexOf('.');
if (i > 0 && i < s.length() - 1) {
fileExt = s.substring(i + 1).toLowerCase(Locale.ENGLISH);
}
return (fileExt != null) && fileExt.equals(this.ext);
}
@Override
public String getDescription() {
return description;
}
}

53
Mage/src/main/java/mage/cards/decks/DeckFormats.java
View file

@ -1,16 +1,20 @@
package mage.cards.decks;
import mage.cards.decks.exporter.DckExporter;
import mage.cards.decks.exporter.DeckExporter;
import mage.cards.decks.exporter.MtgoExporter;
import mage.cards.decks.exporter.MtgoDeckExporter;
import mage.cards.decks.exporter.XmageDeckExporter;
import javax.swing.filechooser.FileFilter;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Optional;
public enum DeckFormats {
DCK(new DckExporter()),
MTGO(new MtgoExporter());
XMAGE(new XmageDeckExporter()),
MTGO(new MtgoDeckExporter());
private final DeckExporter exporter;
@ -23,24 +27,47 @@ public enum DeckFormats {
}
public static Optional<DeckFormats> getFormatForExtension(String filename) {
return getExtension(filename).map(c -> {
try {
return DeckFormats.valueOf(c);
} catch (IllegalArgumentException e) {
return null;
String exp = getExtension(filename).orElse("");
for (DeckFormats df : values()) {
if (!exp.isEmpty() && df.getExporter().getDefaultFileExt().equals(exp)) {
return Optional.of(df);
}
});
}
return Optional.empty();
}
public static Optional<String> getExtension(String filename) {
int i = filename.lastIndexOf('.');
if (i > 0) {
return Optional.of(filename.substring(i+1).toUpperCase());
if (i > 0 && i < filename.length() - 1) {
return Optional.of(filename.substring(i + 1).toLowerCase(Locale.ENGLISH));
} else {
return Optional.empty();
}
}
public static Optional<DeckFormats> getFormatForFilter(FileFilter filter) {
for (DeckFormats df : values()) {
if (df.getExporter().getFileFilter().equals(filter)) {
return Optional.of(df);
}
}
return Optional.empty();
}
public static String getDefaultFileExtForFilter(FileFilter filter) {
return getFormatForFilter(filter)
.map(df -> df.getExporter().getDefaultFileExt())
.orElse("");
}
public static List<FileFilter> getFileFilters() {
List<FileFilter> res = new ArrayList<>();
for (DeckFormats df : values()) {
res.add(df.getExporter().getFileFilter());
}
return res;
}
public static void writeDeck(String file, DeckCardLists deck) throws IOException {
writeDeck(new File(file), deck);
}
@ -65,7 +92,7 @@ public enum DeckFormats {
}
public static void writeDeck(File file, DeckCardLists deck, DeckExporter exporter) throws IOException {
try (FileOutputStream out = new FileOutputStream(file)){
try (FileOutputStream out = new FileOutputStream(file)) {
writeDeck(out, deck, exporter);
}
}

45
Mage/src/main/java/mage/cards/decks/DeckFormatsTest.java Normal file
View file

@ -0,0 +1,45 @@
package mage.cards.decks;
import org.junit.Assert;
import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
/**
* @author JayDi85
*/
public class DeckFormatsTest {
@Test
public void test_FormatsExt() {
Map<String, DeckFormats> extList = new HashMap<>();
for (DeckFormats df : DeckFormats.values()) {
// 1. must be unique
if (extList.containsKey(df.getExporter().getDefaultFileExt())) {
Assert.fail("Default ext must be unique for each format: " + df.getExporter().getDescription());
} else {
extList.putIfAbsent(df.getExporter().getDefaultFileExt(), df);
}
// 2. must work with files
String fileName = "C:\\xmage\\deck" + "." + df.getExporter().getDefaultFileExt();
Assert.assertTrue("Must support lower ext: " + df.getExporter().getDescription(), DeckFormats.getFormatForExtension(fileName.toLowerCase()).isPresent());
Assert.assertTrue("Must support upper ext: " + df.getExporter().getDescription(), DeckFormats.getFormatForExtension(fileName.toUpperCase()).isPresent());
}
// 3. wrong ext
Assert.assertFalse("Must not find empty ext", DeckFormats.getFormatForExtension("deck").isPresent());
Assert.assertFalse("Must not find . ext", DeckFormats.getFormatForExtension("deck.").isPresent());
Assert.assertFalse("Must not find unknown ext", DeckFormats.getFormatForExtension("deck.xxx").isPresent());
// 3. double ext
String fileName = "C:\\xmage\\deck"
+ "." + DeckFormats.XMAGE.getExporter().getDefaultFileExt()
+ "." + DeckFormats.MTGO.getExporter().getDefaultFileExt();
Assert.assertEquals("Must find mtgo", DeckFormats.getFormatForExtension(fileName).get(), DeckFormats.MTGO);
fileName = "C:\\xmage\\deck"
+ "." + DeckFormats.MTGO.getExporter().getDefaultFileExt()
+ "." + DeckFormats.XMAGE.getExporter().getDefaultFileExt();
Assert.assertEquals("Must find xmage", DeckFormats.getFormatForExtension(fileName).get(), DeckFormats.XMAGE);
}
}

82
Mage/src/main/java/mage/cards/decks/exporter/DckExporter.java
View file

@ -1,82 +0,0 @@
package mage.cards.decks.exporter;
import mage.cards.decks.DeckCardInfo;
import mage.cards.decks.DeckCardLayout;
import mage.cards.decks.DeckCardLists;
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class DckExporter extends DeckExporter {
public void writeDeck(PrintWriter out, DeckCardLists deck) {
Map<String, DeckCardInfo> deckCards = new HashMap<>();
Map<String, DeckCardInfo> sideboard = new HashMap<>();
if (deck.getName() != null && !deck.getName().isEmpty()) {
out.println("NAME:" + deck.getName());
}
if (deck.getAuthor() != null && !deck.getAuthor().isEmpty()) {
out.println("AUTHOR:" + deck.getAuthor());
}
for (DeckCardInfo deckCardInfo : deck.getCards()) {
if (deckCards.containsKey(deckCardInfo.getCardKey())) {
deckCards.put(deckCardInfo.getCardKey(), deckCards.get(deckCardInfo.getCardKey()).increaseQuantity());
} else {
deckCards.put(deckCardInfo.getCardKey(), deckCardInfo);
}
}
for (DeckCardInfo deckCardInfo : deck.getSideboard()) {
if (sideboard.containsKey(deckCardInfo.getCardKey())) {
sideboard.put(deckCardInfo.getCardKey(), sideboard.get(deckCardInfo.getCardKey()).increaseQuantity());
} else {
sideboard.put(deckCardInfo.getCardKey(), deckCardInfo);
}
}
// Write out all of the cards
for (Map.Entry<String, DeckCardInfo> entry : deckCards.entrySet()) {
out.printf("%d [%s:%s] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName());
}
for (Map.Entry<String, DeckCardInfo> entry : sideboard.entrySet()) {
out.printf("SB: %d [%s:%s] %s%n", entry.getValue().getQuantity(), entry.getValue().getSetCode(), entry.getValue().getCardNum(), entry.getValue().getCardName());
}
// Write out the layout
out.print("LAYOUT MAIN:");
writeCardLayout(out, deck.getCardLayout());
out.println("");
out.print("LAYOUT SIDEBOARD:");
writeCardLayout(out, deck.getSideboardLayout());
out.println("");
}
private static void writeCardLayout(PrintWriter out, DeckCardLayout layout) {
if (layout == null) {
return;
}
List<List<List<DeckCardInfo>>> cardGrid = layout.getCards();
int height = cardGrid.size();
int width = (height > 0) ? cardGrid.get(0).size() : 0;
out.print("(" + height + ',' + width + ')');
out.print(layout.getSettings());
out.print("|");
for (List<List<DeckCardInfo>> row : cardGrid) {
for (List<DeckCardInfo> stack : row) {
out.print("(");
for (int i = 0; i < stack.size(); ++i) {
DeckCardInfo info = stack.get(i);
out.printf("[%s:%s]", info.getSetCode(), info.getCardNum());
if (i != stack.size() - 1) {
out.print(",");
}
}
out.print(")");
}
}
}
}

11
Mage/src/main/java/mage/cards/decks/exporter/DeckExporter.java
View file

@ -3,7 +3,11 @@ package mage.cards.decks.exporter;
import mage.cards.decks.DeckCardLists;
import mage.cards.decks.DeckFormats;
import java.io.*;
import javax.swing.filechooser.FileFilter;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
public abstract class DeckExporter {
@ -21,4 +25,9 @@ public abstract class DeckExporter {
public abstract void writeDeck(PrintWriter out, DeckCardLists deck);
public abstract FileFilter getFileFilter();
public abstract String getDefaultFileExt();
public abstract String getDescription();
}

22
Mage/src/main/java/mage/cards/decks/exporter/MtgoExporter.java → Mage/src/main/java/mage/cards/decks/exporter/MtgoDeckExporter.java
View file

@ -2,12 +2,18 @@ package mage.cards.decks.exporter;
import mage.cards.decks.DeckCardInfo;
import mage.cards.decks.DeckCardLists;
import mage.cards.decks.DeckFileFilter;
import javax.swing.filechooser.FileFilter;
import java.io.PrintWriter;
import java.util.List;
import java.util.TreeMap;
public class MtgoExporter extends DeckExporter {
public class MtgoDeckExporter extends DeckExporter {
private final String ext = "dek";
private final String description = "MTGO's deck format (*.dek)";
private final FileFilter fileFilter = new DeckFileFilter(ext, description);
@Override
public void writeDeck(PrintWriter out, DeckCardLists deck) {
@ -40,4 +46,18 @@ public class MtgoExporter extends DeckExporter {
return counts;
}
@Override
public FileFilter getFileFilter() {
return fileFilter;
}
@Override
public String getDescription() {
return description;
}
@Override
public String getDefaultFileExt() {
return ext;
}
}

113
Mage/src/main/java/mage/cards/decks/exporter/XmageDeckExporter.java Normal file
View file

@ -0,0 +1,113 @@
package mage.cards.decks.exporter;
import mage.cards.decks.DeckCardInfo;
import mage.cards.decks.DeckCardLayout;
import mage.cards.decks.DeckCardLists;
import mage.cards.decks.DeckFileFilter;
import javax.swing.filechooser.FileFilter;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class XmageDeckExporter extends DeckExporter {
private final String ext = "dck";
private final String description = "XMage's deck format (*.dck)";
private final FileFilter fileFilter = new DeckFileFilter(ext, description);
@Override
public void writeDeck(PrintWriter out, DeckCardLists deck) {
List<DeckCardInfo> deckMain = new ArrayList<>();
List<DeckCardInfo> deckSideboard = new ArrayList<>();
Map<String, Integer> amount = new HashMap<>();
// info
if (deck.getName() != null && !deck.getName().isEmpty()) {
out.println("NAME:" + deck.getName());
}
if (deck.getAuthor() != null && !deck.getAuthor().isEmpty()) {
out.println("AUTHOR:" + deck.getAuthor());
}
// main
for (DeckCardInfo card : deck.getCards()) {
String code = "M@" + card.getCardKey();
int curAmount = amount.getOrDefault(code, 0);
if (curAmount == 0) {
deckMain.add(card);
}
amount.put(code, curAmount + card.getQuantity());
}
// sideboard
for (DeckCardInfo card : deck.getSideboard()) {
String code = "S@" + card.getCardKey();
int curAmount = amount.getOrDefault(code, 0);
if (curAmount == 0) {
deckSideboard.add(card);
}
amount.put(code, curAmount + card.getQuantity());
}
// cards print
for (DeckCardInfo card : deckMain) {
out.printf("%d [%s:%s] %s%n", amount.get("M@" + card.getCardKey()), card.getSetCode(), card.getCardNum(), card.getCardName());
}
for (DeckCardInfo card : deckSideboard) {
out.printf("SB: %d [%s:%s] %s%n", amount.get("S@" + card.getCardKey()), card.getSetCode(), card.getCardNum(), card.getCardName());
}
// layout print
if (deck.getCardLayout() != null) {
out.print("LAYOUT MAIN:");
writeCardLayout(out, deck.getCardLayout());
out.println("");
out.print("LAYOUT SIDEBOARD:");
writeCardLayout(out, deck.getSideboardLayout());
out.println("");
}
}
private static void writeCardLayout(PrintWriter out, DeckCardLayout layout) {
if (layout == null) {
return;
}
List<List<List<DeckCardInfo>>> cardGrid = layout.getCards();
int height = cardGrid.size();
int width = (height > 0) ? cardGrid.get(0).size() : 0;
out.print("(" + height + ',' + width + ')');
out.print(layout.getSettings());
out.print("|");
for (List<List<DeckCardInfo>> row : cardGrid) {
for (List<DeckCardInfo> stack : row) {
out.print("(");
for (int i = 0; i < stack.size(); ++i) {
DeckCardInfo info = stack.get(i);
out.printf("[%s:%s]", info.getSetCode(), info.getCardNum());
if (i != stack.size() - 1) {
out.print(",");
}
}
out.print(")");
}
}
}
@Override
public FileFilter getFileFilter() {
return fileFilter;
}
@Override
public String getDescription() {
return description;
}
@Override
public String getDefaultFileExt() {
return ext;
}
}