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

Revert suppression of output of all external commands

Browse Source
This commit is contained in:
Andrzej Rybczak
2021-01-03 17:53:39 +01:00
parent 94198a79fe
commit dd0eac69f8
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,3 +1,7 @@
# ncmpcpp-0.9.2 (????-??-??)
* Revert suppression of output of all external commands as that makes e.g album
art addons no longer work.
# ncmpcpp-0.9.1 (2020-12-23) # ncmpcpp-0.9.1 (2020-12-23)
* Add support for fetching lyrics from musixmatch.com. * Add support for fetching lyrics from musixmatch.com.
* Fix intermittent failures of the Genius fetcher. * Fix intermittent failures of the Genius fetcher.

9
src/macro_utilities.cpp
View File

@@ -87,7 +87,7 @@ RunExternalCommand::RunExternalCommand(std::string &&command)
void RunExternalCommand::run() void RunExternalCommand::run()
{ {
runExternalCommandNoOutput(m_command, false); runExternalCommand(m_command, false);
} }
RunExternalConsoleCommand::RunExternalConsoleCommand(std::string &&command) RunExternalConsoleCommand::RunExternalConsoleCommand(std::string &&command)
@@ -113,11 +113,10 @@ void runExternalConsoleCommand(const std::string &cmd)
NC::unpauseScreen(); NC::unpauseScreen();
} }
void runExternalCommandNoOutput(const std::string &cmd, bool block) void runExternalCommand(const std::string &cmd, bool block)
{ {
if (block) if (block)
std::system((cmd + " >/dev/null 2>&1").c_str()); std::system(cmd.c_str());
else else
std::system(("nohup " + cmd + " >/dev/null 2>&1 &").c_str()); std::system(("nohup " + cmd + " &").c_str());
} }

2
src/macro_utilities.h
View File

@@ -85,6 +85,6 @@ private:
// Helpers // Helpers
void runExternalConsoleCommand(const std::string &cmd); 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 #endif // NCMPCPP_MACRO_UTILITIES_H

2
src/screens/lyrics.cpp
View File

@@ -332,7 +332,7 @@ void Lyrics::edit()
fetch(m_song); fetch(m_song);
} }
else else
runExternalCommandNoOutput(Config.external_editor + " '" + filename + "'", false); runExternalCommand(Config.external_editor + " '" + filename + "'", false);
} }
void Lyrics::toggleFetcher() void Lyrics::toggleFetcher()

4
src/status.cpp
View File

@@ -492,7 +492,7 @@ void Status::Changes::playerState()
}; };
setenv("MPD_PLAYER_STATE", stateToEnv(m_player_state), 1); setenv("MPD_PLAYER_STATE", stateToEnv(m_player_state), 1);
// Since we're setting a MPD_PLAYER_STATE, we need to block. // 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"); unsetenv("MPD_PLAYER_STATE");
} }
@@ -570,7 +570,7 @@ void Status::Changes::songID(int song_id)
if (!s.empty()) if (!s.empty())
{ {
if (!Config.execute_on_song_change.empty()) if (!Config.execute_on_song_change.empty())
runExternalCommandNoOutput(Config.execute_on_song_change, false); runExternalCommand(Config.execute_on_song_change, false);
if (Config.fetch_lyrics_in_background) if (Config.fetch_lyrics_in_background)
myLyrics->fetchInBackground(s, false); myLyrics->fetchInBackground(s, false);