Update plugins after XFSHoster changes

15 files changed, 11 insertions, 28 deletions

diff --git a/module/plugins/hoster/CramitIn.py b/module/plugins/hoster/CramitIn.py
index 4f1ad1ff1..f444718bc 100644
--- a/module/plugins/hoster/CramitIn.py
+++ b/module/plugins/hoster/CramitIn.py
@@ -18,6 +18,7 @@ class CramitIn(XFSHoster):
     HOSTER_DOMAIN = "cramit.in"
 
     INFO_PATTERN = r'<span class=t2>\s*(?P<N>.*?)</span>.*?<small>\s*\((?P<S>.*?)\)'
+
     LINK_PATTERN = r'href="(http://cramit\.in/file_download/.*?)"'
 
 
diff --git a/module/plugins/hoster/FileParadoxIn.py b/module/plugins/hoster/FileParadoxIn.py
index 7ed0e9b7a..0b5b57e22 100644
--- a/module/plugins/hoster/FileParadoxIn.py
+++ b/module/plugins/hoster/FileParadoxIn.py
@@ -19,7 +19,5 @@ class FileParadoxIn(XFSHoster):
 
     HOSTER_DOMAIN = "fileparadox.in"
 
-    SIZE_PATTERN = r'</font>\s*\(\s*(?P<S>[^)]+)\s*\)</font>'
-
 
 getInfo = create_getInfo(FileParadoxIn)
diff --git a/module/plugins/hoster/HundredEightyUploadCom.py b/module/plugins/hoster/HundredEightyUploadCom.py
index 48e0c3d8c..317a49caf 100644
--- a/module/plugins/hoster/HundredEightyUploadCom.py
+++ b/module/plugins/hoster/HundredEightyUploadCom.py
@@ -20,8 +20,5 @@ class HundredEightyUploadCom(XFSHoster):
 
     HOSTER_DOMAIN = "180upload.com"
 
-    NAME_PATTERN = r'Filename:</b></td><td nowrap>(?P<N>.+)</td></tr>-->'
-    SIZE_PATTERN = r'Size:</b></td><td>(?P<S>[\d.,]+) (?P<U>[\w^_]+)\s*<small>'
-
 
 getInfo = create_getInfo(HundredEightyUploadCom)
diff --git a/module/plugins/hoster/JunocloudMe.py b/module/plugins/hoster/JunocloudMe.py
index ffea77315..56d6588fa 100644
--- a/module/plugins/hoster/JunocloudMe.py
+++ b/module/plugins/hoster/JunocloudMe.py
@@ -19,9 +19,7 @@ class JunocloudMe(XFSHoster):
 
     URL_REPLACEMENTS = [(r'//(www\.)?junocloud', "//dl3.junocloud")]
 
-    SIZE_PATTERN = r'<p class="request_filesize">Size: (?P<S>[\d.,]+) (?P<U>[\w^_]+)</p>'
-
-    OFFLINE_PATTERN = r'>No such file with this filename<'
+    OFFLINE_PATTERN      = r'>No such file with this filename<'
     TEMP_OFFLINE_PATTERN = r'The page may have been renamed, removed or be temporarily unavailable.<'
 
 
diff --git a/module/plugins/hoster/LomafileCom.py b/module/plugins/hoster/LomafileCom.py
index a7ce39d37..0abc8487d 100644
--- a/module/plugins/hoster/LomafileCom.py
+++ b/module/plugins/hoster/LomafileCom.py
@@ -19,9 +19,8 @@ class LomafileCom(XFSHoster):
     HOSTER_DOMAIN = "lomafile.com"
 
     NAME_PATTERN = r'<a href="http://lomafile\.com/w{12}/(?P<N>.+?)">'
-    SIZE_PATTERN = r'Size:</b></td><td>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
-    OFFLINE_PATTERN = r'>(No such file|Software error:<)'
+    OFFLINE_PATTERN      = r'>(No such file|Software error:<)'
     TEMP_OFFLINE_PATTERN = r'The page may have been renamed, removed or be temporarily unavailable.<'
 
     CAPTCHA_PATTERN = r'(http://lomafile\.com/captchas/[^"\']+)'
diff --git a/module/plugins/hoster/MovReelCom.py b/module/plugins/hoster/MovReelCom.py
index cd1626f6f..9bb63701c 100644
--- a/module/plugins/hoster/MovReelCom.py
+++ b/module/plugins/hoster/MovReelCom.py
@@ -17,9 +17,6 @@ class MovReelCom(XFSHoster):
 
     HOSTER_DOMAIN = "movreel.com"
 
-    NAME_PATTERN = r'Filename: <b>(?P<N>.+?)<'
-    SIZE_PATTERN = r'Size: (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
-
     LINK_PATTERN = r'<a href="([^"]+)">Download Link'
 
 
diff --git a/module/plugins/hoster/NosuploadCom.py b/module/plugins/hoster/NosuploadCom.py
index b2255ca54..8a03d7090 100644
--- a/module/plugins/hoster/NosuploadCom.py
+++ b/module/plugins/hoster/NosuploadCom.py
@@ -21,6 +21,7 @@ class NosuploadCom(XFSHoster):
 
     SIZE_PATTERN = r'<p><strong>Size:</strong> (?P<S>[\d.,]+) (?P<U>[\w^_]+)</p>'
     LINK_PATTERN = r'<a class="select" href="(http://.+?)">Download</a>'
+
     WAIT_PATTERN = r'Please wait.*?>(\d+)</span>'
 
 
diff --git a/module/plugins/hoster/NovafileCom.py b/module/plugins/hoster/NovafileCom.py
index 5c4dfddca..9754ceed1 100644
--- a/module/plugins/hoster/NovafileCom.py
+++ b/module/plugins/hoster/NovafileCom.py
@@ -22,10 +22,10 @@ class NovafileCom(XFSHoster):
 
     HOSTER_DOMAIN = "novafile.com"
 
-    SIZE_PATTERN = r'<div class="size">(?P<S>.+?)</div>'
     ERROR_PATTERN = r'class="alert[^"]*alert-separate"[^>]*>\s*(?:<p>)?(.*?)\s*</'
+    WAIT_PATTERN  = r'<p>Please wait <span id="count"[^>]*>(\d+)</span> seconds</p>'
+
     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>'
 
 
 getInfo = create_getInfo(NovafileCom)
diff --git a/module/plugins/hoster/RapidfileshareNet.py b/module/plugins/hoster/RapidfileshareNet.py
index ae53411c3..14d62ee74 100644
--- a/module/plugins/hoster/RapidfileshareNet.py
+++ b/module/plugins/hoster/RapidfileshareNet.py
@@ -20,7 +20,7 @@ class RapidfileshareNet(XFSHoster):
     NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>.+?)">'
     SIZE_PATTERN = r'>http://www.rapidfileshare.net/\w+?</font> \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)</font>'
 
-    OFFLINE_PATTERN = r'>No such file with this filename'
+    OFFLINE_PATTERN      = r'>No such file with this filename'
     TEMP_OFFLINE_PATTERN = r'The page may have been renamed, removed or be temporarily unavailable.<'
 
 
diff --git a/module/plugins/hoster/RarefileNet.py b/module/plugins/hoster/RarefileNet.py
index 987028c8f..e847c7cf3 100644
--- a/module/plugins/hoster/RarefileNet.py
+++ b/module/plugins/hoster/RarefileNet.py
@@ -19,9 +19,6 @@ class RarefileNet(XFSHoster):
 
     HOSTER_DOMAIN = "rarefile.net"
 
-    NAME_PATTERN = r'<font color="red">(?P<N>.+?)<'
-    SIZE_PATTERN = r'>Size : (?P<S>[\d.,]+) (?P<U>[\w^_]+)'
-
     LINK_PATTERN = r'<a href="(?P<link>[^"]+)">(?P=link)</a>'
 
 
diff --git a/module/plugins/hoster/RyushareCom.py b/module/plugins/hoster/RyushareCom.py
index d2e4489a6..b01613abb 100644
--- a/module/plugins/hoster/RyushareCom.py
+++ b/module/plugins/hoster/RyushareCom.py
@@ -25,9 +25,8 @@ class RyushareCom(XFSHoster):
 
     HOSTER_DOMAIN = "ryushare.com"
 
-    SIZE_PATTERN = r'You have requested <font color="red">[^<]+</font> \((?P<S>[\d.,]+) (?P<U>[\w^_]+)'
-
     WAIT_PATTERN = r'You have to wait ((?P<hour>\d+) hour[s]?, )?((?P<min>\d+) minute[s], )?(?P<sec>\d+) second[s]'
+
     LINK_PATTERN = r'<a href="([^"]+)">Click here to download<'
 
 
diff --git a/module/plugins/hoster/SafesharingEu.py b/module/plugins/hoster/SafesharingEu.py
index f0936b9e8..bb6e0f646 100644
--- a/module/plugins/hoster/SafesharingEu.py
+++ b/module/plugins/hoster/SafesharingEu.py
@@ -17,8 +17,6 @@ class SafesharingEu(XFSHoster):
 
     HOSTER_DOMAIN = "safesharing.eu"
 
-    WAIT_PATTERN = r'You have to wait (\d+) minutes'
-
     ERROR_PATTERN = r'(?:<div class="alert alert-danger">)(.+?)(?:</div>)'
 
 
diff --git a/module/plugins/hoster/SendmywayCom.py b/module/plugins/hoster/SendmywayCom.py
index 4254922fc..637098b88 100644
--- a/module/plugins/hoster/SendmywayCom.py
+++ b/module/plugins/hoster/SendmywayCom.py
@@ -10,15 +10,12 @@ class SendmywayCom(XFSHoster):
 
     __pattern__ = r'http://(?:www\.)?sendmyway\.com/\w{12}'
 
-    __description__ = """SendMyWay hoster plugin"""
+    __description__ = """SendMyWay.com hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
     HOSTER_DOMAIN = "sendmyway.com"
 
-    NAME_PATTERN = r'<p class="file-name" ><.*?>\s*(?P<N>.+)'
-    SIZE_PATTERN = r'<small>\((?P<S>\d+) bytes\)</small>'
-
 
 getInfo = create_getInfo(SendmywayCom)
diff --git a/module/plugins/hoster/UpleaCom.py b/module/plugins/hoster/UpleaCom.py
index c9b32c196..7ae46ef38 100644
--- a/module/plugins/hoster/UpleaCom.py
+++ b/module/plugins/hoster/UpleaCom.py
@@ -27,6 +27,7 @@ class UpleaCom(XFSHoster):
     OFFLINE_PATTERN = r'>You followed an invalid or expired link'
 
     LINK_PATTERN = r'"(http?://\w+\.uplea\.com/anonym/.*?)"'
+
     WAIT_PATTERN = r'timeText:([\d.]+),'
     STEP_PATTERN = r'<a href="(/step/.+)">'
 
diff --git a/module/plugins/hoster/UptoboxCom.py b/module/plugins/hoster/UptoboxCom.py
index 3c3fa45b0..21d781f55 100644
--- a/module/plugins/hoster/UptoboxCom.py
+++ b/module/plugins/hoster/UptoboxCom.py
@@ -17,7 +17,7 @@ class UptoboxCom(XFSHoster):
 
     HOSTER_DOMAIN = "uptobox.com"
 
-    INFO_PATTERN = r'"para_title">(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)'
+    INFO_PATTERN    = r'"para_title">(?P<N>.+) \((?P<S>[\d.,]+) (?P<U>[\w^_]+)\)'
     OFFLINE_PATTERN = r'>(File not found|Access Denied|404 Not Found)'
 
     LINK_PATTERN = r'"(https?://\w+\.uptobox\.com/d/.*?)"'