Projet

Général

Profil

Révision 3cb70022

ID3cb7002287ad783e1ac15027d58e79e1da99b5b0
Parent 0af7f438
Enfant 54ad1ad4

Ajouté par Younes Ichiche il y a plus de 5 ans

Aligning rtorrent rtrom_ modules same way as rtom_allsessions_

Voir les différences:

plugins/rtorrent/rtom_mem
27 27
#	ip		rTorrent's ip address			- using scgi_port	- needed, when "src" is NOT set to "socket"
28 28
#	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
29 29
#	category        Change graph category
30
#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
30 31
#
31 32
# Configuration example
32 33
#
......
63 64
my $ip		= $ENV{"ip"} || "127.0.0.1";
64 65
my $port	= $ENV{"port"} || "5000";
65 66
my $socket	= $ENV{"socket"} || "";
67
my $api         = $ENV{"api"} || "current";
66 68

  
67 69
my $pattern	= qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
70
my $line        = "";
71
if ($api =~ /pre09/) {
72
  $line		= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>get_memory_usage</methodName></methodCall>";
73
} else {
74
  $line         = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>pieces.memory.current</methodName></methodCall>";
75
}
68 76

  
69
my $line	= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>get_memory_usage</methodName></methodCall>";
70 77
my $llen	= length $line;
71 78
my $header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
72 79
my $hlen	= length $header;
plugins/rtorrent/rtom_peers
27 27
#	ip		rTorrent's ip address			- using scgi_port	- needed, when "src" is NOT set to "socket"
28 28
#	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
29 29
#	category        Change graph category
30
#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
30 31
#
31 32
# Configuration example
32 33
#
......
74 75
my $ip		= $ENV{"ip"} || "127.0.0.1";
75 76
my $port	= $ENV{"port"} || "5000";
76 77
my $socket	= $ENV{"socket"} || "";
78
my $api         = $ENV{"api"} || "current";
77 79

  
78 80
my $pattern	= qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
79 81
my $tpattern	= qr/[0-9A-F]{20}/;
80 82

  
81
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>";
83
my $line        = "";
84
if ($api =~ /pre09/) {
85
  $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>";
86
} else {
87
  $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>";
88
}
82 89
my $llen	= length $line;
83 90
my $header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
84 91
my $hlen	= length $header;
plugins/rtorrent/rtom_spdd
39 39
#	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
40 40
#	category        Change graph category
41 41
#	diff		"yes" for using bps for upload and Bps for download, or anything else for using Bps for both
42
#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
42 43
#
43 44
#
44 45
# Configuration example
......
102 103
my $ip		= $ENV{"ip"} || "127.0.0.1";
103 104
my $port	= $ENV{"port"} || "5000";
104 105
my $socket	= $ENV{"socket"} || "";
106
my $api         = $ENV{"api"} || "current";
105 107

  
106 108
my $pattern	= qr/<value><(int|i4|i8|ex\.i8)>([-]{0,1}\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
107 109

  
108
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>";
110
my $line        = "";
111
if ($api =~ /pre09/) {
112
  $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>";
113
} else {
114
  $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>";
115
}
116

  
109 117
my $llen	= length $line;
110 118
my $header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
111 119
my $hlen	= length $header;
plugins/rtorrent/rtom_vol
27 27
#	ip		rTorrent's ip address			- using scgi_port	- needed, when "src" is NOT set to "socket"
28 28
#	port		rTorrent's scgi port (scgi_port)	- using scgi_port	- needed, when "src" is NOT set to "socket"
29 29
#	category        Change graph category
30
#	api		use "pre09" (pre 0.9.0) or "current" (0.9.0+, the default) API calls
30 31
#
31 32
# Configuration example
32 33
#
......
78 79
my $ip		= $ENV{"ip"} || "127.0.0.1";
79 80
my $port	= $ENV{"port"} || "5000";
80 81
my $socket	= $ENV{"socket"} || "";
82
my $api         = $ENV{"api"} || "current";
81 83

  
82 84
my $pattern	= qr/<value><string>([A-Z0-9]+)<\/string><\/value>/;
83 85

  
......
96 98
		connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
97 99
	}
98 100

  
99
	$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>";
101
	if ($api =~ /pre09/) {
102
		$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>";
103
	} else {
104
		$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>";
105
	}
100 106
	$llen	= length $line;
101 107
	$header	= "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
102 108
	$hlen	= length $header;

Formats disponibles : Unified diff