From 1bbebe2977384c5f4f3f7a84b238c6279792c6f5 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Wed, 25 Dec 2019 07:02:19 +0100
Subject: [PATCH] =?UTF-8?q?Actually=20write=20new=20config.=20=F0=9F=A4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config.cpp | 47 ++++++++++++++++++++++++++++++++++-------------
 src/config.hpp |  2 +-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/config.cpp b/src/config.cpp
index f089161..1cd112b 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -29,6 +29,7 @@
 
 namespace mastorss
 {
+using std::stoul;
 using std::getenv;
 using std::ifstream;
 using std::ofstream;
@@ -86,13 +87,12 @@ Config::Config(string profile)
         stringstream rawjson;
         rawjson << file.rdbuf();
         rawjson >> _json;
+        parse();
     }
     else
     {
         generate();
     }
-
-    parse();
 }
 
 fs::path Config::get_filename() const
@@ -122,33 +122,43 @@ fs::path Config::get_filename() const
 
 void Config::generate()
 {
-    Json::Value newjson;
     string line;
 
     cout << "Instance (domain): ";
     getline(cin, line);
-    newjson[_profile]["instance"] = line;
+    data.instance = line;
 
-    newjson[_profile]["access_token"] = get_access_token(line);
+    data.access_token = get_access_token(line);
 
     cout << "URL of the feed: ";
     std::getline(cin, line);
-    newjson[_profile]["feedurl"] = line;
+    data.feedurl = line;
 
     cout << "Post only titles? [y/n]: ";
     std::getline(cin, line);
     if (line[0] == 'y')
     {
-        newjson[_profile]["titles_as_cw"] = true;
+        data.titles_only = true;
     }
     else
     {
-        newjson[_profile]["titles_as_cw"] = false;
+        data.titles_only = false;
+    }
+
+    cout << "Post titles as cw? [y/n]: ";
+    std::getline(cin, line);
+    if (line[0] == 'y')
+    {
+        data.titles_as_cw = true;
+    }
+    else
+    {
+        data.titles_as_cw = false;
     }
 
     cout << "Append this string to each post: ";
     std::getline(cin, line);
-    newjson[_profile]["append"] = line;
+    data.append = line;
 
     cout << "Interval between posts in seconds [30]: ";
     std::getline(cin, line);
@@ -156,7 +166,7 @@ void Config::generate()
     {
         line = "30";
     }
-    newjson[_profile]["interval"] = std::stoul(line);
+    data.interval = static_cast<uint32_t>(stoul(line));
 
     cout << "Maximum size of posts [500]: ";
     std::getline(cin, line);
@@ -164,9 +174,8 @@ void Config::generate()
     {
         line = "500";
     }
-    newjson[_profile]["max_size"] = std::stoul(line);
+    data.max_size = static_cast<uint32_t>(stoul(line));
 
-    _json = newjson;
     BOOST_LOG_TRIVIAL(debug) << "Generated configuration.";
     write();
 }
@@ -238,8 +247,20 @@ void Config::parse()
     BOOST_LOG_TRIVIAL(debug) << "Read config: " << data;
 }
 
-void Config::write() const
+void Config::write()
 {
+    _json[_profile]["access_token"] = data.access_token;
+    _json[_profile]["append"] = data.append;
+    _json[_profile]["feedurl"] = data.feedurl;
+    // Leave fixes.
+    _json[_profile]["instance"] = data.instance;
+    _json[_profile]["interval"] = data.interval;
+    _json[_profile]["last_guid"] = data.last_guid;
+    _json[_profile]["max_size"] = data.max_size;
+    // Leave skip.
+    _json[_profile]["titles_as_cw"] = data.titles_as_cw;
+    _json[_profile]["titles_as_cw"] = data.titles_only;
+
     ofstream file{get_filename()};
     if (file.good())
     {
diff --git a/src/config.hpp b/src/config.hpp
index b378cf7..d7ed3f2 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -68,7 +68,7 @@ public:
 
     ProfileData data;
 
-    void write() const;
+    void write();
 
 private:
     const string _profile;