From 9506901d5fdac3ea2e78ff9edb72ee30df2bc37b Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Fri, 8 May 2020 15:20:38 +0200
Subject: [PATCH] Merge get and list commands, the same thing for lektor
(should be ok with mpd standard)
---
inc/lektor/commands.h | 1 -
src/commands.c | 4 +++-
src/net/listen.c | 4 +---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/inc/lektor/commands.h b/inc/lektor/commands.h
index 53067fe5..9309062f 100644
--- a/inc/lektor/commands.h
+++ b/inc/lektor/commands.h
@@ -89,4 +89,3 @@ bool command_rescan (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARG
bool command_sticker_get (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]);
bool command_sticker_set (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]);
bool command_sticker_delete(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]);
-bool command_sticker_list (struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX]);
diff --git a/src/commands.c b/src/commands.c
index f3337062..81a65c06 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -736,6 +736,7 @@ sticker_send(struct lkt_state *srv, size_t c, char *name, int id, int value)
return true;
}
+/*
bool
command_sticker_get(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX])
{
@@ -758,6 +759,7 @@ command_sticker_get(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS
continue;
return true;
}
+*/
bool
command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX])
@@ -775,7 +777,7 @@ command_sticker_set(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS
}
bool
-command_sticker_list(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX])
+command_sticker_get(struct lkt_state *srv, size_t c, char *argv[LKT_MESSAGE_ARGS_MAX])
{
struct lkt_search callback = {
.srv = srv,
diff --git a/src/net/listen.c b/src/net/listen.c
index 01389c30..427a9793 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -200,14 +200,12 @@ handle_simple_command(struct lkt_state *srv, size_t c, struct lkt_command cmd)
err = ! command_find(srv, c, cmd.args, cmd.cont, database_search_queue_init);
else if (STR_MATCH(cmd.name, "sticker") && cmd.args[0]) {
- if (STR_MATCH(cmd.args[0], "get"))
+ if (STR_MATCH(cmd.args[0], "get") || STR_MATCH(cmd.args[0], "list") || STR_MATCH(cmd.args[0], "find"))
err = ! command_sticker_get(srv, c, &cmd.args[1]);
else if (STR_MATCH(cmd.args[0], "set"))
err = ! command_sticker_set(srv, c, &cmd.args[1]);
else if (STR_MATCH(cmd.args[0], "delete"))
err = ! command_sticker_delete(srv, c, &cmd.args[1]);
- else if (STR_MATCH(cmd.args[0], "list") || STR_MATCH(cmd.args[0], "find"))
- err = ! command_sticker_delete(srv, c, &cmd.args[1]);
}
else if (STR_MATCH(cmd.name, "help"))
--
GitLab