summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar Stefano <l.stickell@yahoo.it> 2013-09-24 20:15:53 +0200
committerGravatar Stefano <l.stickell@yahoo.it> 2013-09-24 20:15:53 +0200
commita9948356d93fe0f104cbdb201fbb95381a106a79 (patch)
tree160894acaa1b5a4fc751e6a17f3de91db464e73c /module
parentGamefrontCom: improvement proposed in #279 (diff)
downloadpyload-a9948356d93fe0f104cbdb201fbb95381a106a79.tar.xz
XFileSharingPro: reverted cbb3d4c and 07ebba1
Diffstat (limited to 'module')
-rw-r--r--module/plugins/hoster/XFileSharingPro.py21
1 files changed, 10 insertions, 11 deletions
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index e37afc243..75c21bddd 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -35,7 +35,7 @@ class XFileSharingPro(SimpleHoster):
__name__ = "XFileSharingPro"
__type__ = "hoster"
__pattern__ = r"^unmatchable$"
- __version__ = "0.21"
+ __version__ = "0.22"
__description__ = """XFileSharingPro common hoster base"""
__author_name__ = ("zoidberg", "stickell")
__author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
@@ -73,18 +73,17 @@ class XFileSharingPro(SimpleHoster):
else:
self.fail("Only premium users can download from other hosters with %s" % self.HOSTER_NAME)
else:
+ try:
+ self.html = self.load(pyfile.url, cookies=False, decode=True)
+ self.file_info = self.getFileInfo()
+ except PluginParseError:
+ self.file_info = None
+
self.location = self.getDirectDownloadLink()
- # self.load will fail because pyfile.url is a direct link to the download if self.location
- # is set so it will be executed only if pyfile.url is not a direct link (location not set).
- if not self.location:
- try:
- self.html = self.load(pyfile.url, cookies=False, decode=True)
- self.file_info = self.getFileInfo()
- except PluginParseError:
- self.file_info = None
- pyfile.name = html_unescape(unquote(urlparse(
- self.location if self.location else pyfile.url).path.split("/")[-1]))
+ if not self.file_info:
+ pyfile.name = html_unescape(unquote(urlparse(
+ self.location if self.location else pyfile.url).path.split("/")[-1]))
if self.location:
self.startDownload(self.location)