From 1867d53987169faef3e15bcf1776ae651f643370 Mon Sep 17 00:00:00 2001
From: GammaC0de <GammaC0de@users.noreply.github.com>
Date: Sat, 12 Dec 2015 20:24:09 +0200
Subject: [RapiduNet] fix #2146

---
 module/plugins/accounts/RapiduNet.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/RapiduNet.py b/module/plugins/accounts/RapiduNet.py
index cde39a361..5a852b906 100644
--- a/module/plugins/accounts/RapiduNet.py
+++ b/module/plugins/accounts/RapiduNet.py
@@ -10,7 +10,7 @@ from module.plugins.internal.utils import json
 class RapiduNet(Account):
     __name__    = "RapiduNet"
     __type__    = "account"
-    __version__ = "0.10"
+    __version__ = "0.11"
     __status__  = "testing"
 
     __description__ = """Rapidu.net account plugin"""
@@ -23,7 +23,7 @@ class RapiduNet(Account):
 
     VALID_UNTIL_PATTERN = r'>Account: <b>\w+ \((\d+)'
 
-    TRAFFIC_LEFT_PATTERN = r'class="tipsyS"><b>(.+?)<'
+    TRAFFIC_LEFT_PATTERN = r'class="tipsyS"><b>([\d.,]+)\s*([\w^_]*)<'
 
 
     def grab_info(self, user, password, data):
@@ -42,7 +42,7 @@ class RapiduNet(Account):
 
         m = re.search(self.TRAFFIC_LEFT_PATTERN, html)
         if m is not None:
-            trafficleft = self.parse_traffic(m.group(1))
+            trafficleft = self.parse_traffic(m.group(1), m.group(2))
 
         return {'validuntil': validuntil, 'trafficleft': trafficleft, 'premium': premium}
 
-- 
cgit v1.2.3


From 595669d2fc4acce399458095bca3d3b91fc0bfb3 Mon Sep 17 00:00:00 2001
From: GammaC0de <GammaC0de@users.noreply.github.com>
Date: Sun, 20 Dec 2015 15:44:37 +0200
Subject: Delete FileParadoxIn.py

---
 module/plugins/accounts/FileParadoxIn.py | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 module/plugins/accounts/FileParadoxIn.py

(limited to 'module/plugins/accounts')

diff --git a/module/plugins/accounts/FileParadoxIn.py b/module/plugins/accounts/FileParadoxIn.py
deleted file mode 100644
index 1a3949583..000000000
--- a/module/plugins/accounts/FileParadoxIn.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from module.plugins.internal.XFSAccount import XFSAccount
-
-
-class FileParadoxIn(XFSAccount):
-    __name__    = "FileParadoxIn"
-    __type__    = "account"
-    __version__ = "0.05"
-    __status__  = "testing"
-
-    __description__ = """FileParadox.in account plugin"""
-    __license__     = "GPLv3"
-    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
-
-
-    PLUGIN_DOMAIN = "fileparadox.in"
-- 
cgit v1.2.3