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

lyrics: after cancelling download stop further fetching attempts

Browse Source
This commit is contained in:
Andrzej Rybczak
2016-12-21 22:47:39 +01:00
parent f3713ec2ee
commit 91939bb14e
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/lyrics.cpp
View File

@@ -18,6 +18,7 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <atomic>
#include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/classification.hpp>
#include <boost/filesystem/operations.hpp> #include <boost/filesystem/operations.hpp>
#include <boost/range/algorithm_ext/erase.hpp> #include <boost/range/algorithm_ext/erase.hpp>
@@ -121,6 +122,7 @@ bool saveLyrics(const std::string &filename, const std::string &lyrics)
boost::optional<std::string> downloadLyrics( boost::optional<std::string> downloadLyrics(
const MPD::Song &s, const MPD::Song &s,
std::shared_ptr<Shared<NC::Buffer>> shared_buffer, std::shared_ptr<Shared<NC::Buffer>> shared_buffer,
std::shared_ptr<std::atomic<bool>> download_stopper,
LyricsFetcher *current_fetcher) LyricsFetcher *current_fetcher)
{ {
std::string s_artist = Curl::escape(s.getArtist()); std::string s_artist = Curl::escape(s.getArtist());
@@ -170,6 +172,8 @@ boost::optional<std::string> downloadLyrics(
{ {
for (auto &fetcher : Config.lyrics_fetchers) for (auto &fetcher : Config.lyrics_fetchers)
{ {
if (download_stopper && download_stopper->load())
return boost::none;
fetcher_result = fetch_lyrics(fetcher); fetcher_result = fetch_lyrics(fetcher);
if (fetcher_result.first) if (fetcher_result.first)
break; break;
@@ -270,6 +274,7 @@ void Lyrics::fetch(const MPD::Song &s)
{ {
if (!m_worker.valid() || s != m_song) if (!m_worker.valid() || s != m_song)
{ {
stopDownload();
w.clear(); w.clear();
m_song = s; m_song = s;
if (loadLyrics(w, lyricsFilename(m_song))) if (loadLyrics(w, lyricsFilename(m_song)))
@@ -279,10 +284,12 @@ void Lyrics::fetch(const MPD::Song &s)
} }
else else
{ {
m_download_stopper = std::make_shared<std::atomic<bool>>(false);
m_shared_buffer = std::make_shared<Shared<NC::Buffer>>(); m_shared_buffer = std::make_shared<Shared<NC::Buffer>>();
m_worker = boost::async( m_worker = boost::async(
boost::launch::async, boost::launch::async,
std::bind(downloadLyrics, m_song, m_shared_buffer, m_fetcher)); std::bind(downloadLyrics,
m_song, m_shared_buffer, m_download_stopper, m_fetcher));
} }
} }
} }
@@ -390,7 +397,7 @@ void Lyrics::fetchInBackground(const MPD::Song &s, bool notify_)
} }
if (!cs.song().empty()) if (!cs.song().empty())
{ {
auto lyrics = downloadLyrics(cs.song(), nullptr, m_fetcher); auto lyrics = downloadLyrics(cs.song(), nullptr, nullptr, m_fetcher);
if (lyrics) if (lyrics)
saveLyrics(lyrics_file, *lyrics); saveLyrics(lyrics_file, *lyrics);
} }
@@ -425,3 +432,9 @@ void Lyrics::clearWorker()
m_shared_buffer.reset(); m_shared_buffer.reset();
m_worker = boost::BOOST_THREAD_FUTURE<boost::optional<std::string>>(); m_worker = boost::BOOST_THREAD_FUTURE<boost::optional<std::string>>();
} }
void Lyrics::stopDownload()
{
if (m_download_stopper)
m_download_stopper->store(true);
}

2
src/lyrics.h
View File

@@ -88,11 +88,13 @@ private:
}; };
void clearWorker(); void clearWorker();
void stopDownload();
bool m_refresh_window; bool m_refresh_window;
size_t m_scroll_begin; size_t m_scroll_begin;
std::shared_ptr<Shared<NC::Buffer>> m_shared_buffer; std::shared_ptr<Shared<NC::Buffer>> m_shared_buffer;
std::shared_ptr<std::atomic<bool>> m_download_stopper;
MPD::Song m_song; MPD::Song m_song;
LyricsFetcher *m_fetcher; LyricsFetcher *m_fetcher;