OtherCommands: merge duplicate code from handle_update(), handle_rescan()
This commit is contained in:
parent
c6725884bc
commit
34b309b99a
|
@ -183,8 +183,8 @@ handle_lsinfo(Client &client, int argc, char *argv[])
|
||||||
return CommandResult::OK;
|
return CommandResult::OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
CommandResult
|
static CommandResult
|
||||||
handle_update(Client &client, gcc_unused int argc, char *argv[])
|
handle_update(Client &client, int argc, char *argv[], bool discard)
|
||||||
{
|
{
|
||||||
const char *path = "";
|
const char *path = "";
|
||||||
|
|
||||||
|
@ -208,7 +208,7 @@ handle_update(Client &client, gcc_unused int argc, char *argv[])
|
||||||
return CommandResult::ERROR;
|
return CommandResult::ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned ret = update->Enqueue(path, false);
|
unsigned ret = update->Enqueue(path, discard);
|
||||||
if (ret > 0) {
|
if (ret > 0) {
|
||||||
client_printf(client, "updating_db: %i\n", ret);
|
client_printf(client, "updating_db: %i\n", ret);
|
||||||
return CommandResult::OK;
|
return CommandResult::OK;
|
||||||
|
@ -219,37 +219,16 @@ handle_update(Client &client, gcc_unused int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CommandResult
|
||||||
|
handle_update(Client &client, gcc_unused int argc, char *argv[])
|
||||||
|
{
|
||||||
|
return handle_update(client, argc, argv, false);
|
||||||
|
}
|
||||||
|
|
||||||
CommandResult
|
CommandResult
|
||||||
handle_rescan(Client &client, gcc_unused int argc, char *argv[])
|
handle_rescan(Client &client, gcc_unused int argc, char *argv[])
|
||||||
{
|
{
|
||||||
const char *path = "";
|
return handle_update(client, argc, argv, true);
|
||||||
|
|
||||||
assert(argc <= 2);
|
|
||||||
if (argc == 2) {
|
|
||||||
path = argv[1];
|
|
||||||
|
|
||||||
if (!uri_safe_local(path)) {
|
|
||||||
command_error(client, ACK_ERROR_ARG,
|
|
||||||
"Malformed path");
|
|
||||||
return CommandResult::ERROR;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UpdateService *update = client.partition.instance.update;
|
|
||||||
if (update == nullptr) {
|
|
||||||
command_error(client, ACK_ERROR_NO_EXIST, "No database");
|
|
||||||
return CommandResult::ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned ret = update->Enqueue(path, true);
|
|
||||||
if (ret > 0) {
|
|
||||||
client_printf(client, "updating_db: %i\n", ret);
|
|
||||||
return CommandResult::OK;
|
|
||||||
} else {
|
|
||||||
command_error(client, ACK_ERROR_UPDATE_ALREADY,
|
|
||||||
"already updating");
|
|
||||||
return CommandResult::ERROR;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CommandResult
|
CommandResult
|
||||||
|
|
Loading…
Reference in New Issue