Release v0.3.0: move settings into an on-demand single-instance configurator
This commit is contained in:
+11
-3
@@ -102,6 +102,10 @@ void validateSettings(const Settings &s)
|
||||
}
|
||||
}
|
||||
Settings loadSettings(const std::filesystem::path &path, const std::vector<Layout> &layouts)
|
||||
{
|
||||
return decodeSettings(std::filesystem::exists(path) ? readFile(path, 4 * 1024 * 1024) : Bytes{}, layouts);
|
||||
}
|
||||
Settings decodeSettings(const Bytes &bytes, const std::vector<Layout> &layouts)
|
||||
{
|
||||
Settings s;
|
||||
for (size_t i = 0; i < layouts.size(); ++i)
|
||||
@@ -111,9 +115,9 @@ Settings loadSettings(const std::filesystem::path &path, const std::vector<Layou
|
||||
s.direct.push_back(i < 3 ? L"Ctrl+Alt+Shift+" + std::to_wstring(i + 1) : L"");
|
||||
s.directIds.push_back(layouts[i].id);
|
||||
}
|
||||
if (!std::filesystem::exists(path))
|
||||
if (bytes.empty())
|
||||
return s;
|
||||
auto j = parse(readFile(path, 4 * 1024 * 1024));
|
||||
auto j = parse(bytes);
|
||||
auto format = j.value("format", std::string());
|
||||
if (format != "kswitcher-settings" && format != "typlo-settings")
|
||||
throw std::runtime_error("Not a KSwitcher or Typlo settings file");
|
||||
@@ -177,6 +181,10 @@ Settings loadSettings(const std::filesystem::path &path, const std::vector<Layou
|
||||
return s;
|
||||
}
|
||||
void saveSettings(const std::filesystem::path &path, const Settings &s)
|
||||
{
|
||||
atomicWrite(path, encodeSettings(s));
|
||||
}
|
||||
Bytes encodeSettings(const Settings &s)
|
||||
{
|
||||
validateSettings(s);
|
||||
Json j = {{"format", "kswitcher-settings"},
|
||||
@@ -221,7 +229,7 @@ void saveSettings(const std::filesystem::path &path, const Settings &s)
|
||||
j["excludedApps"] = Json::array();
|
||||
for (auto &name : s.excluded)
|
||||
j["excludedApps"].push_back(utf8(name));
|
||||
atomicWrite(path, jsonBytes(j));
|
||||
return jsonBytes(j);
|
||||
}
|
||||
Bytes encodeClip(const Clip &clip)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user