Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
*happy* Thanks for testing, everyone! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1588063 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Review: Approve Nice, thanks Gun. I can compile fine and do not find those bugs active any longer. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Review: Resubmit I have decided to only filter out the characters that can lead to potential crashes, not the "inconvenient" ones that look confusing on the command line (like e.g. $). I have tested on Windows and all should be fine now - both bugs fixed. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Review: Approve compile, review, test
OK, Tested some "evil" charaters. On OSX '`ยด&$()[]{} are allowed while |/":*
are not (incomplete).
Maybe we should filter these as well, to avoid Filenames with bad effects on
the Commandline?
OTOH the average user will not not use such characters, will he/she?
Code LGTM, but I can test OSX only, so we need some Windows test, too.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1588063.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Continuous integration builds have changed state: Travis build 1236. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/149854580. Appveyor build 1078. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1588063-1078. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Testing on OSX: * removed .widelands folder * :bug-1588063$ ./widelands --editor * Created some random map and saved it * found ./widelands/maps/My_Maps, OK * Copied some selfmade map into ./widelands/maps ls -R maps Crossriver.wmf My_Maps maps/My_Maps: Test1608558.wmf * I can open Crossriver.wmf in the Editor, is merged into the list of Maps. I now will restore my old .widelands folder an try some evil characters -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Continuous integration builds have changed state: Travis build 1231. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/149798427. Appveyor build 1073. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1588063-1073. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Bunnybot encountered an error while working on this merge proposal: The read operation timed out -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Continuous integration builds have changed state: Travis build 1229. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/149710458. Appveyor build 1071. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1588063-1071. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1588063 into lp:widelands has been updated. Commit Message changed to: Fix automatic creation of the maps/My_Maps folder in Windows. Prevent the user from entering illegal filenames. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Continuous integration builds have changed state: Travis build 1222. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148893466. Appveyor build 1064. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1588063-1064. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Bunnybot encountered an error while working on this merge proposal: -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Continuous integration builds have changed state: Travis build 1222. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148893466. Appveyor build 1064. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1588063-1064. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Bunnybot encountered an error while working on this merge proposal: The read operation timed out -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Continuous integration builds have changed state: Travis build 1222. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148893466. Appveyor build 1064. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1588063-1064. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Continuous integration builds have changed state: Travis build 1222. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/148893466. Appveyor build 1064. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1588063-1064. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Review: Needs Fixing Found another bug in the current state of implementation: https://bugs.launchpad.net/widelands/+bug/1608558 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1588063. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Ah, bl*** file separators, my bad. I will look into concatenating this properly. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1588063 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1588063 into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/bug-1588063 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1588063 in widelands: "Map folder gets not created"
https://bugs.launchpad.net/widelands/+bug/1588063
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1588063/+merge/301636
Use system dependant file seperator for the My_Maps subdirectory.
Now ensure_directory_exists() does work also on win32.
I don't like the #ifdef __win32 solution, but i was not able to
FileSystem::file_separator() because i lack c++ knowledge to concatenate
char/char*/char[].
Suggestions welcome.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1588063 into lp:widelands.
=== modified file 'src/editor/ui_menus/main_menu_save_map.cc'
--- src/editor/ui_menus/main_menu_save_map.cc 2016-05-17 07:53:03 +
+++ src/editor/ui_menus/main_menu_save_map.cc 2016-08-01 11:14:29 +
@@ -49,8 +49,11 @@
// TODO(GunChleoc): Arabic: Make directory dialog: buttons need more height for Arabic.
MainMenuSaveMap::MainMenuSaveMap(EditorInteractive& parent)
+ #ifdef _WIN32
+ : MainMenuLoadOrSaveMap(parent, 3, "save_map_menu", _("Save Map"), "maps\\My_Maps"),
+ #elif
: MainMenuLoadOrSaveMap(parent, 3, "save_map_menu", _("Save Map"), "maps/My_Maps"),
-
+ #endif
make_directory_(this,
"make_directory",
right_column_x_,
=== modified file 'src/wui/mapdata.cc'
--- src/wui/mapdata.cc 2016-07-24 11:50:34 +
+++ src/wui/mapdata.cc 2016-08-01 11:14:29 +
@@ -162,7 +162,11 @@
if (boost::equals(directory, "maps/MP_Scenarios")) {
/** TRANSLATORS: Directory name for MP Scenarios in map selection */
localized_name = _("Multiplayer Scenarios");
+ #ifdef _WIN32
+ } else if (boost::equals(directory, "maps\\My_Maps")) {
+ #else
} else if (boost::equals(directory, "maps/My_Maps")) {
+ #endif
/** TRANSLATORS: Directory name for user maps in map selection */
localized_name = _("My Maps");
} else {
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
