merge in plugin updates

2 files changed, 71 insertions, 3 deletions

diff --git a/module/plugins/accounts/EasybytezCom.py b/module/plugins/accounts/EasybytezCom.py
new file mode 100644
index 000000000..cf2b16394
--- /dev/null
+++ b/module/plugins/accounts/EasybytezCom.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+"""
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License,
+    or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
+    
+    @author: zoidberg
+"""
+
+from module.plugins.Account import Account
+import re
+from module.utils import parseFileSize
+from time import mktime, strptime
+
+class EasybytezCom(Account):
+    __name__ = "EasybytezCom"
+    __version__ = "0.01"
+    __type__ = "account"
+    __description__ = """EasyBytez.com account plugin"""
+    __author_name__ = ("zoidberg")
+    __author_mail__ = ("zoidberg@mujmail.cz")
+    
+    VALID_UNTIL_PATTERN = r'<TR><TD>Premium account expire:</TD><TD><b>([^<]+)</b>'
+    TRAFFIC_LEFT_PATTERN = r'<TR><TD>Traffic available today:</TD><TD><b>(?P<S>[^<]+)</b>'
+
+    def loadAccountInfo(self, user, req):
+        #self.relogin(user)
+        html = req.load("http://www.easybytez.com/?op=my_account", decode = True)
+        
+        validuntil = -1
+        found = re.search(self.VALID_UNTIL_PATTERN, html)
+        if found:
+            premium = True
+            try:
+                self.logDebug(found.group(1))
+                validuntil = mktime(strptime(found.group(1), "%d %B %Y"))
+            except Exception, e:
+                self.logError(e)
+        else:
+            premium = False
+                    
+        #found = re.search(self.TRAFFIC_LEFT_PATTERN, html)           
+        #trafficleft = parseFileSize(found.group('S')) / 1024 if found else 0
+        #self.premium = True if trafficleft else False
+        trafficleft = -1 
+        
+        return ({"validuntil": validuntil, "trafficleft": trafficleft, "premium": premium})
+    
+    def login(self, user, data, req):
+        html = req.load('http://www.easybytez.com/', post = {
+            "login": user,
+            "op": "login",
+            "password": data['password'],
+            "redirect": "http://easybytez.com/"
+            }, decode = True)
+        
+        if 'Incorrect Login or Password' in html:          
+            self.wrongPassword()
\ No newline at end of file
diff --git a/module/plugins/accounts/MegauploadCom.py b/module/plugins/accounts/MegauploadCom.py
index 12e510fcf..ff4f5971c 100644
--- a/module/plugins/accounts/MegauploadCom.py
+++ b/module/plugins/accounts/MegauploadCom.py
@@ -24,16 +24,16 @@ from module.plugins.Account import Account
 
 class MegauploadCom(Account):
     __name__ = "MegauploadCom"
-    __version__ = "0.11"
+    __version__ = "0.12"
     __type__ = "account"
     __description__ = """megaupload account plugin"""
     __author_name__ = ("RaNaN")
     __author_mail__ = ("RaNaN@pyload.org")
     
     def loadAccountInfo(self, user, req):
-        page = req.load("http://www.megaupload.com/?c=account")
+        page = req.load("http://www.megaupload.com/?c=account&setlang=en", decode = True)
         
-        premium = True if r'<div class="account_txt">Premium' in page else False
+        premium = False if r'<div class="account_txt">Regular' in page else True
         validuntil = -1
         
         if premium: