From 3ffb4c6e0bcffcd98b316eee60e2d202683736c0 Mon Sep 17 00:00:00 2001
From: kmarty <gkmarty@gmail.com>
Date: Tue, 26 Feb 2013 18:30:30 +0100
Subject: Fixed error getting file size
---
module/plugins/hoster/UlozTo.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'module')
diff --git a/module/plugins/hoster/UlozTo.py b/module/plugins/hoster/UlozTo.py
index d46b303f4..5a930fd8a 100644
--- a/module/plugins/hoster/UlozTo.py
+++ b/module/plugins/hoster/UlozTo.py
@@ -27,12 +27,12 @@ class UlozTo(SimpleHoster):
__name__ = "UlozTo"
__type__ = "hoster"
__pattern__ = r"http://(\w*\.)?(uloz\.to|ulozto\.(cz|sk|net)|bagruj.cz|zachowajto.pl)/(?:live/)?(?P<id>\w+/[^/?]*)"
- __version__ = "0.90"
+ __version__ = "0.91"
__description__ = """uloz.to"""
__author_name__ = ("zoidberg")
FILE_NAME_PATTERN = r'<a href="#download" class="jsShowDownload">(?P<N>[^<]+)</a>'
- FILE_SIZE_PATTERN = r'<span id="fileSize">.*?(?P<S>[0-9.]+\s[kMG]B)</span>'
+ FILE_SIZE_PATTERN = r'<span id="fileSize">.*?(?P<S>[0-9.]+\s[kMG]?B)</span>'
FILE_INFO_PATTERN = r'<p>File <strong>(?P<N>[^<]+)</strong> is password protected</p>'
FILE_OFFLINE_PATTERN = r'<title>404 - Page not found</title>|<h1 class="h1">File (has been deleted|was banned)</h1>'
FILE_SIZE_REPLACEMENTS = [('([0-9.]+)\s([kMG])B', convertDecimalPrefix)]
--
cgit v1.2.3
From 0ab28db74847e9787f56fc7c63f0af2f51aba00f Mon Sep 17 00:00:00 2001
From: kmarty <gkmarty@gmail.com>
Date: Tue, 26 Feb 2013 18:36:37 +0100
Subject: Fix paid account access (contributed by wendelin)
---
module/plugins/accounts/UlozTo.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'module')
diff --git a/module/plugins/accounts/UlozTo.py b/module/plugins/accounts/UlozTo.py
index 0c4ecda6a..232b6b64f 100644
--- a/module/plugins/accounts/UlozTo.py
+++ b/module/plugins/accounts/UlozTo.py
@@ -11,13 +11,13 @@ class UlozTo(Account):
__author_name__ = ("zoidberg")
__author_mail__ = ("zoidberg@mujmail.cz")
- TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="/kredit/" title="[^"]*?GB = ([0-9.]+) MB">'
+ TRAFFIC_LEFT_PATTERN = r'<li class="menu-kredit"><a href="http://www.ulozto.net/kredit" title="[^"]*?GB = ([0-9.]+) MB"'
def loadAccountInfo(self, user, req):
#this cookie gets lost somehow after each request
- self.phpsessid = req.cj.getCookie("PHPSESSID")
+ self.phpsessid = req.cj.getCookie("ULOSESSID")
html = req.load("http://www.ulozto.net/", decode = True)
- req.cj.setCookie("www.ulozto.net", "PHPSESSID", self.phpsessid)
+ req.cj.setCookie("www.ulozto.net", "ULOSESSID", self.phpsessid)
found = re.search(self.TRAFFIC_LEFT_PATTERN, html)
trafficleft = int(float(found.group(1).replace(' ','').replace(',','.')) * 1000 / 1.024) if found else 0
--
cgit v1.2.3