summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/internal
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugins/internal')
-rw-r--r--pyload/plugins/internal/SimpleHoster.py7
-rw-r--r--pyload/plugins/internal/XFSHoster.py8
2 files changed, 4 insertions, 11 deletions
diff --git a/pyload/plugins/internal/SimpleHoster.py b/pyload/plugins/internal/SimpleHoster.py
index af8a53534..d04044830 100644
--- a/pyload/plugins/internal/SimpleHoster.py
+++ b/pyload/plugins/internal/SimpleHoster.py
@@ -10,7 +10,7 @@ from pyload.datatype.PyFile import statusMap as _statusMap
from pyload.network.CookieJar import CookieJar
from pyload.network.RequestFactory import getURL
from pyload.plugins.Hoster import Hoster
-from pyload.utils import fixup, parseFileSize
+from pyload.utils import fixup, formatSize, parseFileSize
#@TODO: Adapt and move to PyFile in 0.4.10
@@ -523,9 +523,8 @@ class SimpleHoster(Hoster):
elif traffic == -1:
return True
else:
- size = self.pyfile.size / 1024
- self.logInfo(_("Filesize: %i KiB, Traffic left for user %s: %i KiB") % (size, self.user, traffic))
- return size <= traffic
+ self.logInfo(_("Filesize: %s, Traffic left for user %s: %s") % (formatSize(size), self.user, formatSize(traffic)))
+ return self.pyfile.size <= traffic
def error(self, reason="", type="parse"):
diff --git a/pyload/plugins/internal/XFSHoster.py b/pyload/plugins/internal/XFSHoster.py
index 1f9671402..8479be03f 100644
--- a/pyload/plugins/internal/XFSHoster.py
+++ b/pyload/plugins/internal/XFSHoster.py
@@ -5,8 +5,6 @@ import re
from random import random
from time import sleep
-from pycurl import FOLLOWLOCATION, LOW_SPEED_TIME
-
from pyload.plugins.hoster.UnrestrictLi import secondsToMidnight
from pyload.plugins.internal.captcha import ReCaptcha, SolveMedia
from pyload.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
@@ -119,11 +117,7 @@ class XFSHoster(SimpleHoster):
data = self.getPostParameters()
- self.req.http.c.setopt(FOLLOWLOCATION, 0)
-
- self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True)
-
- self.req.http.c.setopt(FOLLOWLOCATION, 1)
+ self.html = self.load(self.pyfile.url, post=data, ref=True, decode=True, follow_location=False)
m = re.search(r'Location\s*:\s*(.+)', self.req.http.header, re.I)
if m and not "op=" in m.group(1):