[cli] edit user strings and optimize loops

src/client/cli/cmd/delete.cpp

@@ -72,8 +72,10 @@ QString cmd::Delete::short_help() const
 
 QString cmd::Delete::description() const
 {
-    return QStringLiteral("Delete instances and snapshots, to be purged with the \"purge\" command,\n"
-                          "or recovered with the \"recover\" command (instances only).");
+    return QStringLiteral(
+        "Delete instances and snapshots. Instances can be purged immediately or later on,"
+        "with the \"purge\" command. Until they are purged, instances can be recovered"
+        "with the \"recover\" command. Snapshots cannot be recovered after deletion and must be purged at once.");
 }
 
 mp::ParseCode cmd::Delete::parse_args(mp::ArgParser* parser)
@@ -82,7 +84,7 @@ mp::ParseCode cmd::Delete::parse_args(mp::ArgParser* parser)
                                   "<instance>[.snapshot] [<instance>[.snapshot] ...]");
 
     QCommandLineOption all_option(all_option_name, "Delete all instances and snapshots");
-    QCommandLineOption purge_option({"p", "purge"}, "Purge deleted instances and snapshots immediately");
+    QCommandLineOption purge_option({"p", "purge"}, "Purge specified instances and snapshots immediately");
     parser->addOptions({all_option, purge_option});
 
     auto status = parser->commandParse(this);
@@ -93,21 +95,18 @@ mp::ParseCode cmd::Delete::parse_args(mp::ArgParser* parser)
     if (parse_code != ParseCode::Ok)
         return parse_code;
 
-    for (const auto& arg : parser->positionalArguments())
+    request.set_purge(parser->isSet(purge_option));
+    for (const auto& item : add_instance_and_snapshot_names(parser))
     {
-        if (arg.indexOf('.') >= 0 && !parser->isSet("purge"))
+        if (item.has_snapshot_name() && !request.purge())
         {
             cerr << "Snapshots can only be purged (after deletion, they cannot be recovered). Please use the `--purge` "
                     "flag if that is what you want.\n";
             return mp::ParseCode::CommandLineError;
         }
-    }
 
-    for (const auto& item : add_instance_and_snapshot_names(parser))
         request.add_instances_snapshots()->CopyFrom(item);
-
-    if (parser->isSet(purge_option))
-        request.set_purge(true);
+    }
 
     return status;
 }