summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-23 05:56:48 +0100
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-11-23 05:56:48 +0100
commitb5a88f7283fbf3c6177ca4d87e27accc893ea0a8 (patch)
treefebb5a97eb315defd593be162e129193a0494b7c
parent[XFileSharingPro] Improve hooks patterns (diff)
downloadpyload-b5a88f7283fbf3c6177ca4d87e27accc893ea0a8.tar.xz
Fix URL_REPLACEMENTS in XFSHoster plugins
-rw-r--r--module/plugins/hoster/FilerioCom.py5
-rw-r--r--module/plugins/hoster/JunocloudMe.py4
-rw-r--r--module/plugins/hoster/XFileSharingPro.py5
-rw-r--r--module/plugins/internal/XFSHoster.py4
4 files changed, 10 insertions, 8 deletions
diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py
index 52906fc67..db81f5b16 100644
--- a/module/plugins/hoster/FilerioCom.py
+++ b/module/plugins/hoster/FilerioCom.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
class FilerioCom(XFSHoster):
__name__ = "FilerioCom"
__type__ = "hoster"
- __version__ = "0.06"
+ __version__ = "0.07"
__pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}'
@@ -17,8 +17,9 @@ class FilerioCom(XFSHoster):
HOSTER_DOMAIN = "filerio.in"
+ URL_REPLACEMENTS = [(r'filekeen\.com', "filerio.in")]
+
OFFLINE_PATTERN = r'>&quot;File Not Found|File has been removed'
- URL_REPLACEMENTS = [(r'/(?:embed-)?(\w{12}).*', r'/\1'), (r'filekeen\.com', "filerio.in")]
getInfo = create_getInfo(FilerioCom)
diff --git a/module/plugins/hoster/JunocloudMe.py b/module/plugins/hoster/JunocloudMe.py
index 0f839960a..168ad22da 100644
--- a/module/plugins/hoster/JunocloudMe.py
+++ b/module/plugins/hoster/JunocloudMe.py
@@ -6,7 +6,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
class JunocloudMe(XFSHoster):
__name__ = "JunocloudMe"
__type__ = "hoster"
- __version__ = "0.03"
+ __version__ = "0.04"
__pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}'
@@ -17,7 +17,7 @@ class JunocloudMe(XFSHoster):
HOSTER_DOMAIN = "junocloud.me"
- URL_REPLACEMENTS = [(r'/(?:embed-)?(\w{12}).*', r'/\1'), (r'//www\.', "//dl3.")]
+ URL_REPLACEMENTS = [(r'//www\.', "//dl3.")]
NAME_PATTERN = r'<p class="request_file">http://junocloud.me/w{12}/(?P<N>.+?)</p>'
SIZE_PATTERN = r'<p class="request_filesize">Size: (?P<S>[\d.,]+) (?P<U>[\w^_]+)</p>'
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index c3f8b6f41..0acad3dba 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
class XFileSharingPro(XFSHoster):
__name__ = "XFileSharingPro"
__type__ = "hoster"
- __version__ = "0.42"
+ __version__ = "0.43"
__pattern__ = r'^unmatchable$'
@@ -17,6 +17,9 @@ class XFileSharingPro(XFSHoster):
__authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ URL_REPLACEMENTS = [("/embed-", "/")]
+
+
def _log(self, type, args):
msg = " | ".join([str(a).strip() for a in args if a])
logger = getattr(self.log, type)
diff --git a/module/plugins/internal/XFSHoster.py b/module/plugins/internal/XFSHoster.py
index 2cc4833e6..30864ef02 100644
--- a/module/plugins/internal/XFSHoster.py
+++ b/module/plugins/internal/XFSHoster.py
@@ -16,7 +16,7 @@ from module.utils import html_unescape
class XFSHoster(SimpleHoster):
__name__ = "XFSHoster"
__type__ = "hoster"
- __version__ = "0.23"
+ __version__ = "0.24"
__pattern__ = r'^unmatchable$'
@@ -30,8 +30,6 @@ class XFSHoster(SimpleHoster):
HOSTER_DOMAIN = None
HOSTER_NAME = None
- URL_REPLACEMENTS = [(r'/(?:embed-)?(\w{12}).*', r'/\1')] #: plus support embedded files
-
TEXT_ENCODING = False
COOKIES = [(HOSTER_DOMAIN, "lang", "english")]
CHECK_DIRECT_LINK = None