summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-27 17:37:46 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-09-27 17:37:46 +0200
commit5e396bcb58a8688e46f663d3a1dfa4d62496bc93 (patch)
treeb52730699a57a94b043b98ba555e4e4faf235886 /module
parent[CatShareNet] Fix missing recaptcha (diff)
downloadpyload-5e396bcb58a8688e46f663d3a1dfa4d62496bc93.tar.xz
[FiredriveCom] Fix TEMP_OFFLINE_PATTERN
Diffstat (limited to 'module')
-rw-r--r--module/plugins/hoster/FiredriveCom.py4
-rw-r--r--module/plugins/hoster/XFileSharingPro.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/module/plugins/hoster/FiredriveCom.py b/module/plugins/hoster/FiredriveCom.py
index 47c6a4214..04bd37971 100644
--- a/module/plugins/hoster/FiredriveCom.py
+++ b/module/plugins/hoster/FiredriveCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
class FiredriveCom(SimpleHoster):
__name__ = "FiredriveCom"
__type__ = "hoster"
- __version__ = "0.03"
+ __version__ = "0.04"
__pattern__ = r'https?://(?:www\.)?(firedrive|putlocker)\.com/(mobile/)?(file|embed)/(?P<ID>\w+)'
@@ -19,7 +19,7 @@ class FiredriveCom(SimpleHoster):
FILE_NAME_PATTERN = r'<b>Name:</b> (?P<N>.+) <br>'
FILE_SIZE_PATTERN = r'<b>Size:</b> (?P<S>[\d.]+) (?P<U>[a-zA-Z]+) <br>'
OFFLINE_PATTERN = r'class="sad_face_image"|>No such page here.<'
- TEMP_OFFLINE_PATTERN = r'>(File Temporarily Unavailable|Server Error. Try again later)'
+ TEMP_OFFLINE_PATTERN = r'Please try again in a few minutes.<'
FILE_URL_REPLACEMENTS = [(__pattern__, r'http://www.firedrive.com/file/\g<ID>')]
diff --git a/module/plugins/hoster/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index e488b256d..18f6ff8bd 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -31,9 +31,11 @@ class XFileSharingPro(SimpleHoster):
FILE_URL_REPLACEMENTS = [(r'/embed-(\w{12}).*', r'/\1')] #: support embedded files
+
FILE_INFO_PATTERN = r'<tr><td align=right><b>Filename:</b></td><td nowrap>(?P<N>[^<]+)</td></tr>\s*.*?<small>\((?P<S>[^<]+)\)</small>'
FILE_NAME_PATTERN = r'<input type="hidden" name="fname" value="(?P<N>[^"]+)"'
FILE_SIZE_PATTERN = r'You have requested .*\((?P<S>[\d\.\,]+) ?(?P<U>\w+)?\)</font>'
+
OFFLINE_PATTERN = r'>\w+ (Not Found|file (was|has been) removed)'
WAIT_PATTERN = r'<span id="countdown_str">.*?>(\d+)</span>'