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

lyrics/lastfm: refetch data if file didn't exist before

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-09-15 18:57:17 +02:00
parent f2ac6cac03
commit 06d5b81125
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lastfm.cpp
View File

@@ -201,15 +201,13 @@ void Lastfm::Save(const std::string &data)
void Lastfm::Refetch() void Lastfm::Refetch()
{ {
if (!remove(itsFilename.c_str())) if (remove(itsFilename.c_str()) && errno != ENOENT)
{
Load();
}
else
{ {
static const char msg[] = "Couldn't remove \"%s\": %s"; static const char msg[] = "Couldn't remove \"%s\": %s";
ShowMessage(msg, Shorten(TO_WSTRING(itsFilename), COLS-static_strlen(msg)-25).c_str(), strerror(errno)); ShowMessage(msg, Shorten(TO_WSTRING(itsFilename), COLS-static_strlen(msg)-25).c_str(), strerror(errno));
return;
} }
Load();
} }
bool Lastfm::SetArtistInfoArgs(const std::string &artist, const std::string &lang) bool Lastfm::SetArtistInfoArgs(const std::string &artist, const std::string &lang)

8
src/lyrics.cpp
View File

@@ -303,15 +303,13 @@ void Lyrics::Save(const std::string &lyrics)
void Lyrics::Refetch() void Lyrics::Refetch()
{ {
if (!remove(itsFilename.c_str())) if (remove(itsFilename.c_str()) && errno != ENOENT)
{
Load();
}
else
{ {
static const char msg[] = "Couldn't remove \"%s\": %s"; static const char msg[] = "Couldn't remove \"%s\": %s";
ShowMessage(msg, Shorten(TO_WSTRING(itsFilename), COLS-static_strlen(msg)-25).c_str(), strerror(errno)); ShowMessage(msg, Shorten(TO_WSTRING(itsFilename), COLS-static_strlen(msg)-25).c_str(), strerror(errno));
return;
} }
Load();
} }
#ifdef HAVE_CURL_CURL_H #ifdef HAVE_CURL_CURL_H