mirrors
/
munin-contrib
mirror of https://github.com/munin-monitoring/contrib.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

discovering the version of rtorrent, and depending on that, using the correct functions in the xmlrpc call

This commit is contained in:
Younes Ichiche 2020-03-31 21:24:50 +02:00 committed by Lars Kruse
parent 3cb7002287
commit 54ad1ad4d5
8 changed files with 272 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/rtorrent/rtom_allsessions_mem
View File

@ -27,7 +27,6 @@
# 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
#
@ -36,7 +35,6 @@
# env.src socket
# env.socket /home/user/torrent/.socket/rpc.socket,/home/user/torrent/.socket/rpc.socket
# env.category Category
# env.api current
#
# [rtom_allsessions_*]
# user username
@ -64,16 +62,41 @@ my $src = $ENV{"src"} || "";
my @sockets = split /,/, $ENV{"socket"} || "";
my $ip = $ENV{"ip"} || "127.0.0.1";
my @ports = split /,/, $ENV{"port"} || "";
my $api = $ENV{"api"} || "current";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
my $mem = 0;
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 $function = rtorrent_version_lower_than('0.9.0') ? 'get_memory_usage' : 'pieces.memory.current';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function</methodName></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;

43
plugins/rtorrent/rtom_allsessions_peers
View File

@ -25,7 +25,6 @@
# src "socket" when using scgi_socket, or anything else when using scgi_port
# socket rTorrent's rpc socket (scgi_local) - using scgi_local - needed, when "src" is 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
#
@ -34,7 +33,6 @@
# env.src socket
# env.socket /home/user/torrent/.socket/rpc.socket,/home/user/torrent/.socket/rpc.socket
# env.category Category
# env.api current
#
# [rtom_allsessions_*]
# user username
@ -74,17 +72,44 @@ my $src = $ENV{"src"} || "";
my @sockets = split /,/, $ENV{"socket"} || "";
my $ip = $ENV{"ip"} || "127.0.0.1";
my @ports = split /,/, $ENV{"port"} || "";
my $api = $ENV{"api"} || "current";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
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 = "";
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 $function_multicall = rtorrent_version_lower_than('0.9.0') ? 'd.multicall' : 'd.multicall2';
my $function_hash = rtorrent_version_lower_than('0.9.0') ? 'd.get_hash=' : 'd.hash=';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>main</string></value></param><param><value><string>$function_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;

43
plugins/rtorrent/rtom_allsessions_spdd
View File

@ -36,7 +36,6 @@
# src "socket" when using scgi_socket, or anything else when using scgi_port
# socket rTorrent's rpc socket (scgi_local) - using scgi_local - needed, when "src" is set to "socket"
# 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
@ -46,7 +45,6 @@
# env.src socket
# env.socket /home/user/torrent/.socket/rpc.socket,/home/user/torrent/.socket/rpc.socket
# env.category Category
# env.api pre09
#
# [rtom_allsessions_*]
# user username
@ -88,15 +86,42 @@ my $src = $ENV{"src"} || "";
my @sockets = split /,/, $ENV{"socket"} || "";
my $ip = $ENV{"ip"} || "127.0.0.1";
my @ports = split /,/, $ENV{"port"} || "";
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 = "";
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>";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
my $pattern = qr/<value><(int|i4|i8|ex\.i8)>([-]{0,1}\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
my $function_totalup = rtorrent_version_lower_than('0.9.0') ? 'get_up_total' : 'throttle.global_up.total';
my $function_totaldown = rtorrent_version_lower_than('0.9.0') ? 'get_down_total' : 'throttle.global_down.total';
my $function_rateup = rtorrent_version_lower_than('0.9.0') ? 'get_upload_rate' : 'throttle.global_up.max_rate';
my $function_ratedown = rtorrent_version_lower_than('0.9.0') ? 'get_download_rate' : 'throttle.global_down.max_rate';
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>$function_totalup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_totaldown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_rateup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_ratedown</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";

47
plugins/rtorrent/rtom_allsessions_vol
View File

@ -25,7 +25,6 @@
# src "socket" when using scgi_socket, or anything else when using scgi_port
# socket rTorrent's rpc socket (scgi_local) - using scgi_local - needed, when "src" is 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
#
@ -34,13 +33,11 @@
# env.src socket
# env.socket /home/user/torrent/.socket/rpc.socket,/home/user/torrent/.socket/rpc.socket
# env.category Category
# env.api current
#
# [rtom_allsessions_*]
# user username
# env.port 5000,5001,5002,5003
# env.category Category
# env.api pre09
#
#%# family=auto
@ -79,18 +76,48 @@ my $src = $ENV{"src"} || "";
my @sockets = split /,/, $ENV{"socket"} || "";
my $ip = $ENV{"ip"} || "127.0.0.1";
my @ports = split /,/, $ENV{"port"} || "";
my $api = $ENV{"api"} || "current";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
my $pattern = qr/<value><string>([A-Z0-9]+)<\/string><\/value>/;
my $function_multicall;
my $function_hash;
foreach ( @views ) {
my $num = 0;
my $line = "";
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>";
}
$function_multicall = rtorrent_version_lower_than('0.9.0')? 'd.multicall' : 'd.multicall2';
$function_hash = rtorrent_version_lower_than('0.9.0')? 'd.get_hash=' : 'd.hash=';
$line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>${_}</string></value></param><param><value><string>$function_hash</string></value></param></params></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;

39
plugins/rtorrent/rtom_mem
View File

@ -27,7 +27,6 @@
# 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
#
@ -64,16 +63,40 @@ 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>";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
my $pattern = qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
my $function = rtorrent_version_lower_than('0.9.0') ? 'get_memory_usage' : 'pieces.memory.current';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function</methodName></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;

41
plugins/rtorrent/rtom_peers
View File

@ -27,7 +27,6 @@
# 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
#
@ -75,17 +74,43 @@ 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";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
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 = "";
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 $function_multicall = rtorrent_version_lower_than('0.9.0') ? 'd.multicall' : 'd.multicall2';
my $function_hash = rtorrent_version_lower_than('0.9.0') ? 'd.get_hash=' : 'd.hash=';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>main</string></value></param><param><value><string>$function_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;

42
plugins/rtorrent/rtom_spdd
View File

@ -39,7 +39,6 @@
# 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
@ -103,16 +102,43 @@ 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";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
my $pattern = qr/<value><(int|i4|i8|ex\.i8)>([-]{0,1}\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
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 $function_totalup = rtorrent_version_lower_than('0.9.0') ? 'get_up_total' : 'throttle.global_up.total';
my $function_totaldown = rtorrent_version_lower_than('0.9.0') ? 'get_down_total' : 'throttle.global_down.total';
my $function_rateup = rtorrent_version_lower_than('0.9.0') ? 'get_upload_rate' : 'throttle.global_up.max_rate';
my $function_ratedown = rtorrent_version_lower_than('0.9.0') ? 'get_download_rate' : 'throttle.global_down.max_rate';
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>$function_totalup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_totaldown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_rateup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_ratedown</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";

44
plugins/rtorrent/rtom_vol
View File

@ -27,7 +27,6 @@
# 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
#
@ -79,7 +78,36 @@ 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";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
}
my $pattern = qr/<value><string>([A-Z0-9]+)<\/string><\/value>/;
@ -88,6 +116,9 @@ my $llenmy;
my $header;
my $hlen;
my $function_multicall;
my $function_hash;
my $num;
foreach ( @views ) {
if ( ( defined $src ) && ( $src eq "socket" ) ) {
@ -98,11 +129,10 @@ foreach ( @views ) {
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
}
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>";
}
$function_multicall = rtorrent_version_lower_than('0.9.0')? 'd.multicall' : 'd.multicall2';
$function_hash = rtorrent_version_lower_than('0.9.0')? 'd.get_hash=' : 'd.hash=';
$line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>${_}</string></value></param><param><value><string>$function_hash</string></value></param></params></methodCall>";
$llen = length $line;
$header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
$hlen = length $header;