amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

trim filenames, apparently writing a file "some card " is not possible on windows, it drops the trailing space.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1448 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-07-21 18:06:54 +00:00
parent 07d4e8619b
commit f8c7961c03
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/set.cpp
+3 -1
View File
@@ -208,7 +208,9 @@ void Set::reflect_cards<Writer> (Writer& tag) {
} else { } else {
set<String> used; set<String> used;
FOR_EACH(card, cards) { FOR_EACH(card, cards) {
String filename = normalize_internal_filename(clean_filename(card->identification())); // pick a unique filename for this card
// can't use Package::newFileName, because then we get conflicts with the previous save of the same card
String filename = _("card ") + normalize_internal_filename(clean_filename(card->identification()));
String full_name = filename; String full_name = filename;
int i = 0; int i = 0;
src/util/file_utils.cpp
+8 -1
View File
@@ -42,11 +42,18 @@ bool is_filename_char(Char c) {
String clean_filename(const String& name) { String clean_filename(const String& name) {
String clean; String clean;
// allow only valid characters, and remove leading whitespace
bool start = true;
FOR_EACH_CONST(c, name) { FOR_EACH_CONST(c, name) {
if (is_filename_char(c)) { if (is_filename_char(c) && !(start && c == _(' '))) {
start = false;
clean += c; clean += c;
} }
} }
// remove trailing whitespace
while (!clean.empty() && clean[clean.size()-1] == _(' ')) {
clean.resize(clean.size()-1);
}
if (clean.empty() || starts_with(clean, _("."))) { if (clean.empty() || starts_with(clean, _("."))) {
clean = _("no-name") + clean; clean = _("no-name") + clean;
} }