Stuff.

src/command_download.cc

@@ -974,6 +974,7 @@ initialize_command_download() {
   rpc::rpc.mark_safe("d.size_pex");
   rpc::rpc.mark_safe("d.completed_bytes");
   rpc::rpc.mark_safe("d.complete");
+  rpc::rpc.mark_safe("d.timestamp.started");
   rpc::rpc.mark_safe("d.timestamp.finished");
   rpc::rpc.mark_safe("d.bytes_done");
   rpc::rpc.mark_safe("d.peers_accounted");

src/command_dynamic.cc

@@ -444,6 +444,8 @@ initialize_command_dynamic() {
 
   CMD2_ANY         ("catch", std::bind(&cmd_catch, std::placeholders::_1, std::placeholders::_2));
 
+  CMD2_ANY_STRING  ("enum.log_group",                    [](auto, const auto& str) { return torrent::option_find_string_str(torrent::OPTION_LOG_GROUP, str); });
+
   CMD2_ANY         ("strings.choke_heuristics",          [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_CHOKE_HEURISTICS); });
   CMD2_ANY         ("strings.choke_heuristics.upload",   [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_CHOKE_HEURISTICS_UPLOAD); });
   CMD2_ANY         ("strings.choke_heuristics.download", [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_CHOKE_HEURISTICS_DOWNLOAD); });
@@ -470,6 +472,8 @@ initialize_command_dynamic() {
   rpc::rpc.mark_safe("method.rlookup");
   rpc::rpc.mark_safe("catch");
 
+  rpc::rpc.mark_safe("enum.log_group");
+
   rpc::rpc.mark_safe("strings.choke_heuristics");
   rpc::rpc.mark_safe("strings.choke_heuristics.upload");
   rpc::rpc.mark_safe("strings.choke_heuristics.download");

src/command_logging.cc

@@ -1,6 +1,7 @@
 #include "config.h"
 
 #include <fcntl.h>
+#include <iterator>
 #include <stdio.h>
 #include <unistd.h>
 #include <torrent/data/chunk_utils.h>
@@ -15,6 +16,7 @@
 #include "core/download.h"
 #include "core/download_list.h"
 #include "core/manager.h"
+#include "rpc/parse.h"
 #include "rpc/parse_commands.h"
 
 torrent::Object
@@ -38,6 +40,32 @@ apply_log_add_output(const torrent::Object::list_type& args) {
   return torrent::Object();
 }
 
+torrent::Object
+apply_log_print(const torrent::Object::list_type& args) {
+  if (args.size() < 2)
+    throw torrent::input_error("Invalid number of arguments.");
+
+  torrent::Object::value_type group;
+
+  if (args.front().is_value())
+    group = args.front().as_value();
+  else if (args.front().is_string())
+    group = torrent::option_find_string_str(torrent::OPTION_LOG_GROUP, args.front().as_string());
+  else
+    throw torrent::input_error("Invalid log group.");
+
+  if (group < 0 || group >= torrent::LOG_GROUP_MAX_SIZE)
+    throw torrent::input_error("Invalid log group.");
+
+  std::string message;
+
+  for (auto itr = std::next(args.begin()); itr != args.end(); ++itr)
+    rpc::print_object_std(&message, &*itr, 0);
+
+  torrent::log_groups[group].internal_print(message);
+  return torrent::Object();
+}
+
 // TODO: Deprecated.
 torrent::Object
 apply_log(const torrent::Object::string_type& arg, int logType) {
@@ -112,6 +140,7 @@ initialize_command_logging() {
   CMD2_ANY_STRING_V("log.close",            std::bind(&torrent::log_close_output_str, std::placeholders::_2));
 
   CMD2_ANY_LIST    ("log.add_output",       std::bind(&apply_log_add_output, std::placeholders::_2));
+  CMD2_ANY_LIST    ("log.print",            std::bind(&apply_log_print, std::placeholders::_2));
 
   CMD2_ANY_STRING  ("log.execute",          std::bind(&apply_log, std::placeholders::_2, 0));
   CMD2_ANY_STRING  ("log.vmmap.dump",       std::bind(&log_vmmap_dump, std::placeholders::_2));

src/main.cc

@@ -301,8 +301,6 @@ main(int argc, char** argv) {
        "schedule = low_diskspace,5,60,((close_low_diskspace,500M))\n"
        "schedule = prune_file_status,3600,86400,((system.file_status_cache.prune))\n"
 
-       "protocol.encryption.set=allow_incoming,prefer_plaintext,enable_retry\n"
-
        "ui.color.focus.set=reverse\n"
     );
 
@@ -346,8 +344,9 @@ main(int argc, char** argv) {
     CMD_REDIRECT("directory",             "directory.default.set");
     CMD_REDIRECT("session",               "session.path.set");
 
-    CMD_REDIRECT("scgi_port",             "network.scgi.open_port");
-    CMD_REDIRECT("scgi_local",            "network.scgi.open_local");
+    CMD_REDIRECT_NO_EXPORT("port_range",  "network.listen.port.range.set");
+    CMD_REDIRECT_NO_EXPORT("scgi_port",   "network.scgi.open_port");
+    CMD_REDIRECT_NO_EXPORT("scgi_local",  "network.scgi.open_local");
 
     CMD_REDIRECT("to_gm_time",            "convert.gm_time");
     CMD_REDIRECT("to_gm_date",            "convert.gm_date");
@@ -359,27 +358,6 @@ main(int argc, char** argv) {
     CMD_REDIRECT("to_xb",                 "convert.xb");
     CMD_REDIRECT("to_throttle",           "convert.throttle");
 
-    // TODO: Deprecate these at some point a while after 1.1 release.
-
-    CMD_REDIRECT("d.multicall2",                   "d.multicall");
-    CMD_REDIRECT("network.open_sockets",           "system.sockets.size");
-    CMD_REDIRECT("network.max_open_sockets",       "system.sockets.max_size");
-    CMD_REDIRECT("network.max_open_sockets.set",   "system.sockets.max_size.set");
-    CMD_REDIRECT("network.http.proxy_address",     "network.proxy.http");
-    CMD_REDIRECT("network.http.proxy_address.set", "network.proxy.http.set");
-
-    rpc::rpc.mark_safe("d.multicall2");
-    rpc::rpc.mark_safe("network.max_open_sockets");
-    rpc::rpc.mark_safe("network.http.proxy_address");
-
-    CMD2_ANY_VALUE_V("network.http.max_total_connections.set", [](auto, auto) {
-        lt_log_print(torrent::LOG_WARN, "network.http.max_total_connections.set is deprecated, use system.sockets.http.min_alloc.set instead.");
-      });
-
-    CMD2_ANY_VALUE_V("network.max_open_files.set", [](auto, auto) {
-        lt_log_print(torrent::LOG_WARN, "network.max_open_files.set is deprecated, use system.sockets.files.min_alloc.set instead.");
-      });
-
     // if (rpc::call_command_value("method.use_intermediate") == 1) {
 
     // } else if (rpc::call_command_value("method.use_intermediate") == 2) {
@@ -387,29 +365,9 @@ main(int argc, char** argv) {
     // }
 
     if (rpc::call_command_value("method.use_deprecated") == 1) {
-      CMD_REDIRECT("execute2",         "execute");
-      CMD_REDIRECT("schedule2",        "schedule");
-      CMD_REDIRECT("schedule_remove2", "schedule.remove");
-
-      // TODO: Remove file.append when cleaning these up.
-
-      CMD_REDIRECT("bind",                  "network.bind_address.set");
-      CMD_REDIRECT("ip",                    "network.local_address.set");
-      CMD_REDIRECT("port_range",            "network.port_range.set");
-
-      // TODO: Check if dht is on by default.
-      CMD_REDIRECT("dht",                   "dht.mode.set");
-
-      CMD_REDIRECT("port_random",           "network.port_random.set");
+      CMD_REDIRECT("port_random",           "network.listen.port.random.set");
       CMD_REDIRECT("proxy_address",         "network.proxy_address.set");
 
-      CMD_REDIRECT("key_layout",            "keys.layout.set");
-
-      CMD_REDIRECT("torrent_list_layout",   "ui.torrent_list.layout.set");
-
-      CMD2_VAR_STRING("dht.throttle.name",   "deprecated");
-      rpc::rpc.mark_safe("dht.throttle.name");
-
       CMD_REDIRECT("network.http.max_open",     "network.http.max_total_connections");
       CMD_REDIRECT("network.http.max_open.set", "network.http.max_total_connections.set");
 
@@ -434,6 +392,27 @@ main(int argc, char** argv) {
       CMD_REDIRECT("network.port_random.set", "network.listen.port.random.set");
       CMD_REDIRECT("network.port_range",      "network.listen.port.range");
       CMD_REDIRECT("network.port_range.set",  "network.listen.port.range.set");
+
+      // TODO: Deprecate these at some point a while after 1.1 release.
+
+      CMD_REDIRECT("d.multicall2",                   "d.multicall");
+      CMD_REDIRECT("network.open_sockets",           "system.sockets.size");
+      CMD_REDIRECT("network.max_open_sockets",       "system.sockets.max_size");
+      CMD_REDIRECT("network.max_open_sockets.set",   "system.sockets.max_size.set");
+      CMD_REDIRECT("network.http.proxy_address",     "network.proxy.http");
+      CMD_REDIRECT("network.http.proxy_address.set", "network.proxy.http.set");
+
+      rpc::rpc.mark_safe("d.multicall2");
+      rpc::rpc.mark_safe("network.max_open_sockets");
+      rpc::rpc.mark_safe("network.http.proxy_address");
+
+      CMD2_ANY_VALUE_V("network.http.max_total_connections.set", [](auto, auto) {
+          lt_log_print(torrent::LOG_WARN, "network.http.max_total_connections.set is deprecated, use system.sockets.http.min_alloc.set instead.");
+        });
+
+      CMD2_ANY_VALUE_V("network.max_open_files.set", [](auto, auto) {
+          lt_log_print(torrent::LOG_WARN, "network.max_open_files.set is deprecated, use system.sockets.files.min_alloc.set instead.");
+        });
     }
 
     {

src/setup.cc

@@ -38,7 +38,7 @@ parse_main_options(int argc, char** argv) {
     optionParser.insert_option('b', [](auto& arg) { rpc::call_command_set_string("network.bind_address.set", arg); });
     optionParser.insert_option('d', [](auto& arg) { rpc::call_command_set_string("directory.default.set", arg); });
     optionParser.insert_option('i', [](auto& arg) { rpc::call_command_set_string("ip", arg); });
-    optionParser.insert_option('p', [](auto& arg) { rpc::call_command_set_string("network.port_range.set", arg); });
+    optionParser.insert_option('p', [](auto& arg) { rpc::call_command_set_string("network.listen.port.range.set", arg); });
     optionParser.insert_option('s', [](auto& arg) { rpc::call_command_set_string("session", arg); });
 
     optionParser.insert_option('O',      [](auto& arg) { rpc::parse_command_single_std(arg); });