Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.6.x'

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-09-13 00:32:13 +02:00
parent 61ba262a0f 2b258a84d8
commit 1acaaa4064
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/utility/html.cpp
View File

@@ -20,7 +20,6 @@
#include <boost/algorithm/string/replace.hpp>
#include "utility/html.h"
//#include "utility/string.h"
std::string unescapeHtmlUtf8(const std::string &data)
{
@@ -51,18 +50,28 @@ std::string unescapeHtmlUtf8(const std::string &data)
return result;
}
void unescapeHtmlEntities(std::string &s)
{
// well, at least some of them.
boost::replace_all(s, "&amp;", "&");
boost::replace_all(s, "&gt;", ">");
boost::replace_all(s, "&lt;", "<");
boost::replace_all(s, "&nbsp;", " ");
boost::replace_all(s, "&quot;", "\"");
}
void stripHtmlTags(std::string &s)
{
bool erase = 0;
for (size_t i = s.find("<"); i != std::string::npos; i = s.find("<"))
{
size_t j = s.find(">", i)+1;
s.replace(i, j-i, "");
if (s.compare(i, j-i, "<p>") == 0 || s.compare(i, j-i, "</p>") == 0)
s.replace(i, j-i, "\n");
else
s.replace(i, j-i, "");
}
boost::replace_all(s, "&#039;", "'");
boost::replace_all(s, "&amp;", "&");
boost::replace_all(s, "&quot;", "\"");
boost::replace_all(s, "&nbsp;", " ");
unescapeHtmlEntities(s);
for (size_t i = 0; i < s.length(); ++i)
{
if (erase)

2
src/utility/html.h
View File

@@ -24,7 +24,7 @@
#include <string>
std::string unescapeHtmlUtf8(const std::string &s);
void unescapeHtmlEntities(std::string &s);
void stripHtmlTags(std::string &s);
#endif // NCMPCPP_UTILITY_HTML_H