RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 03:57:44 +00:00
Code Issues Activity Actions

Userland+Terminal: Port to new CArgsParser API

Browse source 
While at it, also add some niceties and fix some things.
This commit is contained in:
Sergey Bugaev 2020-01-27 20:25:36 +03:00 • committed by Andreas Kling
parent 9276582535
commit f983dfe319
22 changed files with 392 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Userland/pape.cpp
View file

@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/String.h>
#include <AK/FileSystemPath.h>
#include <AK/String.h>
#include <AK/StringBuilder.h>
#include <AK/Vector.h>
#include <LibCore/CArgsParser.h>
@ -76,26 +76,22 @@ static int handle_set_pape(const String& name)
int main(int argc, char** argv)
{
bool show_all = false;
bool show_current = false;
const char* name = nullptr;
CArgsParser args_parser;
args_parser.add_option(show_all, "Show all wallpapers", "show-all", 'a');
args_parser.add_option(show_current, "Show current wallpaper", "show-current", 'c');
args_parser.add_positional_argument(name, "Wallpaper to set", "name", CArgsParser::Required::No);
args_parser.parse(argc, argv);
GApplication app(argc, argv);
CArgsParser args_parser("pape");
args_parser.add_arg("a", "show all wallpapers");
args_parser.add_arg("c", "show current wallpaper");
args_parser.add_single_value("name");
CArgsParserResult args = args_parser.parse(argc, argv);
if (args.is_present("a"))
if (show_all)
return handle_show_all();
else if (args.is_present("c"))
else if (show_current)
return handle_show_current();
Vector<String> values = args.get_single_values();
if (values.size() != 1) {
args_parser.print_usage();
return 0;
}
return handle_set_pape(values[0]);
return handle_set_pape(name);
}