From f74309f89923317eeaaca31d74dff10590ed3d40 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 23:42:46 +0100
Subject: [XFSHoster] Use URL_REPLACEMENTS to clean url

---
 module/plugins/hoster/FileomCom.py       | 4 +---
 module/plugins/hoster/FilerioCom.py      | 4 ++--
 module/plugins/hoster/JunocloudMe.py     | 4 ++--
 module/plugins/hoster/XFileSharingPro.py | 5 +----
 4 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py
index dc3397e68..2b6fd34db 100644
--- a/module/plugins/hoster/FileomCom.py
+++ b/module/plugins/hoster/FileomCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.XFSHoster import XFSHoster, create_getInfo
 class FileomCom(XFSHoster):
     __name__    = "FileomCom"
     __type__    = "hoster"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}'
 
@@ -20,8 +20,6 @@ class FileomCom(XFSHoster):
 
     HOSTER_DOMAIN = "fileom.com"
 
-    URL_REPLACEMENTS = [(r'/$', "")]
-
     NAME_PATTERN = r'Filename: <span>(?P<N>.+?)<'
     SIZE_PATTERN = r'File Size: <span class="size">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py
index a7a160cc5..52906fc67 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.05"
+    __version__ = "0.06"
 
     __pattern__ = r'http://(?:www\.)?(filerio\.(in|com)|filekeen\.com)/\w{12}'
 
@@ -18,7 +18,7 @@ class FilerioCom(XFSHoster):
     HOSTER_DOMAIN = "filerio.in"
 
     OFFLINE_PATTERN = r'>&quot;File Not Found|File has been removed'
-    URL_REPLACEMENTS = [(r'http://.*?/', 'http://filerio.in/')]
+    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 216c56cb1..0f839960a 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.02"
+    __version__ = "0.03"
 
     __pattern__ = r'http://(?:\w+\.)?junocloud\.me/\w{12}'
 
@@ -17,7 +17,7 @@ class JunocloudMe(XFSHoster):
 
     HOSTER_DOMAIN = "junocloud.me"
 
-    URL_REPLACEMENTS = [(r'//(junocloud)', r'//dl3.\1')]
+    URL_REPLACEMENTS = [(r'/(?:embed-)?(\w{12}).*', r'/\1'), (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 060f05992..c3f8b6f41 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.41"
+    __version__ = "0.42"
 
     __pattern__ = r'^unmatchable$'
 
@@ -17,9 +17,6 @@ class XFileSharingPro(XFSHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    URL_REPLACEMENTS = [(r'/embed-(\w{12}).*', r'/\1')]  #: support embedded files
-
-
     def _log(self, type, args):
         msg = " | ".join([str(a).strip() for a in args if a])
         logger = getattr(self.log, type)
-- 
cgit v1.2.3