From 3cb7002287ad783e1ac15027d58e79e1da99b5b0 Mon Sep 17 00:00:00 2001
From: Younes Ichiche <younes.ichiche@sephtex.net>
Date: Sun, 29 Mar 2020 12:20:42 +0200
Subject: [PATCH] Aligning rtorrent rtrom_ modules same way as
 rtom_allsessions_

---
 plugins/rtorrent/rtom_mem   |  9 ++++++++-
 plugins/rtorrent/rtom_peers |  9 ++++++++-
 plugins/rtorrent/rtom_spdd  | 10 +++++++++-
 plugins/rtorrent/rtom_vol   |  8 +++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/plugins/rtorrent/rtom_mem b/plugins/rtorrent/rtom_mem
index f691aab1..13ad209c 100755
--- a/plugins/rtorrent/rtom_mem
+++ b/plugins/rtorrent/rtom_mem
@@ -27,6 +27,7 @@
 #	ip		rTorrent's ip address			- using scgi_port	- needed, when "src" is NOT set to "socket"
 #	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
 #	category        Change graph category
+#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
 #
 # Configuration example
 #
@@ -63,10 +64,16 @@ my $src 	= $ENV{"src"} || "";
 my $ip		= $ENV{"ip"} || "127.0.0.1";
 my $port	= $ENV{"port"} || "5000";
 my $socket	= $ENV{"socket"} || "";
+my $api         = $ENV{"api"} || "current";
 
 my $pattern	= qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
+my $line        = "";
+if ($api =~ /pre09/) {
+  $line		= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>get_memory_usage</methodName></methodCall>";
+} else {
+  $line         = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>pieces.memory.current</methodName></methodCall>";
+}
 
-my $line	= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>get_memory_usage</methodName></methodCall>";
 my $llen	= length $line;
 my $header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
 my $hlen	= length $header;
diff --git a/plugins/rtorrent/rtom_peers b/plugins/rtorrent/rtom_peers
index ae414542..b5adab66 100755
--- a/plugins/rtorrent/rtom_peers
+++ b/plugins/rtorrent/rtom_peers
@@ -27,6 +27,7 @@
 #	ip		rTorrent's ip address			- using scgi_port	- needed, when "src" is NOT set to "socket"
 #	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
 #	category        Change graph category
+#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
 #
 # Configuration example
 #
@@ -74,11 +75,17 @@ my $src 	= $ENV{"src"} || "";
 my $ip		= $ENV{"ip"} || "127.0.0.1";
 my $port	= $ENV{"port"} || "5000";
 my $socket	= $ENV{"socket"} || "";
+my $api         = $ENV{"api"} || "current";
 
 my $pattern	= qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
 my $tpattern	= qr/[0-9A-F]{20}/;
 
-my $line	= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>d.multicall</methodName><params><param><value><string>main</string></value></param><param><value><string>d.get_hash=</string></value></param><param><value><string>p.multicall=,p.is_encrypted=,p.is_incoming=</string></value></param></params></methodCall>";
+my $line        = "";
+if ($api =~ /pre09/) {
+  $line		= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>d.multicall</methodName><params><param><value><string>main</string></value></param><param><value><string>d.get_hash=</string></value></param><param><value><string>p.multicall=,p.is_encrypted=,p.is_incoming=</string></value></param></params></methodCall>";
+} else {
+  $line         = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>d.multicall2</methodName><params><param><value><string></string></value></param><param><value><string>main</string></value></param><param><value><string>d.hash=</string></value></param><param><value><string>p.multicall=,p.is_encrypted=,p.is_incoming=</string></value></param></params></methodCall>";
+}
 my $llen	= length $line;
 my $header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
 my $hlen	= length $header;
diff --git a/plugins/rtorrent/rtom_spdd b/plugins/rtorrent/rtom_spdd
index e2b08835..8a6f24e7 100755
--- a/plugins/rtorrent/rtom_spdd
+++ b/plugins/rtorrent/rtom_spdd
@@ -39,6 +39,7 @@
 #	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
 #	category        Change graph category
 #	diff		"yes" for using bps for upload and Bps for download, or anything else for using Bps for both
+#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
 #
 #
 # Configuration example
@@ -102,10 +103,17 @@ my $src 	= $ENV{"src"} || "";
 my $ip		= $ENV{"ip"} || "127.0.0.1";
 my $port	= $ENV{"port"} || "5000";
 my $socket	= $ENV{"socket"} || "";
+my $api         = $ENV{"api"} || "current";
 
 my $pattern	= qr/<value><(int|i4|i8|ex\.i8)>([-]{0,1}\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
 
-my $line	= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.multicall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>get_up_total</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>get_down_total</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>get_upload_rate</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>get_download_rate</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value></data></array></value></param></params></methodCall>";
+my $line        = "";
+if ($api =~ /pre09/) {
+  $line		= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.multicall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>get_up_total</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>get_down_total</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>get_upload_rate</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>get_download_rate</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value></data></array></value></param></params></methodCall>";
+} else {
+  $line         = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.multicall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>throttle.global_up.total</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>throttle.global_down.total</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>throttle.global_up.max_rate</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>throttle.global_down.max_rate</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value></data></array></value></param></params></methodCall>";
+}
+
 my $llen	= length $line;
 my $header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
 my $hlen	= length $header;
diff --git a/plugins/rtorrent/rtom_vol b/plugins/rtorrent/rtom_vol
index ea88fe13..4d366751 100755
--- a/plugins/rtorrent/rtom_vol
+++ b/plugins/rtorrent/rtom_vol
@@ -27,6 +27,7 @@
 #	ip		rTorrent's ip address			- using scgi_port	- needed, when "src" is NOT set to "socket"
 #	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
 #	category        Change graph category
+#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
 #
 # Configuration example
 #
@@ -78,6 +79,7 @@ my $src 	= $ENV{"src"} || "";
 my $ip		= $ENV{"ip"} || "127.0.0.1";
 my $port	= $ENV{"port"} || "5000";
 my $socket	= $ENV{"socket"} || "";
+my $api         = $ENV{"api"} || "current";
 
 my $pattern	= qr/<value><string>([A-Z0-9]+)<\/string><\/value>/;
 
@@ -96,7 +98,11 @@ foreach ( @views ) {
 		connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
 	}
 
-	$line	= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>d.multicall</methodName><params><param><value><string>${_}</string></value></param><param><value><string>d.get_hash=</string></value></param></params></methodCall>";
+	if ($api =~ /pre09/) {
+		$line	= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>d.multicall</methodName><params><param><value><string>${_}</string></value></param><param><value><string>d.get_hash=</string></value></param></params></methodCall>";
+	} else {
+		$line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>d.multicall2</methodName><params><param><value><string></string></value></param><param><value><string>${_}</string></value></param><param><value><string>d.hash=</string></value></param></params></methodCall>";
+	}
 	$llen	= length $line;
 	$header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
 	$hlen	= length $header;