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

fixes for parsing info from last.fm

Browse Source
This commit is contained in:
unK
2008-09-15 21:27:57 +02:00
parent e029c2cd09
commit da2086c9bd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lyrics.cpp
View File

@@ -49,7 +49,7 @@ void EscapeHtml(string &str)
for (int i = str.find("""); i != string::npos; i = str.find(""")) for (int i = str.find("""); i != string::npos; i = str.find("""))
str.replace(i, 6, "\""); str.replace(i, 6, "\"");
for (int i = str.find("&"); i != string::npos; i = str.find("&")) for (int i = str.find("&"); i != string::npos; i = str.find("&"))
str.replace(i, 6, "&"); str.replace(i, 5, "&");
} }
#ifdef HAVE_CURL_CURL_H #ifdef HAVE_CURL_CURL_H
@@ -112,6 +112,7 @@ string GetArtistInfo(string artist)
result[j] = '.'; result[j] = '.';
i += 6; i += 6;
similar.push_back(result.substr(i, j-i)); similar.push_back(result.substr(i, j-i));
EscapeHtml(similar.back());
} }
vector<string> urls; vector<string> urls;
for (int i = result.find("<url>"); i != string::npos; i = result.find("<url>")) for (int i = result.find("<url>"); i != string::npos; i = result.find("<url>"))
@@ -156,9 +157,9 @@ string GetArtistInfo(string artist)
} }
int i = result.length(); int i = result.length();
if (result[i-1] == '\n') if (!isgraph(result[i-1]))
{ {
while (result[--i] == '\n'); while (!isgraph(result[--i]));
result = result.substr(0, i+1); result = result.substr(0, i+1);
} }