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

add importer option for including pictures in set-specific card directories that don't map to any currently known card. this handles the case where people have collected complete sets of pics in anticipation of when Forge supports them

Browse Source
This commit is contained in:
myk
2013-03-28 21:02:04 +00:00
parent 9e4aa72b15
commit 0204c79c1d
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/forge/gui/DialogMigrateProfile.java
View File

@@ -370,7 +370,14 @@ public class DialogMigrateProfile {
_addSelectionWidget(cachePanel, OpType.SET_CARD_PIC, "Set-specific card pics");
_addSelectionWidget(cachePanel, OpType.TOKEN_PIC, "Card token pics");
_addSelectionWidget(cachePanel, OpType.QUEST_PIC, "Quest-related pics");
_addSelectionWidget(cachePanel, OpType.DB_FILE, "Database files");
_addSelectionWidget(cachePanel, OpType.DB_FILE, "Database files", true, null, "wrap");
_addSelectionWidget(cachePanel, OpType.POSSIBLE_SET_CARD_PIC,
"Import possible set pics from as-yet unsupported cards", false,
"<html>Picture files that are not recognized as belonging to any known card.<br>" +
"It could be that these pictures belong to cards that are not yet supported<br>" +
"by Forge. If you know this to be the case and want the pictures imported for<br>" +
"future use, select this option.<html>", "span");
cbPanel.add(cachePanel, "aligny top");
_selectionPanel.add(cbPanel, "center");
@@ -378,10 +385,12 @@ public class DialogMigrateProfile {
JPanel ioOptionPanel = new JPanel(new MigLayout("insets 0, gap 10"));
ioOptionPanel.setOpaque(false);
_moveCheckbox = new FCheckBox("Remove source files after copy");
_moveCheckbox.setToolTipText("Move files into the data directories instead of just copying them");
_moveCheckbox.setSelected(isMigration);
_moveCheckbox.addChangeListener(_stateChangedListener);
ioOptionPanel.add(_moveCheckbox);
_overwriteCheckbox = new FCheckBox("Overwrite files in destination");
_overwriteCheckbox.setToolTipText("Overwrite existing data with the imported data");
_overwriteCheckbox.addChangeListener(_stateChangedListener);
ioOptionPanel.add(_overwriteCheckbox);
_selectionPanel.add(ioOptionPanel);
@@ -418,16 +427,22 @@ public class DialogMigrateProfile {
}
private void _addSelectionWidget(JPanel parent, OpType type, String name) {
_addSelectionWidget(parent, type, name, true, null, null);
}
private void _addSelectionWidget(JPanel parent, OpType type, String name, boolean selected,
String tooltip, String constraints) {
FCheckBox cb = new FCheckBox();
cb.setName(name);
cb.setSelected(true);
cb.setSelected(selected);
cb.setToolTipText(tooltip);
cb.addChangeListener(_stateChangedListener);
// use a skip list map instead of a regular hashmap so that the files are sorted
// alphabetically in the logs. note that this is a concurrent data structure
// since it will be modified and read simultaneously by different threads
_selections.put(type, Pair.of(cb, new ConcurrentSkipListMap<File, File>()));
parent.add(cb);
parent.add(cb, constraints);
}
// must be called from GUI event loop thread
@@ -691,10 +706,13 @@ public class DialogMigrateProfile {
while (true) {
synchronized (this) {
// can't check _stop in the while condition since we have to do it in a synchronized block
if (_stop) { break; }
while (lastUpdateCallCnt == _updateCallCnt) {
// if we're stopped while looping here, run through the update one last time
// before returning
while (lastUpdateCallCnt == _updateCallCnt && !_stop) {
wait();
if (_stop) { break; }
}
// safely copy synchronized data to local values that we will use for this runthrough

13
src/main/java/forge/gui/MigrationSourceAnalyzer.java
View File

@@ -49,6 +49,7 @@ public class MigrationSourceAnalyzer {
UNKNOWN_DECK,
DEFAULT_CARD_PIC,
SET_CARD_PIC,
POSSIBLE_SET_CARD_PIC,
TOKEN_PIC,
QUEST_PIC,
GAUNTLET_DATA,
@@ -421,9 +422,17 @@ public class MigrationSourceAnalyzer {
if (_nameUpdates.containsKey(filename)) {
filename = _nameUpdates.get(filename);
}
return validFilenames.containsKey(filename) ? validFilenames.get(filename) : null;
if (validFilenames.containsKey(filename)) {
return validFilenames.get(filename);
} else if (StringUtils.endsWithIgnoreCase(filename, ".jpg")
|| StringUtils.endsWithIgnoreCase(filename, ".png")) {
return filename;
}
return null;
}
@Override public OpType getOpType(String filename) {
return validFilenames.containsKey(filename) ? OpType.SET_CARD_PIC : OpType.POSSIBLE_SET_CARD_PIC;
}
@Override public OpType getOpType(String filename) { return OpType.SET_CARD_PIC; }
});
}