Added --export command line flag

src/gui/images_export_window.cpp

@@ -56,26 +56,13 @@ ImagesExportWindow::ImagesExportWindow(Window* parent, const SetP& set)
 
 // ----------------------------------------------------------------------------- : Exporting the images
 
-void ImagesExportWindow::onOk(wxCommandEvent&) {
-	// Update settings
-	GameSettings& gs = settings.gameSettingsFor(*set->game);
-	gs.images_export_filename  = format->GetValue();
-	int sel = conflicts->GetSelection();
-	if      (sel == 0) gs.images_export_conflicts = CONFLICT_KEEP_OLD;
-	else if (sel == 1) gs.images_export_conflicts = CONFLICT_OVERWRITE;
-	else if (sel == 2) gs.images_export_conflicts = CONFLICT_NUMBER;
-	else               gs.images_export_conflicts = CONFLICT_NUMBER_OVERWRITE;
+void ExportCardImages::export(const SetP& set, wxFileName& fn, const String& filename_template, FilenameConflicts conflicts) {
 	// Script
-	ScriptP filename_script = parse(gs.images_export_filename, nullptr, true);
-	// Select filename
-	String name = wxFileSelector(_TITLE_("export images"),_(""), _LABEL_("filename is ignored"),_(""),
-		                         _LABEL_("filename is ignored")+_("|*"), wxSAVE, this);
-	if (name.empty()) return;
-	wxFileName fn(name);
+	ScriptP filename_script = parse(filename_template, nullptr, true);
 	// Export
 	std::set<String> used; // for CONFLICT_NUMBER_OVERWRITE
 	FOR_EACH(card, set->cards) {
-		if (isSelected(card)) {
+		if (exportCard(card)) {
 			// filename for this card
 			Context& ctx = set->getContext(card);
 			String filename = untag(ctx.eval(*filename_script)->toString());
@@ -85,7 +72,7 @@ void ImagesExportWindow::onOk(wxCommandEvent&) {
 			// does the file exist?
 			if (fn.FileExists()) {
 				// file exists, what to do?
-				switch (gs.images_export_conflicts) {
+				switch (conflicts) {
 					case CONFLICT_KEEP_OLD:  goto next_card;
 					case CONFLICT_OVERWRITE: break;
 					case CONFLICT_NUMBER: {
@@ -111,10 +98,32 @@ void ImagesExportWindow::onOk(wxCommandEvent&) {
 		}
 		next_card:;
 	}
+}
+
+void ImagesExportWindow::onOk(wxCommandEvent&) {
+	// Update settings
+	GameSettings& gs = settings.gameSettingsFor(*set->game);
+	gs.images_export_filename  = format->GetValue();
+	int sel = conflicts->GetSelection();
+	if      (sel == 0) gs.images_export_conflicts = CONFLICT_KEEP_OLD;
+	else if (sel == 1) gs.images_export_conflicts = CONFLICT_OVERWRITE;
+	else if (sel == 2) gs.images_export_conflicts = CONFLICT_NUMBER;
+	else               gs.images_export_conflicts = CONFLICT_NUMBER_OVERWRITE;
+	// Select filename
+	String name = wxFileSelector(_TITLE_("export images"),_(""), _LABEL_("filename is ignored"),_(""),
+		                         _LABEL_("filename is ignored")+_("|*"), wxSAVE, this);
+	if (name.empty()) return;
+	wxFileName fn(name);
+	// Export
+	export(set, fn, gs.images_export_filename, gs.images_export_conflicts);
 	// Done
 	EndModal(wxID_OK);
 }
 
+bool ImagesExportWindow::exportCard(const CardP& card) const {
+	return isSelected(card);
+}
+
 
 BEGIN_EVENT_TABLE(ImagesExportWindow,CardSelectWindow)
 	EVT_BUTTON       (wxID_OK,  ImagesExportWindow::onOk)

src/gui/images_export_window.hpp

@@ -11,11 +11,23 @@
 
 #include <util/prec.hpp>
 #include <gui/card_select_window.hpp>
+#include <data/settings.hpp>
+class wxFileName;
+
+// ----------------------------------------------------------------------------- : ImagesExportWindow
+
+/// Export the cards in a set
+class ExportCardImages {
+  public:
+	void export(const SetP& set, wxFileName& filename, const String& filename_template, FilenameConflicts conflicts);
+  protected:
+	virtual bool exportCard(const CardP& card) const { return true; }
+};
 
 // ----------------------------------------------------------------------------- : ImagesExportWindow
 
 /// A window for selecting a subset of the cards from a set to export to images
-class ImagesExportWindow : public CardSelectWindow {
+class ImagesExportWindow : public CardSelectWindow, private ExportCardImages {
   public:
 	ImagesExportWindow(Window* parent, const SetP& set);
 	
@@ -24,6 +36,8 @@ class ImagesExportWindow : public CardSelectWindow {
 	
 	void onOk(wxCommandEvent&);
 	
+	virtual bool exportCard(const CardP& card) const;
+	
 	wxTextCtrl* format;
 	wxChoice*   conflicts;
 };

src/main.cpp

@@ -16,6 +16,7 @@
 #include <data/format/formats.hpp>
 #include <gui/welcome_window.hpp>
 #include <gui/update_checker.hpp>
+#include <gui/images_export_window.hpp>
 #include <gui/set/window.hpp>
 #include <gui/symbol/window.hpp>
 #include <gui/thumbnail_thread.hpp>
@@ -139,12 +140,36 @@ int MSE::OnRun() {
 					            + _("  -v --version      \tShow version information.\n")
 					            + _("  --symbol-editor   \tShow the symbol editor instead of the welcome window.\n")
 					            + _("  --create-installer\n")
-					            + _("      FILE [FILE]...\tCreate an instaler named FILE, containing the listed packges.\n") );
+					            + _("      FILE [FILE]...\tCreate an instaler named FILE, containing the listed packges.\n")
+					            + _("  --export\n")
+					            + _("      FILE IMAGE    \tExport the cards in a set to image files,\n")
+					            + _("                    \tIMAGE is the same format as for 'export all card images'.\n") );
 					return EXIT_SUCCESS;
 				} else if (arg == _("--version") || arg == _("-v")) {
 					// dump version
 					write_stdout( _("Magic Set Editor\nVersion ") + app_version.toString() + version_suffix );
 					return EXIT_SUCCESS;
+				} else if (arg == _("--export")) {
+					if (argc <= 2) {
+						handle_error(Error(_("No input file specified for --export")));
+						return EXIT_FAILURE;
+					}
+					SetP set = import_set(argv[2]);
+					// path
+					String out = argc >= 3 ? argv[3] : settings.gameSettingsFor(*set->game).images_export_filename;
+					String path = _(".");
+					size_t pos = out.find_last_of(_("/\\"));
+					if (pos != String::npos) {
+						path = out.substr(0, pos);
+						if (!wxDirExists(path)) wxMkdir(path);
+						path += _("/x");
+						out  = out.substr(pos + 1);
+					}
+					wxFileName fn(path);
+					// export
+					ExportCardImages export;
+					export.export(set, fn, out, CONFLICT_NUMBER_OVERWRITE);
+					return EXIT_SUCCESS;
 				} else {
 					handle_error(_("Invalid command line argument:\n") + String(argv[1]));
 				}