From 184ead294a9331dfd3ec32c61c32ce97df8d31dd Mon Sep 17 00:00:00 2001 From: rakshasa Date: Sat, 1 Nov 2025 13:57:40 +0100 Subject: [PATCH] Export 'group2.*' commands. --- src/command_helpers.cc | 34 ---------------------------------- src/command_helpers.h | 4 +++- src/command_local.cc | 16 ++++++++-------- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/src/command_helpers.cc b/src/command_helpers.cc index c22f6af0..4ef0755e 100644 --- a/src/command_helpers.cc +++ b/src/command_helpers.cc @@ -1,37 +1,3 @@ -// rTorrent - BitTorrent client -// Copyright (C) 2005-2011, Jari Sundell -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// In addition, as a special exception, the copyright holders give -// permission to link the code of portions of this program with the -// OpenSSL library under certain conditions as described in each -// individual source file, and distribute linked combinations -// including the two. -// -// You must obey the GNU General Public License in all respects for -// all of the code used other than OpenSSL. If you modify file(s) -// with this exception, you may extend this exception to your version -// of the file(s), but you are not obligated to do so. If you do not -// wish to do so, delete this exception statement from your version. -// If you delete this exception statement from all source files in the -// program, then also delete it here. -// -// Contact: Jari Sundell - - #include "config.h" #include diff --git a/src/command_helpers.h b/src/command_helpers.h index e71ee62d..07d06eda 100644 --- a/src/command_helpers.h +++ b/src/command_helpers.h @@ -104,8 +104,10 @@ void initialize_commands(); rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_public_rpc | rpc::CommandMap::flag_dont_delete); #define CMD2_REDIRECT_NO_EXPORT(from_key, to_key) \ rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_dont_delete); +#define CMD2_REDIRECT_MUTABLE(from_key, to_key) \ + rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_public_rpc); #define CMD2_REDIRECT_STR(from_key, to_key) \ - rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_public_rpc; + rpc::commands.create_redirect(from_key, to_key, rpc::CommandMap::flag_public_rpc); #define CMD2_REDIRECT_STR_NO_EXPORT(from_key, to_key) \ rpc::commands.create_redirect(from_key, to_key, 0); #define CMD2_REDIRECT_FILE(from_key, to_key) \ diff --git a/src/command_local.cc b/src/command_local.cc index c617baaa..1968197c 100644 --- a/src/command_local.cc +++ b/src/command_local.cc @@ -124,14 +124,14 @@ group_insert(const torrent::Object::list_type& args) { if (rpc::call_command_value("method.use_intermediate") == 3) { // Cleaned up in 0.16.1: - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".view", "group." + name + ".view"); - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".view.set", "group." + name + ".view.set"); - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".ratio.min", "group." + name + ".ratio.min"); - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".ratio.min.set", "group." + name + ".ratio.min.set"); - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".ratio.max", "group." + name + ".ratio.max"); - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".ratio.max.set", "group." + name + ".ratio.max.set"); - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".ratio.upload", "group." + name + ".ratio.upload"); - CMD2_REDIRECT_STR_NO_EXPORT("group2." + name + ".ratio.upload.set", "group." + name + ".ratio.upload.set"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".view", "group." + name + ".view"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".view.set", "group." + name + ".view.set"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".ratio.min", "group." + name + ".ratio.min"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".ratio.min.set", "group." + name + ".ratio.min.set"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".ratio.max", "group." + name + ".ratio.max"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".ratio.max.set", "group." + name + ".ratio.max.set"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".ratio.upload", "group." + name + ".ratio.upload"); + CMD2_REDIRECT_MUTABLE("group2." + name + ".ratio.upload.set", "group." + name + ".ratio.upload.set"); } return name;