3 files changed, 18 insertions, 30 deletions
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"
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}
 
diff --git a/module/plugins/accounts/UploadedTo.py b/module/plugins/accounts/UploadedTo.py
index c689dc122..53fd5309e 100644
--- a/module/plugins/accounts/UploadedTo.py
+++ b/module/plugins/accounts/UploadedTo.py
@@ -9,7 +9,7 @@ from module.plugins.internal.Account import Account
 class UploadedTo(Account):
     __name__    = "UploadedTo"
     __type__    = "account"
-    __version__ = "0.39"
+    __version__ = "0.40"
     __status__  = "testing"
 
     __description__ = """Uploaded.to account plugin"""
@@ -59,12 +59,17 @@ class UploadedTo(Account):
 
 
     def signin(self, user, password, data):
-        self.load("http://uploaded.net/language/en")
-
-        html = self.load("http://uploaded.net/io/login",
-                         post={'id': user,
-                               'pw': password})
-
-        m = re.search(r'"err":"(.+?)"', html)
-        if m is not None:
-            self.fail_login(m.group(1))
+        try:
+            self.load("http://uploaded.net/me")
+    
+            html = self.load("http://uploaded.net/io/login",
+                             post={'id': user,
+                                   'pw': password})
+    
+            m = re.search(r'"err":"(.+?)"', html)
+            if m is not None:
+                self.fail_login(m.group(1))
+
+        except Exception, e:
+            self.log_error(e, trace=True)
+            self.fail_login(e.message)