Cleaned-up XFileSharingPro based plugins

18 files changed, 39 insertions, 39 deletions

diff --git a/module/plugins/hoster/BillionuploadsCom.py b/module/plugins/hoster/BillionuploadsCom.py
index c55b9073c..c070e18b9 100644
--- a/module/plugins/hoster/BillionuploadsCom.py
+++ b/module/plugins/hoster/BillionuploadsCom.py
@@ -8,12 +8,13 @@ class BillionuploadsCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?billionuploads.com/\w{12}'
+    __pattern__ = r'http://(?:www\.)?billionuploads\.com/\w{12}'
 
     __description__ = """Billionuploads.com hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+
     HOSTER_NAME = "billionuploads.com"
 
     FILE_NAME_PATTERN = r'<b>Filename:</b>(?P<N>.*?)<br>'
diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py
index 6a872ab34..f8c6e8016 100644
--- a/module/plugins/hoster/CramitIn.py
+++ b/module/plugins/hoster/CramitIn.py
@@ -8,20 +8,17 @@ class CramitIn(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.04"
 
-    __pattern__ = r'http://(?:www\.)?cramit.in/\w{12}'
+    __pattern__ = r'http://(?:www\.)?cramit\.in/\w{12}'
 
     __description__ = """Cramit.in hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+
     HOSTER_NAME = "cramit.in"
 
     FILE_INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)'
     LINK_PATTERN = r'href="(http://cramit.in/file_download/.*?)"'
 
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = self.premium
-
-
 getInfo = create_getInfo(CramitIn)
diff --git a/module/plugins/hoster/EasybytezCom.py b/module/plugins/hoster/EasybytezCom.py
index f9dfe6a13..ed9230263 100644
--- a/module/plugins/hoster/EasybytezCom.py
+++ b/module/plugins/hoster/EasybytezCom.py
@@ -8,12 +8,13 @@ class EasybytezCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.18"
 
-    __pattern__ = r'http://(?:www\.)?easybytez.com/(\w+).*'
+    __pattern__ = r'http://(?:www\.)?easybytez\.com/\w{12}'
 
     __description__ = """Easybytez.com hoster plugin"""
     __author_name__ = ("zoidberg", "stickell")
     __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
+
     HOSTER_NAME = "easybytez.com"
 
     FILE_INFO_PATTERN = r'<span class="name">(?P<N>.+)</span><br>\s*<span class="size">(?P<S>[^<]+)</span>'
@@ -24,8 +25,4 @@ class EasybytezCom(XFileSharingPro):
     ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<Center><b>)(.*?)</'
 
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = self.premium
-
-
 getInfo = create_getInfo(EasybytezCom)
diff --git a/module/plugins/hoster/File4safeCom.py b/module/plugins/hoster/File4safeCom.py
index 7ec775103..f1785011d 100644
--- a/module/plugins/hoster/File4safeCom.py
+++ b/module/plugins/hoster/File4safeCom.py
@@ -12,12 +12,13 @@ class File4safeCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.02"
 
-    __pattern__ = r'https?://(?:www\.)?file4safe\.com/\w+'
+    __pattern__ = r'https?://(?:www\.)?file4safe\.com/\w{12}'
 
     __description__ = """File4safe.com hoster plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
+
     HOSTER_NAME = "file4safe.com"
 
 
diff --git a/module/plugins/hoster/FileParadoxIn.py b/module/plugins/hoster/FileParadoxIn.py
index d6395b130..4dd5fb6be 100644
--- a/module/plugins/hoster/FileParadoxIn.py
+++ b/module/plugins/hoster/FileParadoxIn.py
@@ -10,12 +10,13 @@ class FileParadoxIn(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.01"
 
-    __pattern__ = r'https?://(?:www\.)?fileparadox\.in/\w+'
+    __pattern__ = r'https?://(?:www\.)?fileparadox\.in/\w{12}'
 
     __description__ = """FileParadox.in hoster plugin"""
     __author_name__ = "RazorWing"
     __author_mail__ = "muppetuk1@hotmail.com"
 
+
     HOSTER_NAME = "fileparadox.in"
 
     FILE_SIZE_PATTERN = r'</font>\s*\(\s*(?P<S>[^)]+)\s*\)</font>'
diff --git a/module/plugins/hoster/FileomCom.py b/module/plugins/hoster/FileomCom.py
index c49344a69..71931eb97 100644
--- a/module/plugins/hoster/FileomCom.py
+++ b/module/plugins/hoster/FileomCom.py
@@ -11,7 +11,7 @@ class FileomCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.01"
 
-    __pattern__ = r'https?://(?:www\.)?fileom\.com/\w+'
+    __pattern__ = r'https?://(?:www\.)?fileom\.com/\w{12}'
 
     __description__ = """Fileom.com hoster plugin"""
     __author_name__ = "Walter Purcaro"
@@ -31,9 +31,9 @@ class FileomCom(XFileSharingPro):
 
 
     def setup(self):
-        self.resumeDownload = self.premium
         self.multiDL = True
         self.chunkLimit = 1
+        self.resumeDownload = self.premium
 
 
 getInfo = create_getInfo(FileomCom)
diff --git a/module/plugins/hoster/FilerioCom.py b/module/plugins/hoster/FilerioCom.py
index 5cac34b04..a62f77f25 100644
--- a/module/plugins/hoster/FilerioCom.py
+++ b/module/plugins/hoster/FilerioCom.py
@@ -14,14 +14,11 @@ class FilerioCom(XFileSharingPro):
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+
     HOSTER_NAME = "filerio.in"
 
     OFFLINE_PATTERN = r'<b>&quot;File Not Found&quot;</b>|File has been removed due to Copyright Claim'
     FILE_URL_REPLACEMENTS = [(r'http://.*?/', 'http://filerio.in/')]
 
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = self.premium
-
-
 getInfo = create_getInfo(FilerioCom)
diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py
index e2e34ad00..fd14e8194 100644
--- a/module/plugins/hoster/HundredEightyUploadCom.py
+++ b/module/plugins/hoster/HundredEightyUploadCom.py
@@ -11,12 +11,13 @@ class HundredEightyUploadCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?180upload\.com/(\w+).*'
+    __pattern__ = r'http://(?:www\.)?180upload\.com/\w{12}'
 
     __description__ = """180upload.com hoster plugin"""
     __author_name__ = "stickell"
     __author_mail__ = "l.stickell@yahoo.it"
 
+
     HOSTER_NAME = "180upload.com"
 
     FILE_NAME_PATTERN = r'Filename:</b></td><td nowrap>(?P<N>.+)</td></tr>-->'
diff --git a/module/plugins/hoster/LemUploadsCom.py b/module/plugins/hoster/LemUploadsCom.py
index b8a6062cb..1b0c40b96 100644
--- a/module/plugins/hoster/LemUploadsCom.py
+++ b/module/plugins/hoster/LemUploadsCom.py
@@ -11,12 +11,13 @@ class LemUploadsCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.01"
 
-    __pattern__ = r'https?://(?:www\.)?lemuploads.com/\w{12}'
+    __pattern__ = r'https?://(?:www\.)?lemuploads\.com/\w{12}'
 
     __description__ = """LemUploads.com hoster plugin"""
     __author_name__ = "t4skforce"
     __author_mail__ = "t4skforce1337[AT]gmail[DOT]com"
 
+
     HOSTER_NAME = "lemuploads.com"
 
     OFFLINE_PATTERN = r'<b>File Not Found</b><br><br>'
diff --git a/module/plugins/hoster/MegareleaseOrg.py b/module/plugins/hoster/MegareleaseOrg.py
index 05b05c3b5..a9b309fc7 100644
--- a/module/plugins/hoster/MegareleaseOrg.py
+++ b/module/plugins/hoster/MegareleaseOrg.py
@@ -8,12 +8,13 @@ class MegareleaseOrg(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.01"
 
-    __pattern__ = r'https?://(?:www\.)?megarelease.org/\w{12}'
+    __pattern__ = r'https?://(?:www\.)?megarelease\.org/\w{12}'
 
     __description__ = """Megarelease.org hoster plugin"""
     __author_name__ = ("derek3x", "stickell")
     __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__
diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py
index 6b13422b0..eef4e2580 100644
--- a/module/plugins/hoster/MovReelCom.py
+++ b/module/plugins/hoster/MovReelCom.py
@@ -8,12 +8,13 @@ class MovReelCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "1.20"
 
-    __pattern__ = r'http://(?:www\.)?movreel.com/.*'
+    __pattern__ = r'http://(?:www\.)?movreel\.com/\w{12}'
 
     __description__ = """MovReel.com hoster plugin"""
     __author_name__ = "JorisV83"
     __author_mail__ = "jorisv83-pyload@yahoo.com"
 
+
     HOSTER_NAME = "movreel.com"
 
     FILE_INFO_PATTERN = r'<h3>(?P<N>.+?) <small><sup>(?P<S>[\d.]+) (?P<U>..)</sup> </small></h3>'
diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py
index 4a89064ea..116312c5c 100644
--- a/module/plugins/hoster/NovafileCom.py
+++ b/module/plugins/hoster/NovafileCom.py
@@ -18,6 +18,7 @@ class NovafileCom(XFileSharingPro):
     __author_name__ = ("zoidberg", "stickell")
     __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
+
     HOSTER_NAME = "novafile.com"
 
     FILE_SIZE_PATTERN = r'<div class="size">(?P<S>.+?)</div>'
@@ -26,8 +27,4 @@ class NovafileCom(XFileSharingPro):
     WAIT_PATTERN = r'<p>Please wait <span id="count"[^>]*>(\d+)</span> seconds</p>'
 
 
-    def setup(self):
-        self.multiDL = False
-
-
 getInfo = create_getInfo(NovafileCom)
diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py
index 51df5c882..9148ee24e 100644
--- a/module/plugins/hoster/RarefileNet.py
+++ b/module/plugins/hoster/RarefileNet.py
@@ -11,21 +11,20 @@ class RarefileNet(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.03"
 
-    __pattern__ = r'http://(?:www\.)?rarefile.net/\w{12}'
+    __pattern__ = r'http://(?:www\.)?rarefile\.net/\w{12}'
 
     __description__ = """Rarefile.net hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+
     HOSTER_NAME = "rarefile.net"
 
     FILE_NAME_PATTERN = r'<td><font color="red">(?P<N>.*?)</font></td>'
     FILE_SIZE_PATTERN = r'<td>Size : (?P<S>.+?)&nbsp;'
-    LINK_PATTERN = r'<a href="(?P<link>[^"]+)">(?P=link)</a>'
 
+    LINK_PATTERN = r'<a href="(?P<link>[^"]+)">(?P=link)</a>'
 
-    def setup(self):
-        self.resumeDownload = self.multiDL = self.premium
 
     def handleCaptcha(self, inputs):
         captcha_div = re.search(r'<b>Enter code.*?<div.*?>(.*?)</div>', self.html, re.S).group(1)
diff --git a/module/plugins/hoster/SecureUploadEu.py b/module/plugins/hoster/SecureUploadEu.py
index 3691be7da..187480973 100644
--- a/module/plugins/hoster/SecureUploadEu.py
+++ b/module/plugins/hoster/SecureUploadEu.py
@@ -6,14 +6,15 @@ from module.plugins.hoster.XFileSharingPro import XFileSharingPro, create_getInf
 class SecureUploadEu(XFileSharingPro):
     __name__ = "SecureUploadEu"
     __type__ = "hoster"
-    __version__ = "0.01"
+    __version__ = "0.02"
 
-    __pattern__ = r'http://(?:www\.)?secureupload\.eu/(\w){12}(/\w+)'
+    __pattern__ = r'https?://(?:www\.)?secureupload\.eu/\w{12}'
 
     __description__ = """SecureUpload.eu hoster plugin"""
     __author_name__ = "z00nx"
     __author_mail__ = "z00nx0@gmail.com"
 
+
     HOSTER_NAME = "secureupload.eu"
 
     FILE_INFO_PATTERN = r'<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>'
diff --git a/module/plugins/hoster/SendmywayCom.py b/module/plugins/hoster/SendmywayCom.py
index f5e9e9ca6..1c6ab2eba 100644
--- a/module/plugins/hoster/SendmywayCom.py
+++ b/module/plugins/hoster/SendmywayCom.py
@@ -8,12 +8,13 @@ class SendmywayCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.01"
 
-    __pattern__ = r'http://(?:www\.)?sendmyway.com/\w{12}'
+    __pattern__ = r'http://(?:www\.)?sendmyway\.com/\w{12}'
 
     __description__ = """SendMyWay hoster plugin"""
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+
     HOSTER_NAME = "sendmyway.com"
 
     FILE_NAME_PATTERN = r'<p class="file-name" ><.*?>\s*(?P<N>.+)'
diff --git a/module/plugins/hoster/StreamcloudEu.py b/module/plugins/hoster/StreamcloudEu.py
index 11333640e..98ca0a19d 100644
--- a/module/plugins/hoster/StreamcloudEu.py
+++ b/module/plugins/hoster/StreamcloudEu.py
@@ -13,20 +13,23 @@ class StreamcloudEu(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.04"
 
-    __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\S+'
+    __pattern__ = r'http://(?:www\.)?streamcloud\.eu/\w{12}'
 
     __description__ = """Streamcloud.eu hoster plugin"""
     __author_name__ = "seoester"
     __author_mail__ = "seoester@googlemail.com"
 
+
     HOSTER_NAME = "streamcloud.eu"
 
     LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.(mp4|flv))",'
 
 
     def setup(self):
-        super(StreamcloudEu, self).setup()
         self.multiDL = True
+        self.chunkLimit = 1
+        self.resumeDownload = self.premium
+
 
     def getDownloadLink(self):
         m = re.search(self.LINK_PATTERN, self.html, re.S)
@@ -58,6 +61,7 @@ class StreamcloudEu(XFileSharingPro):
 
         return m.group(1)
 
+
     def getPostParameters(self):
         for i in xrange(3):
             if not self.errmsg:
diff --git a/module/plugins/hoster/TusfilesNet.py b/module/plugins/hoster/TusfilesNet.py
index 4e36164d2..048f38a6f 100644
--- a/module/plugins/hoster/TusfilesNet.py
+++ b/module/plugins/hoster/TusfilesNet.py
@@ -8,9 +8,9 @@ class TusfilesNet(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.04"
 
-    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/(?P<ID>\w+)'
+    __pattern__ = r'https?://(?:www\.)?tusfiles\.net/\w{12}'
 
-    __description__ = """ Tusfiles.net hoster plugin """
+    __description__ = """Tusfiles.net hoster plugin"""
     __author_name__ = ("Walter Purcaro", "guidobelix")
     __author_mail__ = ("vuolter@gmail.com", "guidobelix@hotmail.it")
 
diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py
index e9a38c6a8..dec0ef4d9 100644
--- a/module/plugins/hoster/UptoboxCom.py
+++ b/module/plugins/hoster/UptoboxCom.py
@@ -10,7 +10,7 @@ class UptoboxCom(XFileSharingPro):
     __type__ = "hoster"
     __version__ = "0.10"
 
-    __pattern__ = r'https?://(?:www\.)?uptobox\.com/\w+'
+    __pattern__ = r'https?://(?:www\.)?uptobox\.com/\w{12}'
 
     __description__ = """Uptobox.com hoster plugin"""
     __author_name__ = "Walter Purcaro"