nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Catch unit for data

Browse source
This commit is contained in:
Florent 2012-07-16 11:41:34 +02:00
commit e18a4e85a8
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
contrib/freemobile-munin
View file

@ -87,11 +87,11 @@ my %regexp = (
'specialvoice' => '\| (\d+)h(\d+) min (\d+)s', 'specialvoice' => '\| (\d+)h(\d+) min (\d+)s',
'sms' => 'Conso SMS \| (\d+) \/ (.*)', 'sms' => 'Conso SMS \| (\d+) \/ (.*)',
'mms' => 'Vous avez consommé (\d+) MMS', 'mms' => 'Vous avez consommé (\d+) MMS',
'data' => 'Vous avez consommé ([\d\-\.]+) Mo', 'data' => 'Vous avez consommé ([\d\-\.]+) (Mo|Go)',
'voiceint' => 'Appels émis (\d+)h(\d+)min(\d+)s', 'voiceint' => 'Appels émis (\d+)h(\d+)min(\d+)s',
'smsint' => 'Conso SMS (international) \| (\d+)', 'smsint' => 'Conso SMS (international) \| (\d+)',
'mmsint' => 'Vous avez consommé (\d+) MMS', 'mmsint' => 'Vous avez consommé (\d+) MMS',
'dataint' => 'Vous avez consommé ([\d\-]+) Mo', 'dataint' => 'Vous avez consommé ([\d\-]+) (Mo|Go)',
); );
my %post = ( my %post = (
@ -100,11 +100,11 @@ my %post = (
'specialvoice' => 'postvoice', 'specialvoice' => 'postvoice',
'sms' => 'simplepost', 'sms' => 'simplepost',
'mms' => 'simplepost', 'mms' => 'simplepost',
'data' => 'simplepost', 'data' => 'datapost',
'voiceint' => 'postvoice', 'voiceint' => 'postvoice',
'smsint' => 'simplepost', 'smsint' => 'simplepost',
'mmsint' => 'simplepost', 'mmsint' => 'simplepost',
'dataint' => 'simplepost', 'dataint' => 'datapost',
); );
sub doubleprint { sub doubleprint {
@ -127,6 +127,16 @@ sub simplepost {
return 0; return 0;
} }
sub datapost {
my @args = @_;
my $multi = 1;
my $unit = $args[1];
if ($unit == "Go") {
$multi = 1024;
}
return $args[0] * $multi;
}
sub config { sub config {
binmode STDOUT, ':encoding(iso-8859-1)'; binmode STDOUT, ':encoding(iso-8859-1)';
print <<'EOF'; print <<'EOF';