6 files changed, 18 insertions, 51 deletions
diff --git a/module/plugins/hoster/DuploadOrg.py b/module/plugins/hoster/DuploadOrg.py
index c11d694c5..e36e4dd15 100644
--- a/module/plugins/hoster/DuploadOrg.py
+++ b/module/plugins/hoster/DuploadOrg.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
-class DuploadOrg(XFileSharingPro):
+class DuploadOrg(DeadHoster):
     __name__ = "DuploadOrg"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?dupload\.org/\w{12}'
 
@@ -14,9 +14,5 @@ class DuploadOrg(XFileSharingPro):
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
-    HOSTER_NAME = "dupload.org"
-
-    FILE_INFO_PATTERN = r'<h3[^>]*>(?P<N>.+) \((?P<S>[\d.]+) (?P<U>\w+)\)</h3>'
-
 
 getInfo = create_getInfo(DuploadOrg)
diff --git a/module/plugins/hoster/EpicShareNet.py b/module/plugins/hoster/EpicShareNet.py
index 81e28f8aa..47729d83a 100644
--- a/module/plugins/hoster/EpicShareNet.py
+++ b/module/plugins/hoster/EpicShareNet.py
@@ -1,15 +1,12 @@
 # -*- coding: utf-8 -*-
-#
-# Test links:
-# BigBuckBunny_320x180.mp4 - 61.7 Mb - http://epicshare.net/fch3m2bk6ihp/BigBuckBunny_320x180.mp4.html
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
-class EpicShareNet(XFileSharingPro):
+class EpicShareNet(DeadHoster):
     __name__ = "EpicShareNet"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?epicshare\.net/\w{12}'
 
@@ -17,9 +14,5 @@ class EpicShareNet(XFileSharingPro):
     __author_name__ = "t4skforce"
     __author_mail__ = "t4skforce1337[AT]gmail[DOT]com"
 
-    HOSTER_NAME = "epicshare.net"
-
-    FILE_NAME_PATTERN = r'<b>Password:</b></div>\s*<h2>(?P<N>[^<]+)</h2>'
-
 
 getInfo = create_getInfo(EpicShareNet)
diff --git a/module/plugins/hoster/LemUploadsCom.py b/module/plugins/hoster/LemUploadsCom.py
index 649e7f739..4d9a62e4b 100644
--- a/module/plugins/hoster/LemUploadsCom.py
+++ b/module/plugins/hoster/LemUploadsCom.py
@@ -1,15 +1,12 @@
 # -*- coding: utf-8 -*-
-#
-# Test links:
-# BigBuckBunny_320x180.mp4 - 61.7 Mb - http://lemuploads.com/uwol0aly9dld
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
-class LemUploadsCom(XFileSharingPro):
+class LemUploadsCom(DeadHoster):
     __name__ = "LemUploadsCom"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?lemuploads\.com/\w{12}'
 
@@ -18,9 +15,4 @@ class LemUploadsCom(XFileSharingPro):
     __author_mail__ = "t4skforce1337[AT]gmail[DOT]com"
 
 
-    HOSTER_NAME = "lemuploads.com"
-
-    FILE_NAME_PATTERN = r'<b>Password:</b></div>\s*<h2>(?P<N>[^<]+)</h2>'
-
-
 getInfo = create_getInfo(LemUploadsCom)
diff --git a/module/plugins/hoster/MegaFilesSe.py b/module/plugins/hoster/MegaFilesSe.py
index a26d8fff3..8a79b51e4 100644
--- a/module/plugins/hoster/MegaFilesSe.py
+++ b/module/plugins/hoster/MegaFilesSe.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
-class MegaFilesSe(XFileSharingPro):
+class MegaFilesSe(DeadHoster):
     __name__ = "MegaFilesSe"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?megafiles\.se/\w{12}'
 
@@ -14,10 +14,5 @@ class MegaFilesSe(XFileSharingPro):
     __author_name__ = "t4skforce"
     __author_mail__ = "t4skforce1337[AT]gmail[DOT]com"
 
-    HOSTER_NAME = "megafiles.se"
-
-    OFFLINE_PATTERN = r'><font[^>]*>File Not Found'
-    FILE_NAME_PATTERN = r'<div[^>]+>\s*<b>(?P<N>[^<]+)</b>\s*</div>'
-
 
 getInfo = create_getInfo(MegaFilesSe)
diff --git a/module/plugins/hoster/MegareleaseOrg.py b/module/plugins/hoster/MegareleaseOrg.py
index a9b309fc7..6c9260c0c 100644
--- a/module/plugins/hoster/MegareleaseOrg.py
+++ b/module/plugins/hoster/MegareleaseOrg.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
-class MegareleaseOrg(XFileSharingPro):
+class MegareleaseOrg(DeadHoster):
     __name__ = "MegareleaseOrg"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'https?://(?:www\.)?megarelease\.org/\w{12}'
 
@@ -15,9 +15,4 @@ class MegareleaseOrg(XFileSharingPro):
     __author_mail__ = ("derek3x@vmail.me", "l.stickell@yahoo.it")
 
 
-    HOSTER_NAME = "megarelease.org"
-
-    FILE_INFO_PATTERN = r'<font color="red">%s/(?P<N>.+)</font> \((?P<S>[^)]+)\)</font>' % __pattern__
-
-
 getInfo = create_getInfo(MegareleaseOrg)
diff --git a/module/plugins/hoster/PotloadCom.py b/module/plugins/hoster/PotloadCom.py
index 087b7a265..a197a1370 100644
--- a/module/plugins/hoster/PotloadCom.py
+++ b/module/plugins/hoster/PotloadCom.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInfo
+from module.plugins.internal.DeadHoster import DeadHoster, create_getInfo
 
 
-class PotloadCom(XFileSharingPro):
+class PotloadCom(DeadHoster):
     __name__ = "PotloadCom"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
     __pattern__ = r'http://(?:www\.)?potload\.com/\w{12}'
 
@@ -14,9 +14,5 @@ class PotloadCom(XFileSharingPro):
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
-    HOSTER_NAME = "potload.com"
-
-    FILE_INFO_PATTERN = r'<h[1-6]>(?P<N>.+) \((?P<S>\d+) (?P<U>\w+)\)</h'
-
 
 getInfo = create_getInfo(PotloadCom)