tastytea/mastorss
1
0
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

seperate config file per profile (fixes race condition)

Browse Source
This commit is contained in:
tastytea 2018-01-26 22:07:06 +01:00
parent 63b11121bb
commit 20a65e4330
Signed by: tastytea
GPG Key ID: 59346E0EA35C67E5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.7)
include(GNUInstallDirs) include(GNUInstallDirs)
project (rss2mastodon project (rss2mastodon
VERSION 0.1.3 VERSION 0.1.4
LANGUAGES CXX LANGUAGES CXX
) )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall")

6
src/rss2mastodon.cpp
View File

@ -45,7 +45,7 @@ void read_config(pt::ptree &config, const string &profile, string &instance, str
// Read config file, get access token // Read config file, get access token
try { try {
pt::read_json(filepath + "config.json", config); pt::read_json(filepath + "config-" + profile + ".json", config);
instance = config.get(profile + ".instance", ""); instance = config.get(profile + ".instance", "");
access_token = config.get(profile + ".access_token", ""); access_token = config.get(profile + ".access_token", "");
feedurl = config.get(profile + ".feedurl", ""); feedurl = config.get(profile + ".feedurl", "");
@ -81,7 +81,7 @@ void read_config(pt::ptree &config, const string &profile, string &instance, str
} }
if (config_changed) if (config_changed)
{ {
pt::write_json(filepath + "config.json", config); pt::write_json(filepath + "config-" + profile + ".json", config);
} }
} }
@ -190,7 +190,7 @@ int main(int argc, char *argv[])
{ {
config.put(profile + ".last_entry", entries.front()); config.put(profile + ".last_entry", entries.front());
} }
pt::write_json(filepath + "config.json", config); pt::write_json(filepath + "config-" + profile + ".json", config);
bool new_content = false; bool new_content = false;
for (auto rit = entries.rbegin(); rit != entries.rend(); ++rit) for (auto rit = entries.rbegin(); rit != entries.rend(); ++rit)

6
src/rss2mastodon.hpp
View File

@ -1,5 +1,5 @@
#ifndef AFRINTICKER_HPP #ifndef RSS2MASTODON_HPP
#define AFRINTICKER_HPP #define RSS2MASTODON_HPP
#include <cstdint> #include <cstdint>
#include <string> #include <string>
@ -16,4 +16,4 @@ std::vector<string> parse_website(const string &profile, const string &xml);
const std::uint16_t http_get(const string &host, const string &path, const std::uint16_t http_get(const string &host, const string &path,
string &answer, const string &useragent = ""); string &answer, const string &useragent = "");
#endif // AFRINTICKER_HPP #endif // RSS2MASTODON_HPP