summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar zoidberg10 <zoidberg@mujmail.cz> 2012-08-23 20:45:43 +0200
committerGravatar zoidberg10 <zoidberg@mujmail.cz> 2012-08-23 20:45:43 +0200
commitbd69cce998b00cabeb253f8eb02307aff9339385 (patch)
treee951e2e12e79cafa5233b9fa7232b85ad41cef5e /module/plugins
parentFixed Jumbofiles closed #660 (diff)
downloadpyload-bd69cce998b00cabeb253f8eb02307aff9339385.tar.xz
update ryushare.com - thx trance4us
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/accounts/RyushareCom.py13
-rw-r--r--module/plugins/internal/XFSPAccount.py8
2 files changed, 13 insertions, 8 deletions
diff --git a/module/plugins/accounts/RyushareCom.py b/module/plugins/accounts/RyushareCom.py
index 8eb0d3571..055680ea0 100644
--- a/module/plugins/accounts/RyushareCom.py
+++ b/module/plugins/accounts/RyushareCom.py
@@ -3,10 +3,15 @@ from module.plugins.internal.XFSPAccount import XFSPAccount
class RyushareCom(XFSPAccount):
__name__ = "RyushareCom"
- __version__ = "0.01"
+ __version__ = "0.02"
__type__ = "account"
__description__ = """ryushare.com account plugin"""
- __author_name__ = ("zoidberg")
- __author_mail__ = ("zoidberg@mujmail.cz")
+ __author_name__ = ("zoidberg", "trance4us")
+ __author_mail__ = ("zoidberg@mujmail.cz", "")
- MAIN_PAGE = "http://ryushare.com/" \ No newline at end of file
+ MAIN_PAGE = "http://ryushare.com/"
+
+ def login(self, user, data, req):
+ html = req.load("http://ryushare.com/login.python", post={"login": user, "password": data["password"], "op": "login"})
+ if 'Incorrect Login or Password' in html or '>Error<' in html:
+ self.wrongPassword() \ No newline at end of file
diff --git a/module/plugins/internal/XFSPAccount.py b/module/plugins/internal/XFSPAccount.py
index c41dbb3a9..ad25ad2c8 100644
--- a/module/plugins/internal/XFSPAccount.py
+++ b/module/plugins/internal/XFSPAccount.py
@@ -25,16 +25,16 @@ from module.utils import parseFileSize
class XFSPAccount(Account):
__name__ = "XFSPAccount"
- __version__ = "0.04"
+ __version__ = "0.05"
__type__ = "account"
__description__ = """XFileSharingPro account base"""
__author_name__ = ("zoidberg")
__author_mail__ = ("zoidberg@mujmail.cz")
MAIN_PAGE = None
-
- 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>'
+
+ VALID_UNTIL_PATTERN = r'>Premium account expire:</TD><TD><b>([^<]+)</b>'
+ TRAFFIC_LEFT_PATTERN = r'>Traffic available today:</TD><TD><b>([^<]+)</b>'
def loadAccountInfo(self, user, req):
html = req.load(self.MAIN_PAGE + "?op=my_account", decode = True)