alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: handle move 'rename' parameter

Browse Source 
Fix the confusion between names.
This commit is contained in:
Dirk-Jan C. Binnema
2020-01-24 14:20:34 +02:00
parent 9f72bd9703
commit 24e94afe2f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mu/mu-cmd-server.cc
View File

@ -932,7 +932,7 @@ move_handler (Context& context, const Parameters& params)
{ {
auto maildir{get_string_or(params, "maildir")}; auto maildir{get_string_or(params, "maildir")};
const auto flagstr{get_string_or(params, "flags")}; const auto flagstr{get_string_or(params, "flags")};
const auto new_name{get_bool_or (params, "newname")}; const auto rename{get_bool_or (params, "rename")};
const auto no_view{get_bool_or (params, "noupdate")}; const auto no_view{get_bool_or (params, "noupdate")};
const auto docids{determine_docids (context.query, params)}; const auto docids{determine_docids (context.query, params)};
@ -942,7 +942,7 @@ move_handler (Context& context, const Parameters& params)
"can't move multiple messages at the same time"}; "can't move multiple messages at the same time"};
// multi. // multi.
for (auto&& docid: docids) for (auto&& docid: docids)
move_docid(context.store, docid, flagstr, new_name, no_view); move_docid(context.store, docid, flagstr, rename, no_view);
return; return;
} }
auto docid{docids.at(0)}; auto docid{docids.at(0)};
@ -971,8 +971,7 @@ move_handler (Context& context, const Parameters& params)
} }
try { try {
do_move (context.store, docid, msg, maildir, flags, do_move (context.store, docid, msg, maildir, flags, rename, no_view);
new_name, no_view);
} catch (...) { } catch (...) {
mu_msg_unref(msg); mu_msg_unref(msg);
throw; throw;
@ -1174,9 +1173,9 @@ make_command_map (Context& context)
ArgMap{ ArgMap{
{"docid", ArgInfo{Type::Integer, false, "document-id"}}, {"docid", ArgInfo{Type::Integer, false, "document-id"}},
{"msgid", ArgInfo{Type::String, false, "message-id"}}, {"msgid", ArgInfo{Type::String, false, "message-id"}},
{"maildir", ArgInfo{Type::String, false, "the target maildir" }},
{"flags", ArgInfo{Type::String, false, "new flags for the message"}}, {"flags", ArgInfo{Type::String, false, "new flags for the message"}},
{"maildir", ArgInfo{Type::String, false, "the target maildir" }},
{"rename", ArgInfo{Type::Symbol, false, "change filename when moving" }},
{"no-view", ArgInfo{Type::Symbol, false, {"no-view", ArgInfo{Type::Symbol, false,
"if set, do not hint at updating the view"}},}, "if set, do not hint at updating the view"}},},
"move messages and/or change their flags", "move messages and/or change their flags",