Fix HOSTER_NAME in XFileSharingPro plugins

Merges vuolter/pyload@f20b998

(cherry picked from commit 02e1638896c073f5d1c904a3e611d09298df79fa)

16 files changed, 27 insertions, 18 deletions

diff --git a/pyload/plugins/hoster/BillionuploadsCom.py b/pyload/plugins/hoster/BillionuploadsCom.py
index 21ea6a069..2a02921c1 100644
--- a/pyload/plugins/hoster/BillionuploadsCom.py
+++ b/pyload/plugins/hoster/BillionuploadsCom.py
@@ -11,9 +11,10 @@ class BillionuploadsCom(XFileSharingPro):
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+    HOSTER_NAME = "billionuploads.com"
+
     FILE_NAME_PATTERN = r'<b>Filename:</b>(?P<N>.*?)<br>'
     FILE_SIZE_PATTERN = r'<b>Size:</b>(?P<S>.*?)<br>'
-    HOSTER_NAME = "billionuploads.com"
 
 
 getInfo = create_getInfo(BillionuploadsCom)
diff --git a/pyload/plugins/hoster/CramitIn.py b/pyload/plugins/hoster/CramitIn.py
index a810dc69f..7891a480e 100644
--- a/pyload/plugins/hoster/CramitIn.py
+++ b/pyload/plugins/hoster/CramitIn.py
@@ -11,9 +11,10 @@ class CramitIn(XFileSharingPro):
     __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>.*?)\)'
     DIRECT_LINK_PATTERN = r'href="(http://cramit.in/file_download/.*?)"'
-    HOSTER_NAME = "cramit.in"
 
     def setup(self):
         self.resumeDownload = self.multiDL = self.premium
diff --git a/pyload/plugins/hoster/DdlstorageCom.py b/pyload/plugins/hoster/DdlstorageCom.py
index d62b725e7..7fb0168c9 100644
--- a/pyload/plugins/hoster/DdlstorageCom.py
+++ b/pyload/plugins/hoster/DdlstorageCom.py
@@ -44,9 +44,10 @@ class DdlstorageCom(XFileSharingPro):
     __author_name__ = ("zoidberg", "stickell")
     __author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
 
-    FILE_INFO_PATTERN = r'<p class="sub_title"[^>]*>(?P<N>.+) \((?P<S>[^)]+)\)</p>'
     HOSTER_NAME = "ddlstorage.com"
 
+    FILE_INFO_PATTERN = r'<p class="sub_title"[^>]*>(?P<N>.+) \((?P<S>[^)]+)\)</p>'
+
     def prepare(self):
         self.getAPIData()
         super(DdlstorageCom, self).prepare()
diff --git a/pyload/plugins/hoster/EasybytezCom.py b/pyload/plugins/hoster/EasybytezCom.py
index 8cc0b6e9f..685831482 100644
--- a/pyload/plugins/hoster/EasybytezCom.py
+++ b/pyload/plugins/hoster/EasybytezCom.py
@@ -28,6 +28,8 @@ class EasybytezCom(XFileSharingPro):
     __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>'
     FILE_OFFLINE_PATTERN = r'<h1>File not available</h1>'
 
@@ -36,8 +38,6 @@ class EasybytezCom(XFileSharingPro):
     OVR_KILL_LINK_PATTERN = r'<h2>Delete Link</h2>\s*<textarea[^>]*>([^<]+)'
     ERROR_PATTERN = r'(?:class=["\']err["\'][^>]*>|<Center><b>)(.*?)</'
 
-    HOSTER_NAME = "easybytez.com"
-
     def setup(self):
         self.resumeDownload = self.multiDL = self.premium
 
diff --git a/pyload/plugins/hoster/FilerioCom.py b/pyload/plugins/hoster/FilerioCom.py
index bfed700ad..da2970cea 100644
--- a/pyload/plugins/hoster/FilerioCom.py
+++ b/pyload/plugins/hoster/FilerioCom.py
@@ -11,8 +11,9 @@ class FilerioCom(XFileSharingPro):
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
-    FILE_OFFLINE_PATTERN = '<b>&quot;File Not Found&quot;</b>|File has been removed due to Copyright Claim'
     HOSTER_NAME = "filerio.in"
+
+    FILE_OFFLINE_PATTERN = '<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):
diff --git a/pyload/plugins/hoster/FileshareInUa.py b/pyload/plugins/hoster/FileshareInUa.py
index 14b703571..bd320e008 100644
--- a/pyload/plugins/hoster/FileshareInUa.py
+++ b/pyload/plugins/hoster/FileshareInUa.py
@@ -13,7 +13,6 @@ class FileshareInUa(Hoster):
     __author_name__ = "fwannmacher"
     __author_mail__ = "felipe@warhammerproject.com"
 
-    HOSTER_NAME = "fileshare.in.ua"
     PATTERN_FILENAME = r'<h3 class="b-filename">(.*?)</h3>'
     PATTERN_FILESIZE = r'<b class="b-filesize">(.*?)</b>'
     PATTERN_OFFLINE = "This file doesn't exist, or has been removed."
diff --git a/pyload/plugins/hoster/GamefrontCom.py b/pyload/plugins/hoster/GamefrontCom.py
index 54d7e2a51..a58a29c45 100644
--- a/pyload/plugins/hoster/GamefrontCom.py
+++ b/pyload/plugins/hoster/GamefrontCom.py
@@ -13,7 +13,6 @@ class GamefrontCom(Hoster):
     __author_name__ = "fwannmacher"
     __author_mail__ = "felipe@warhammerproject.com"
 
-    HOSTER_NAME = "gamefront.com"
     PATTERN_FILENAME = r'<title>(.*?) | Game Front'
     PATTERN_FILESIZE = r'<dt>File Size:</dt>[\n\s]*<dd>(.*?)</dd>'
     PATTERN_OFFLINE = "This file doesn't exist, or has been removed."
diff --git a/pyload/plugins/hoster/HundredEightyUploadCom.py b/pyload/plugins/hoster/HundredEightyUploadCom.py
index 9b4fb96f7..bac95b770 100644
--- a/pyload/plugins/hoster/HundredEightyUploadCom.py
+++ b/pyload/plugins/hoster/HundredEightyUploadCom.py
@@ -30,10 +30,10 @@ class HundredEightyUploadCom(XFileSharingPro):
     __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>-->'
     FILE_SIZE_PATTERN = r'Size:</b></td><td>(?P<S>[\d.]+) (?P<U>[A-Z]+)\s*<small>'
 
-    HOSTER_NAME = "180upload.com"
-
 
 getInfo = create_getInfo(HundredEightyUploadCom)
diff --git a/pyload/plugins/hoster/IFileWs.py b/pyload/plugins/hoster/IFileWs.py
index 3aa369aec..1b94239aa 100644
--- a/pyload/plugins/hoster/IFileWs.py
+++ b/pyload/plugins/hoster/IFileWs.py
@@ -11,9 +11,10 @@ class IFileWs(XFileSharingPro):
     __author_name__ = "z00nx"
     __author_mail__ = "z00nx0@gmail.com"
 
+    HOSTER_NAME = "ifile.ws"
+
     FILE_INFO_PATTERN = '<h1\s+style="display:inline;">(?P<N>[^<]+)</h1>\s+\[(?P<S>[^]]+)\]'
     FILE_OFFLINE_PATTERN = 'File Not Found|The file was removed by administrator'
-    HOSTER_NAME = "ifile.ws"
     LONG_WAIT_PATTERN = "(?P<M>\d(?=\s+minutes)).*(?P<S>\d+(?=\s+seconds))"
 
 
diff --git a/pyload/plugins/hoster/MegareleaseOrg.py b/pyload/plugins/hoster/MegareleaseOrg.py
index 651e3eab7..9a6d95237 100644
--- a/pyload/plugins/hoster/MegareleaseOrg.py
+++ b/pyload/plugins/hoster/MegareleaseOrg.py
@@ -27,8 +27,8 @@ class MegareleaseOrg(XFileSharingPro):
     __author_name__ = ("derek3x", "stickell")
     __author_mail__ = ("derek3x@vmail.me", "l.stickell@yahoo.it")
 
-    FILE_INFO_PATTERN = r'<font color="red">%s/(?P<N>.+)</font> \((?P<S>[^)]+)\)</font>' % __pattern__
-
     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/pyload/plugins/hoster/MovReelCom.py b/pyload/plugins/hoster/MovReelCom.py
index b2393c60b..b7d879361 100644
--- a/pyload/plugins/hoster/MovReelCom.py
+++ b/pyload/plugins/hoster/MovReelCom.py
@@ -12,12 +12,14 @@ class MovReelCom(XFileSharingPro):
     __author_name__ = "JorisV83"
     __author_mail__ = "jorisv83-pyload@yahoo.com"
 
+    HOSTER_NAME = "movreel.com"
+
     #FILE_NAME_PATTERN = r'<b>Filename:</b>(?P<N>.*?)<br>'
     #FILE_SIZE_PATTERN = r'<b>Size:</b>(?P<S>.*?)<br>'
     FILE_INFO_PATTERN = r'<h3>(?P<N>.+?) <small><sup>(?P<S>[\d.]+) (?P<U>..)</sup> </small></h3>'
     FILE_OFFLINE_PATTERN = r'<b>File Not Found</b><br><br>'
     DIRECT_LINK_PATTERN = r'<a href="(http://[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*/.*)">Download Link</a>'
     #OVR_DOWNLOAD_LINK_PATTERN = "var file_link = '(.*)';"
-    HOSTER_NAME = "movreel.com"
+
 
 getInfo = create_getInfo(MovReelCom)
diff --git a/pyload/plugins/hoster/NovafileCom.py b/pyload/plugins/hoster/NovafileCom.py
index eb81e44bb..d4e37025e 100644
--- a/pyload/plugins/hoster/NovafileCom.py
+++ b/pyload/plugins/hoster/NovafileCom.py
@@ -16,13 +16,13 @@ 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>'
     ERROR_PATTERN = r'class="alert[^"]*alert-separate"[^>]*>\s*(?:<p>)?(.*?)\s*</'
     DIRECT_LINK_PATTERN = r'<a href="(http://s\d+\.novafile\.com/.*?)" class="btn btn-green">Download File</a>'
     WAIT_PATTERN = r'<p>Please wait <span id="count"[^>]*>(\d+)</span> seconds</p>'
 
-    HOSTER_NAME = "novafile.com"
-
     def setup(self):
         self.multiDL = False
 
diff --git a/pyload/plugins/hoster/RarefileNet.py b/pyload/plugins/hoster/RarefileNet.py
index aff92f799..3c887e66c 100644
--- a/pyload/plugins/hoster/RarefileNet.py
+++ b/pyload/plugins/hoster/RarefileNet.py
@@ -15,10 +15,11 @@ class RarefileNet(XFileSharingPro):
     __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;'
     DIRECT_LINK_PATTERN = r'<a href="(?P<link>[^"]+)">(?P=link)</a>'
-    HOSTER_NAME = "rarefile.net"
 
     def setup(self):
         self.resumeDownload = self.multiDL = self.premium
diff --git a/pyload/plugins/hoster/SecureUploadEu.py b/pyload/plugins/hoster/SecureUploadEu.py
index c4386af16..46ccb3b29 100644
--- a/pyload/plugins/hoster/SecureUploadEu.py
+++ b/pyload/plugins/hoster/SecureUploadEu.py
@@ -12,6 +12,7 @@ class SecureUploadEu(XFileSharingPro):
     __author_mail__ = "z00nx0@gmail.com"
 
     HOSTER_NAME = "secureupload.eu"
+
     FILE_INFO_PATTERN = '<h3>Downloading (?P<N>[^<]+) \((?P<S>[^<]+)\)</h3>'
     FILE_OFFLINE_PATTERN = 'The file was removed|File Not Found'
 
diff --git a/pyload/plugins/hoster/SendmywayCom.py b/pyload/plugins/hoster/SendmywayCom.py
index 595a6860c..4b0bac1c0 100644
--- a/pyload/plugins/hoster/SendmywayCom.py
+++ b/pyload/plugins/hoster/SendmywayCom.py
@@ -11,9 +11,10 @@ class SendmywayCom(XFileSharingPro):
     __author_name__ = "zoidberg"
     __author_mail__ = "zoidberg@mujmail.cz"
 
+    HOSTER_NAME = "sendmyway.com"
+
     FILE_NAME_PATTERN = r'<p class="file-name" ><.*?>\s*(?P<N>.+)'
     FILE_SIZE_PATTERN = r'<small>\((?P<S>\d+) bytes\)</small>'
-    HOSTER_NAME = "sendmyway.com"
 
 
 getInfo = create_getInfo(SendmywayCom)
diff --git a/pyload/plugins/hoster/StreamcloudEu.py b/pyload/plugins/hoster/StreamcloudEu.py
index a61588508..cb0222fcb 100644
--- a/pyload/plugins/hoster/StreamcloudEu.py
+++ b/pyload/plugins/hoster/StreamcloudEu.py
@@ -16,6 +16,7 @@ class StreamcloudEu(XFileSharingPro):
     __author_mail__ = "seoester@googlemail.com"
 
     HOSTER_NAME = "streamcloud.eu"
+
     DIRECT_LINK_PATTERN = r'file: "(http://(stor|cdn)\d+\.streamcloud.eu:?\d*/.*/video\.(mp4|flv))",'
 
     def setup(self):