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

fixed bug leading to removal of all newlines

Browse Source
This commit is contained in:
tastytea 2018-04-21 18:18:41 +02:00
parent e887cbbf4b
commit d0b75ffba0
Signed by: tastytea
GPG Key ID: 59346E0EA35C67E5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.7) cmake_minimum_required (VERSION 3.7)
project (mastorss project (mastorss
VERSION 0.5.8 VERSION 0.5.9
LANGUAGES CXX LANGUAGES CXX
) )

4
src/parse.cpp
View File

@ -158,7 +158,7 @@ std::vector<string> parse_website(const string &xml)
str = std::regex_replace(str, std::regex("\\r"), ""); // remove \r str = std::regex_replace(str, std::regex("\\r"), ""); // remove \r
str = std::regex_replace(str, std::regex("\\n +\\n"), "\n\n"); // remove space between newlines str = std::regex_replace(str, std::regex("\\n +\\n"), "\n\n"); // remove space between newlines
str = std::regex_replace(str, std::regex("\\n{3,}"), "\n\n"); // remove excess newlines str = std::regex_replace(str, std::regex("\\n{3,}"), "\n\n"); // remove excess newlines
str = std::regex_replace(str, std::regex("\\n[ \t]*\\n"), ""); // remove nothing str = std::regex_replace(str, std::regex("\\n[ \t]+\\n"), ""); // remove nothing
for (const string &hashtag : watchwords) for (const string &hashtag : watchwords)
{ {
@ -169,7 +169,7 @@ std::vector<string> parse_website(const string &xml)
} }
// Why is this necessary? Why does ##hashtag happen? // Why is this necessary? Why does ##hashtag happen?
str = std::regex_replace(str, std::regex("##"), "#"); str = std::regex_replace(str, std::regex("##"), "#");
if ((str.size() + link.size()) > (std::uint16_t)(max_size - 15)) if ((str.size() + link.size()) > static_cast<std::uint16_t>(max_size - 15))
{ {
str.resize((max_size - link.size() - 15)); str.resize((max_size - link.size() - 15));
str.resize(str.rfind(' ')); // Cut at word boundary str.resize(str.rfind(' ')); // Cut at word boundary