iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Save a backup copy of the old hotkey file if migrating from the old format

This commit is contained in:
Thomas Goyne 2014-07-07 09:04:23 -07:00
parent 365c04333c
commit a11da3350c
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libaegisub/common/hotkey.cpp
View File

@ -15,6 +15,7 @@
#include "libaegisub/hotkey.h" #include "libaegisub/hotkey.h"
#include "libaegisub/cajun/writer.h" #include "libaegisub/cajun/writer.h"
#include "libaegisub/fs.h"
#include "libaegisub/io.h" #include "libaegisub/io.h"
#include "libaegisub/json.h" #include "libaegisub/json.h"
#include "libaegisub/log.h" #include "libaegisub/log.h"
@ -43,6 +44,7 @@ struct hotkey_visitor : json::ConstVisitor {
std::string const& context; std::string const& context;
std::string const& command; std::string const& command;
Hotkey::HotkeyMap& map; Hotkey::HotkeyMap& map;
bool needs_backup = false;
hotkey_visitor(std::string const& context, std::string const& command, Hotkey::HotkeyMap& map) hotkey_visitor(std::string const& context, std::string const& command, Hotkey::HotkeyMap& map)
: context(context), command(command), map(map) { } : context(context), command(command), map(map) { }
@ -72,6 +74,7 @@ struct hotkey_visitor : json::ConstVisitor {
key_str += static_cast<std::string const&>(key_it->second); key_str += static_cast<std::string const&>(key_it->second);
map.insert(make_pair(command, Combo(context, command, std::move(key_str)))); map.insert(make_pair(command, Combo(context, command, std::move(key_str))));
needs_backup = true;
} }
void Visit(const json::Array& array) override { } void Visit(const json::Array& array) override { }
@ -100,6 +103,7 @@ void Hotkey::BuildHotkey(std::string const& context, json::Object const& hotkeys
hotkey_visitor visitor{context, command.first, cmd_map}; hotkey_visitor visitor{context, command.first, cmd_map};
for (auto const& hotkey : command_hotkeys) for (auto const& hotkey : command_hotkeys)
hotkey.Accept(visitor); hotkey.Accept(visitor);
backup_config_file |= visitor.needs_backup;
} }
} }
@ -183,6 +187,9 @@ void Hotkey::Flush() {
combo_array.push_back(keys); combo_array.push_back(keys);
} }
if (backup_config_file && fs::FileExists(config_file) && !fs::FileExists(config_file.string() + ".3_1"))
fs::Copy(config_file, config_file.string() + ".3_1");
io::Save file(config_file); io::Save file(config_file);
JsonWriter::Write(root, file.Get()); JsonWriter::Write(root, file.Get());
} }

1
libaegisub/include/libaegisub/hotkey.h
View File

@ -67,6 +67,7 @@ private:
HotkeyMap cmd_map; ///< Command name -> Combo HotkeyMap cmd_map; ///< Command name -> Combo
std::vector<const Combo *> str_map; ///< Sorted by string representation std::vector<const Combo *> str_map; ///< Sorted by string representation
const agi::fs::path config_file; ///< Default user config location. const agi::fs::path config_file; ///< Default user config location.
bool backup_config_file = false;
/// Build hotkey map. /// Build hotkey map.
/// @param context Context being parsed. /// @param context Context being parsed.

21
tests/tests/hotkey.cpp
View File

@ -17,6 +17,8 @@
#include <libaegisub/fs.h> #include <libaegisub/fs.h>
#include <libaegisub/hotkey.h> #include <libaegisub/hotkey.h>
#include <fstream>
using namespace agi::hotkey; using namespace agi::hotkey;
static const char simple_valid[] = R"raw({ static const char simple_valid[] = R"raw({
@ -196,3 +198,22 @@ TEST(lagi_hotkey, combo_stuff) {
EXPECT_STREQ("cmd2", c.CmdName().c_str()); EXPECT_STREQ("cmd2", c.CmdName().c_str());
EXPECT_STREQ("Default", c.Context().c_str()); EXPECT_STREQ("Default", c.Context().c_str());
} }
TEST(lagi_hotkey, old_format_is_backed_up_before_migrating) {
{
std::ofstream tmp("data/hotkey_tmp");
tmp.write(simple_valid, sizeof(simple_valid));
}
{
Hotkey h("data/hotkey_tmp", "{}");
h.SetHotkeyMap(h.GetHotkeyMap());
}
{
std::ifstream tmp("data/hotkey_tmp.3_1");
ASSERT_TRUE(tmp.good());
char buff[sizeof(simple_valid)];
tmp.read(buff, sizeof(buff));
ASSERT_TRUE(memcmp(buff, simple_valid, sizeof(buff)) == 0);
}
}