Skip to content

Fix crash on fetching lyrics #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cornelius-sevald wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −14
Open

Fix crash on fetching lyrics #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions src/screens/lyrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ bool saveLyrics(const std::string &filename, const std::string &lyrics)
return false;
}

boost::optional<std::string> downloadLyrics(
LyricsFetcher::Result downloadLyrics(
const MPD::Song &s,
std::shared_ptr<Shared<NC::Buffer>> shared_buffer,
std::shared_ptr<std::atomic<bool>> download_stopper,
Expand Down Expand Up @@ -172,7 +172,7 @@ boost::optional<std::string> downloadLyrics(
for (auto &fetcher : Config.lyrics_fetchers)
{
if (download_stopper && download_stopper->load())
return boost::none;
return std::make_pair(false, "");
fetcher_result = fetch_lyrics(fetcher);
if (fetcher_result.first)
break;
Expand All @@ -181,10 +181,7 @@ boost::optional<std::string> downloadLyrics(
else
fetcher_result = fetch_lyrics(current_fetcher);

boost::optional<std::string> result;
if (fetcher_result.first)
result = std::move(fetcher_result.second);
return result;
return fetcher_result;
}

}
Expand Down Expand Up @@ -219,13 +216,13 @@ void Lyrics::update()

if (m_worker.is_ready())
{
auto lyrics = m_worker.get();
if (lyrics)
LyricsFetcher::Result lyrics = m_worker.get();
if (lyrics.first)
{
w.clear();
w << Charset::utf8ToLocale(*lyrics);
w << Charset::utf8ToLocale(lyrics.second);
std::string filename = lyricsFilename(m_song);
if (!saveLyrics(filename, *lyrics))
if (!saveLyrics(filename, lyrics.second))
Statusbar::printf("Couldn't save lyrics as \"%1%\": %2%",
filename, strerror(errno));
}
Expand Down Expand Up @@ -414,8 +411,8 @@ void Lyrics::fetchInBackground(const MPD::Song &s, bool notify_)
if (!cs.song().empty() && !cs.song().isStream())
{
auto lyrics = downloadLyrics(cs.song(), nullptr, nullptr, m_fetcher);
if (lyrics)
saveLyrics(lyrics_file, *lyrics);
if (lyrics.first)
saveLyrics(lyrics_file, lyrics.second);
}
}
};
Expand Down Expand Up @@ -446,7 +443,7 @@ boost::optional<std::string> Lyrics::tryTakeConsumerMessage()
void Lyrics::clearWorker()
{
m_shared_buffer.reset();
m_worker = boost::BOOST_THREAD_FUTURE<boost::optional<std::string>>();
m_worker = boost::BOOST_THREAD_FUTURE<LyricsFetcher::Result>();
}

void Lyrics::stopDownload()
Expand Down
2 changes: 1 addition & 1 deletion src/screens/lyrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ struct Lyrics: Screen<NC::Scrollpad>, Tabbable

MPD::Song m_song;
LyricsFetcher *m_fetcher;
boost::BOOST_THREAD_FUTURE<boost::optional<std::string>> m_worker;
boost::BOOST_THREAD_FUTURE<LyricsFetcher::Result> m_worker;

Shared<ConsumerState> m_consumer_state;
};
Expand Down