diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-10-14 13:07:19 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-10-14 13:07:19 +0200 |
| commit | 77ef3e137d2d9222d0f8965adf374e6712123a99 (patch) | |
| tree | 86101e8fd3e0705d2cfde01ae0376e8587292686 /module/plugins | |
| parent | New crypter JunocloudMeFolder (diff) | |
| download | pyload-77ef3e137d2d9222d0f8965adf374e6712123a99.tar.xz | |
[XFSPHoster] TEXT_ENCODING support
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/hooks/XFileSharingPro.py | 4 | ||||
| -rw-r--r-- | module/plugins/internal/XFSPHoster.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py index 232c893cc..f5d40dd62 100644 --- a/module/plugins/hooks/XFileSharingPro.py +++ b/module/plugins/hooks/XFileSharingPro.py @@ -11,12 +11,12 @@ class XFileSharingPro(Hook): __version__ = "0.15" __config__ = [("activated", "bool", "Activated", True), - ("match", "Always;Always except excluded;Listed only", "Match", "Always except excluded"), + ("match", "Always;Always except excluded;Listed only", "Hoster match", "Always except excluded"), ("load_default", "bool", "Include built-in hoster list", True), ("include_hosters", "str", "Include hosters (comma separated)", ""), ("exclude_hosters", "str", "Exclude hosters (comma separated)", "")] - __description__ = """XFileSharingPro hook plugin""" + __description__ = """Load XFileSharingPro based hosters which don't need a own plugin to work fine""" __license__ = "GPLv3" __authors__ = [("zoidberg", "zoidberg@mujmail.cz"), ("Walter Purcaro", "vuolter@gmail.com")] diff --git a/module/plugins/internal/XFSPHoster.py b/module/plugins/internal/XFSPHoster.py index 40bf26cfa..e7348d966 100644 --- a/module/plugins/internal/XFSPHoster.py +++ b/module/plugins/internal/XFSPHoster.py @@ -16,7 +16,7 @@ from module.utils import html_unescape class XFSPHoster(SimpleHoster): __name__ = "XFSPHoster" __type__ = "hoster" - __version__ = "0.02" + __version__ = "0.03" __pattern__ = None @@ -90,7 +90,7 @@ class XFSPHoster(SimpleHoster): # Due to a 0.4.9 core bug self.load would use cookies even if # cookies=False. Workaround using getURL to avoid cookies. # Can be reverted in 0.4.10 as the cookies bug has been fixed. - self.html = getURL(pyfile.url, decode=True, cookies=self.COOKIES) + self.html = getURL(pyfile.url, decode=not self.TEXT_ENCODING, cookies=self.COOKIES) self.file_info = self.getFileInfo() except PluginParseError: self.file_info = None |