Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ncmpcpp for openSUSE:Factory checked in at 2021-03-03 18:34:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncmpcpp (Old) and /work/SRC/openSUSE:Factory/.ncmpcpp.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncmpcpp" Wed Mar 3 18:34:30 2021 rev:5 rq:876283 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ncmpcpp/ncmpcpp.changes 2021-01-18 15:22:12.774404496 +0100 +++ /work/SRC/openSUSE:Factory/.ncmpcpp.new.2378/ncmpcpp.changes 2021-03-03 18:34:32.603363222 +0100 @@ -1,0 +2,8 @@ +Sun Feb 28 21:05:38 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 0.9.2: + * Revert suppression of output of all external commands as that makes e.g + album art addons no longer work. + * Gracefully handle failures when asking for a password. + +------------------------------------------------------------------- Old: ---- ncmpcpp-0.9.1.tar.gz New: ---- ncmpcpp-0.9.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncmpcpp.spec ++++++ --- /var/tmp/diff_new_pack.sjdzOH/_old 2021-03-03 18:34:33.067363559 +0100 +++ /var/tmp/diff_new_pack.sjdzOH/_new 2021-03-03 18:34:33.071363562 +0100 @@ -17,7 +17,7 @@ Name: ncmpcpp -Version: 0.9.1 +Version: 0.9.2 Release: 0 Summary: Music Player Daemon Client License: GPL-2.0-only ++++++ ncmpcpp-0.9.1.tar.gz -> ncmpcpp-0.9.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/CHANGELOG.md new/ncmpcpp-0.9.2/CHANGELOG.md --- old/ncmpcpp-0.9.1/CHANGELOG.md 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/CHANGELOG.md 2021-01-24 17:06:17.000000000 +0100 @@ -1,3 +1,8 @@ +# ncmpcpp-0.9.2 (2021-01-24) +* Revert suppression of output of all external commands as that makes e.g album + art addons no longer work. +* Gracefully handle failures when asking for a password. + # ncmpcpp-0.9.1 (2020-12-23) * Add support for fetching lyrics from musixmatch.com. * Fix intermittent failures of the Genius fetcher. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/configure.ac new/ncmpcpp-0.9.2/configure.ac --- old/ncmpcpp-0.9.1/configure.ac 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/configure.ac 2021-01-24 17:06:17.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([ncmpcpp], [0.9.1]) +AC_INIT([ncmpcpp], [0.9.2]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE([subdir-objects]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/src/macro_utilities.cpp new/ncmpcpp-0.9.2/src/macro_utilities.cpp --- old/ncmpcpp-0.9.1/src/macro_utilities.cpp 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/src/macro_utilities.cpp 2021-01-24 17:06:17.000000000 +0100 @@ -87,7 +87,7 @@ void RunExternalCommand::run() { - runExternalCommandNoOutput(m_command, false); + runExternalCommand(m_command, true); } RunExternalConsoleCommand::RunExternalConsoleCommand(std::string &&command) @@ -113,11 +113,11 @@ NC::unpauseScreen(); } -void runExternalCommandNoOutput(const std::string &cmd, bool block) +void runExternalCommand(const std::string &cmd, bool block) { if (block) - std::system((cmd + " >/dev/null 2>&1").c_str()); + std::system(cmd.c_str()); else + // If we don't block, disregard any output. std::system(("nohup " + cmd + " >/dev/null 2>&1 &").c_str()); - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/src/macro_utilities.h new/ncmpcpp-0.9.2/src/macro_utilities.h --- old/ncmpcpp-0.9.1/src/macro_utilities.h 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/src/macro_utilities.h 2021-01-24 17:06:17.000000000 +0100 @@ -85,6 +85,6 @@ // Helpers void runExternalConsoleCommand(const std::string &cmd); -void runExternalCommandNoOutput(const std::string &cmd, bool block); +void runExternalCommand(const std::string &cmd, bool block); #endif // NCMPCPP_MACRO_UTILITIES_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/src/screens/lyrics.cpp new/ncmpcpp-0.9.2/src/screens/lyrics.cpp --- old/ncmpcpp-0.9.1/src/screens/lyrics.cpp 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/src/screens/lyrics.cpp 2021-01-24 17:06:17.000000000 +0100 @@ -332,7 +332,7 @@ fetch(m_song); } else - runExternalCommandNoOutput(Config.external_editor + " '" + filename + "'", false); + runExternalCommand(Config.external_editor + " '" + filename + "'", false); } void Lyrics::toggleFetcher() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/src/screens/visualizer.cpp new/ncmpcpp-0.9.2/src/screens/visualizer.cpp --- old/ncmpcpp-0.9.1/src/screens/visualizer.cpp 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/src/screens/visualizer.cpp 2021-01-24 17:06:17.000000000 +0100 @@ -190,7 +190,7 @@ //Statusbar::printf("Samples: %1%, %2%, %3%", m_buffered_samples.size(), // requested_samples, m_sample_consumption_rate); - size_t new_samples = m_buffered_samples.move(requested_samples, m_rendered_samples); + size_t new_samples = m_buffered_samples.get(requested_samples, m_rendered_samples); if (new_samples == 0) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/src/status.cpp new/ncmpcpp-0.9.2/src/status.cpp --- old/ncmpcpp-0.9.1/src/status.cpp 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/src/status.cpp 2021-01-24 17:06:17.000000000 +0100 @@ -192,14 +192,29 @@ Statusbar::printf("MPD: %1%", e.what()); if (e.code() == MPD_SERVER_ERROR_PERMISSION) { - NC::Window::ScopedPromptHook helper(*wFooter, nullptr); - Statusbar::put() << "Password: "; - Mpd.SetPassword(wFooter->prompt("", -1, true)); - try { + try + { + NC::Window::ScopedPromptHook helper(*wFooter, nullptr); + Statusbar::put() << "Password: "; + Mpd.SetPassword(wFooter->prompt("", -1, true)); Mpd.SendPassword(); Statusbar::print("Password accepted"); - } catch (MPD::ServerError &e_prim) { - handleServerError(e_prim); + } + // SendPassword might throw if connection is closed + catch (MPD::ClientError &e_prim) + { + handleClientError(e_prim); + } + // Wrong password, we'll ask again later + catch (MPD::ServerError &e_prim) + { + Statusbar::printf("MPD: %1%", e_prim.what()); + } + // If prompt asking for a password is aborted, exit the application to + // prevent getting stuck in the prompt indefinitely. + catch (NC::PromptAborted &) + { + Actions::ExitMainLoop = true; } } } @@ -492,7 +507,7 @@ }; setenv("MPD_PLAYER_STATE", stateToEnv(m_player_state), 1); // Since we're setting a MPD_PLAYER_STATE, we need to block. - runExternalCommandNoOutput(Config.execute_on_player_state_change, true); + runExternalCommand(Config.execute_on_player_state_change, true); unsetenv("MPD_PLAYER_STATE"); } @@ -570,7 +585,11 @@ if (!s.empty()) { if (!Config.execute_on_song_change.empty()) - runExternalCommandNoOutput(Config.execute_on_song_change, false); + { + // We need to block to allow sending output to the terminal so a script + // can e.g. set the album art. + runExternalCommand(Config.execute_on_song_change, true); + } if (Config.fetch_lyrics_in_background) myLyrics->fetchInBackground(s, false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/src/utility/sample_buffer.cpp new/ncmpcpp-0.9.2/src/utility/sample_buffer.cpp --- old/ncmpcpp-0.9.1/src/utility/sample_buffer.cpp 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/src/utility/sample_buffer.cpp 2021-01-24 17:06:17.000000000 +0100 @@ -40,7 +40,7 @@ m_offset += elems; } -size_t SampleBuffer::move(size_t elems, std::vector<int16_t> &dest) +size_t SampleBuffer::get(size_t elems, std::vector<int16_t> &dest) { if (m_offset == 0) return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ncmpcpp-0.9.1/src/utility/sample_buffer.h new/ncmpcpp-0.9.2/src/utility/sample_buffer.h --- old/ncmpcpp-0.9.1/src/utility/sample_buffer.h 2020-12-23 16:10:45.000000000 +0100 +++ new/ncmpcpp-0.9.2/src/utility/sample_buffer.h 2021-01-24 17:06:17.000000000 +0100 @@ -31,7 +31,7 @@ SampleBuffer() : m_offset(0) { } void put(Iterator begin, Iterator end); - size_t move(size_t elems, std::vector<int16_t> &dest); + size_t get(size_t elems, std::vector<int16_t> &dest); void resize(size_t n); void clear();
