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

move ParseArgv to separate file

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-08 18:54:52 +02:00
parent 84326efc46
commit 189010fecc
6 changed files with 301 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@@ -10,6 +10,7 @@ ncmpcpp_SOURCES = \
browser.cpp \
charset.cpp \
clock.cpp \
cmdargs.cpp \
curl_handle.cpp \
display.cpp \
error.cpp \
@@ -58,6 +59,7 @@ noinst_HEADERS = \
browser.h \
charset.h \
clock.h \
cmdargs.h \
curl_handle.h \
display.h \
error.h \

272
src/cmdargs.cpp Normal file
View File

@@ -0,0 +1,272 @@
/***************************************************************************
* Copyright (C) 2008-2012 by Andrzej Rybczak *
* electricityispower@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <cassert>
#include <cstring>
#include <iostream>
#include "actions.h"
#include "charset.h"
#include "cmdargs.h"
#include "config.h"
#include "mpdpp.h"
#include "settings.h"
#include "help.h"
#include "playlist.h"
#include "browser.h"
#include "search_engine.h"
#include "media_library.h"
#include "playlist_editor.h"
#include "tag_editor.h"
#include "outputs.h"
#include "visualizer.h"
#include "clock.h"
void ParseArgv(int argc, char **argv)
{
bool quit = 0;
std::string now_playing_format = "{{{(%l) }{{%a - }%t}}|{%f}}";
for (int i = 1; i < argc; ++i)
{
if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--host"))
{
if (++i >= argc)
exit(0);
Mpd.SetHostname(argv[i]);
continue;
}
if (!strcmp(argv[i], "-p") || !strcmp(argv[i], "--port"))
{
if (++i >= argc)
exit(0);
Mpd.SetPort(atoi(argv[i]));
continue;
}
else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version"))
{
std::cout << "ncmpcpp version: " << VERSION << "\n\n"
<< "optional screens compiled-in:\n"
# ifdef HAVE_TAGLIB_H
<< " - tag editor\n"
<< " - tiny tag editor\n"
# endif
# ifdef HAVE_CURL_CURL_H
<< " - artist info\n"
# endif
# ifdef ENABLE_OUTPUTS
<< " - outputs\n"
# endif
# ifdef ENABLE_VISUALIZER
<< " - visualizer\n"
# endif
# ifdef ENABLE_CLOCK
<< " - clock\n"
# endif
<< "\nencoding detection: "
# ifdef HAVE_LANGINFO_H
<< "enabled"
# else
<< "disabled"
# endif // HAVE_LANGINFO_H
<< "\nbuilt with support for:"
# ifdef HAVE_CURL_CURL_H
<< " curl"
# endif
# ifdef HAVE_ICONV_H
<< " iconv"
# endif
# ifdef HAVE_FFTW3_H
<< " fftw"
# endif
# ifdef USE_PDCURSES
<< " pdcurses"
# else
<< " ncurses"
# endif
# ifdef HAVE_TAGLIB_H
<< " taglib"
# endif
# ifdef NCMPCPP_UNICODE
<< " unicode"
# endif
<< std::endl;
exit(0);
}
else if (!strcmp(argv[i], "-?") || !strcmp(argv[i], "--help"))
{
std::cout
<< "Usage: ncmpcpp [OPTION]...\n"
<< " -h, --host connect to server at host [localhost]\n"
<< " -p, --port connect to server at port [6600]\n"
<< " -c, --config use alternative configuration file\n"
<< " -s, --screen <name> specify the startup screen\n"
<< " -?, --help show this help message\n"
<< " -v, --version display version information\n"
<< " --now-playing display now playing song [" << now_playing_format << "]\n"
<< "\n"
<< " play start playing\n"
<< " pause pause the currently playing song\n"
<< " toggle toggle play/pause mode\n"
<< " stop stop playing\n"
<< " next play the next song\n"
<< " prev play the previous song\n"
<< " volume [+-]<num> adjusts volume by [+-]<num>\n"
;
exit(0);
}
if (!Action::ConnectToMPD())
exit(1);
if (!strcmp(argv[i], "-s") || !strcmp(argv[i], "--screen"))
{
if (++i == argc) {
std::cout << "ncmpcpp: no screen specified" << std::endl;
exit(0);
}
if (!strcmp(argv[i], "help"))
Config.startup_screen = myHelp;
else if (!strcmp(argv[i], "playlist"))
Config.startup_screen = myPlaylist;
else if (!strcmp(argv[i], "browser"))
Config.startup_screen = myBrowser;
else if (!strcmp(argv[i], "search-engine"))
Config.startup_screen = mySearcher;
else if (!strcmp(argv[i], "media-library"))
Config.startup_screen = myLibrary;
else if (!strcmp(argv[i], "playlist-editor"))
Config.startup_screen = myPlaylistEditor;
# ifdef HAVE_TAGLIB_H
else if (!strcmp(argv[i], "tag-editor"))
Config.startup_screen = myTagEditor;
# endif // HAVE_TAGLIB_H
# ifdef ENABLE_OUTPUTS
else if (!strcmp(argv[i], "outputs"))
Config.startup_screen = myOutputs;
# endif // ENABLE_OUTPUTS
# ifdef ENABLE_VISUALIZER
else if (!strcmp(argv[i], "visualizer"))
Config.startup_screen = myVisualizer;
# endif // ENABLE_VISUALIZER
# ifdef ENABLE_CLOCK
else if (!strcmp(argv[i], "clock"))
Config.startup_screen = myClock;
# endif // ENABLE_CLOCK
else {
std::cout << "ncmpcpp: invalid screen: " << argv[i] << std::endl;
exit(0);
}
}
else if (!strcmp(argv[i], "--now-playing"))
{
Mpd.UpdateStatus();
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(1);
}
if (Mpd.isPlaying())
{
if (argc > ++i)
{
if (MPD::Song::isFormatOk("now-playing format", argv[i]))
{
// apply additional pair of braces
now_playing_format = "{";
now_playing_format += argv[i];
now_playing_format += "}";
replace(now_playing_format, "\\n", "\n");
replace(now_playing_format, "\\t", "\t");
}
}
std::cout << utf_to_locale_cpy(Mpd.GetCurrentlyPlayingSong().toString(now_playing_format)) << "\n";
}
exit(0);
}
else if (!strcmp(argv[i], "play"))
{
Mpd.Play();
quit = 1;
}
else if (!strcmp(argv[i], "pause"))
{
Mpd.Pause(1);
quit = 1;
}
else if (!strcmp(argv[i], "toggle"))
{
Mpd.UpdateStatus();
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(1);
}
Mpd.Toggle();
quit = 1;
}
else if (!strcmp(argv[i], "stop"))
{
Mpd.Stop();
quit = 1;
}
else if (!strcmp(argv[i], "next"))
{
Mpd.Next();
quit = 1;
}
else if (!strcmp(argv[i], "prev"))
{
Mpd.Prev();
quit = 1;
}
else if (!strcmp(argv[i], "volume"))
{
i++;
Mpd.UpdateStatus();
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(1);
}
if (i != argc)
Mpd.SetVolume(Mpd.GetVolume()+atoi(argv[i]));
quit = 1;
}
else if (!strcmp(argv[i], "-c") || !strcmp(argv[i], "--config"))
{
// this is used in Configuration::CheckForCommandLineConfigFilePath, ignoring here.
++i;
}
else
{
std::cout << "ncmpcpp: invalid option: " << argv[i] << std::endl;
exit(0);
}
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(0);
}
}
if (quit)
exit(0);
}

26
src/cmdargs.h Normal file
View File

@@ -0,0 +1,26 @@
/***************************************************************************
* Copyright (C) 2008-2012 by Andrzej Rybczak *
* electricityispower@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef NCMPCPP_CMDARGS_H
#define NCMPCPP_CMDARGS_H
void ParseArgv(int argc, char **argv);
#endif // NCMPCPP_CMDARGS_H

249
src/helpers.cpp
View File

@@ -18,257 +18,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <cassert>
#include <cstring>
#include <algorithm>
#include <iostream>
#include <stdexcept>
#include "clock.h"
#include "charset.h"
#include "global.h"
#include "helpers.h"
#include "playlist.h"
#include "status.h"
#include "tag_editor.h"
#include "help.h"
#include "playlist_editor.h"
#include "browser.h"
#include "media_library.h"
#include "search_engine.h"
#include "outputs.h"
#include "visualizer.h"
void ParseArgv(int argc, char **argv)
{
bool quit = 0;
std::string now_playing_format = "{{{(%l) }{{%a - }%t}}|{%f}}";
for (int i = 1; i < argc; ++i)
{
if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--host"))
{
if (++i >= argc)
exit(0);
Mpd.SetHostname(argv[i]);
continue;
}
if (!strcmp(argv[i], "-p") || !strcmp(argv[i], "--port"))
{
if (++i >= argc)
exit(0);
Mpd.SetPort(atoi(argv[i]));
continue;
}
else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version"))
{
std::cout << "ncmpcpp version: " << VERSION << "\n\n"
<< "optional screens compiled-in:\n"
# ifdef HAVE_TAGLIB_H
<< " - tag editor\n"
<< " - tiny tag editor\n"
# endif
# ifdef HAVE_CURL_CURL_H
<< " - artist info\n"
# endif
# ifdef ENABLE_OUTPUTS
<< " - outputs\n"
# endif
# ifdef ENABLE_VISUALIZER
<< " - visualizer\n"
# endif
# ifdef ENABLE_CLOCK
<< " - clock\n"
# endif
<< "\nencoding detection: "
# ifdef HAVE_LANGINFO_H
<< "enabled"
# else
<< "disabled"
# endif // HAVE_LANGINFO_H
<< "\nbuilt with support for:"
# ifdef HAVE_CURL_CURL_H
<< " curl"
# endif
# ifdef HAVE_ICONV_H
<< " iconv"
# endif
# ifdef HAVE_FFTW3_H
<< " fftw"
# endif
# ifdef USE_PDCURSES
<< " pdcurses"
# else
<< " ncurses"
# endif
# ifdef HAVE_TAGLIB_H
<< " taglib"
# endif
# ifdef NCMPCPP_UNICODE
<< " unicode"
# endif
<< std::endl;
exit(0);
}
else if (!strcmp(argv[i], "-?") || !strcmp(argv[i], "--help"))
{
std::cout
<< "Usage: ncmpcpp [OPTION]...\n"
<< " -h, --host connect to server at host [localhost]\n"
<< " -p, --port connect to server at port [6600]\n"
<< " -c, --config use alternative configuration file\n"
<< " -s, --screen <name> specify the startup screen\n"
<< " -?, --help show this help message\n"
<< " -v, --version display version information\n"
<< " --now-playing display now playing song [" << now_playing_format << "]\n"
<< "\n"
<< " play start playing\n"
<< " pause pause the currently playing song\n"
<< " toggle toggle play/pause mode\n"
<< " stop stop playing\n"
<< " next play the next song\n"
<< " prev play the previous song\n"
<< " volume [+-]<num> adjusts volume by [+-]<num>\n"
;
exit(0);
}
if (!Action::ConnectToMPD())
exit(1);
if (!strcmp(argv[i], "-s") || !strcmp(argv[i], "--screen"))
{
if (++i == argc) {
std::cout << "ncmpcpp: no screen specified" << std::endl;
exit(0);
}
if (!strcmp(argv[i], "help"))
Config.startup_screen = myHelp;
else if (!strcmp(argv[i], "playlist"))
Config.startup_screen = myPlaylist;
else if (!strcmp(argv[i], "browser"))
Config.startup_screen = myBrowser;
else if (!strcmp(argv[i], "search-engine"))
Config.startup_screen = mySearcher;
else if (!strcmp(argv[i], "media-library"))
Config.startup_screen = myLibrary;
else if (!strcmp(argv[i], "playlist-editor"))
Config.startup_screen = myPlaylistEditor;
# ifdef HAVE_TAGLIB_H
else if (!strcmp(argv[i], "tag-editor"))
Config.startup_screen = myTagEditor;
# endif // HAVE_TAGLIB_H
# ifdef ENABLE_OUTPUTS
else if (!strcmp(argv[i], "outputs"))
Config.startup_screen = myOutputs;
# endif // ENABLE_OUTPUTS
# ifdef ENABLE_VISUALIZER
else if (!strcmp(argv[i], "visualizer"))
Config.startup_screen = myVisualizer;
# endif // ENABLE_VISUALIZER
# ifdef ENABLE_CLOCK
else if (!strcmp(argv[i], "clock"))
Config.startup_screen = myClock;
# endif // ENABLE_CLOCK
else {
std::cout << "ncmpcpp: invalid screen: " << argv[i] << std::endl;
exit(0);
}
}
else if (!strcmp(argv[i], "--now-playing"))
{
Mpd.UpdateStatus();
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(1);
}
if (Mpd.isPlaying())
{
if (argc > ++i)
{
if (MPD::Song::isFormatOk("now-playing format", argv[i]))
{
// apply additional pair of braces
now_playing_format = "{";
now_playing_format += argv[i];
now_playing_format += "}";
replace(now_playing_format, "\\n", "\n");
replace(now_playing_format, "\\t", "\t");
}
}
std::cout << utf_to_locale_cpy(Mpd.GetCurrentlyPlayingSong().toString(now_playing_format)) << "\n";
}
exit(0);
}
else if (!strcmp(argv[i], "play"))
{
Mpd.Play();
quit = 1;
}
else if (!strcmp(argv[i], "pause"))
{
Mpd.Pause(1);
quit = 1;
}
else if (!strcmp(argv[i], "toggle"))
{
Mpd.UpdateStatus();
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(1);
}
Mpd.Toggle();
quit = 1;
}
else if (!strcmp(argv[i], "stop"))
{
Mpd.Stop();
quit = 1;
}
else if (!strcmp(argv[i], "next"))
{
Mpd.Next();
quit = 1;
}
else if (!strcmp(argv[i], "prev"))
{
Mpd.Prev();
quit = 1;
}
else if (!strcmp(argv[i], "volume"))
{
i++;
Mpd.UpdateStatus();
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(1);
}
if (i != argc)
Mpd.SetVolume(Mpd.GetVolume()+atoi(argv[i]));
quit = 1;
}
else if (!strcmp(argv[i], "-c") || !strcmp(argv[i], "--config"))
{
// this is used in Configuration::CheckForCommandLineConfigFilePath, ignoring here.
++i;
}
else
{
std::cout << "ncmpcpp: invalid option: " << argv[i] << std::endl;
exit(0);
}
if (!Mpd.GetErrorMessage().empty())
{
std::cout << "Error: " << Mpd.GetErrorMessage() << std::endl;
exit(0);
}
}
if (quit)
exit(0);
}
std::string Timestamp(time_t t)
{

2
src/helpers.h
View File

@@ -317,8 +317,6 @@ template <typename Iterator> std::string getSharedDirectory(Iterator first, Iter
return result;
}
void ParseArgv(int, char **);
template <typename T> struct StringConverter {
const char *operator()(const char *s) { return s; }
};

1
src/ncmpcpp.cpp
View File

@@ -33,6 +33,7 @@
#include "actions.h"
#include "bindings.h"
#include "browser.h"
#include "cmdargs.h"
#include "global.h"
#include "helpers.h"
#include "lyrics.h"