summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-02 11:43:10 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-10-02 11:43:10 +0200
commit94d591fcde5330323a5575049164ca94dcb5daa3 (patch)
tree7da44930b0f55a6a5f72573eb5a1670b4123e680 /module/plugins/hoster
parentFix https://github.com/pyload/pyload/issues/1780 (diff)
downloadpyload-94d591fcde5330323a5575049164ca94dcb5daa3.tar.xz
Spare fixes
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r--module/plugins/hoster/LinksnappyCom.py2
-rw-r--r--module/plugins/hoster/OpenloadIo.py8
-rw-r--r--module/plugins/hoster/SoundcloudCom.py2
-rw-r--r--module/plugins/hoster/YadiSk.py2
4 files changed, 8 insertions, 6 deletions
diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py
index f92681f60..3301eda7c 100644
--- a/module/plugins/hoster/LinksnappyCom.py
+++ b/module/plugins/hoster/LinksnappyCom.py
@@ -46,7 +46,7 @@ class LinksnappyCom(MultiHoster):
@staticmethod
def _get_host(url):
host = urlparse.urlsplit(url).netloc
- return re.search(r'[\w-]+\.\w+$', host).group(0)
+ return re.search(r'[\w\-]+\.\w+$', host).group(0)
getInfo = create_getInfo(LinksnappyCom)
diff --git a/module/plugins/hoster/OpenloadIo.py b/module/plugins/hoster/OpenloadIo.py
index 6213a9c09..ee67be95b 100644
--- a/module/plugins/hoster/OpenloadIo.py
+++ b/module/plugins/hoster/OpenloadIo.py
@@ -10,10 +10,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
class OpenloadIo(SimpleHoster):
__name__ = "OpenloadIo"
__type__ = "hoster"
- __version__ = "0.07"
+ __version__ = "0.08"
__status__ = "testing"
- __pattern__ = r'https?://(?:www\.)?openload\.(?:co|io)/f/([\w-_]+)'
+ __pattern__ = r'https?://(?:www\.)?openload\.(?:co|io)/(?:f|embed)/([\w\-]+)'
__description__ = """Openload.co hoster plugin"""
__license__ = "GPLv3"
@@ -23,12 +23,14 @@ class OpenloadIo(SimpleHoster):
# The API reference, that this implementation uses is available at https://openload.co/api
API_URL = 'https://api.openload.co/1'
- _FILE_ID_PATTERN = '/f/([\w-_]+)'
+ _FILE_ID_PATTERN = '/(?:f|embed)/([\w\-]+)'
_DOWNLOAD_TICKET_URI_PATTERN = '/file/dlticket?file={0}'
_DOWNLOAD_FILE_URI_PATTERN = '/file/dl?file={0}&ticket={1}'
_FILE_INFO_URI_PATTERN = '/file/info?file={0}'
+ OFFLINE_PATTERN = r'>We are sorry'
+
@classmethod
def _load_json(cls, uri):
diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py
index b189ee1ba..a7a45d028 100644
--- a/module/plugins/hoster/SoundcloudCom.py
+++ b/module/plugins/hoster/SoundcloudCom.py
@@ -12,7 +12,7 @@ class SoundcloudCom(SimpleHoster):
__version__ = "0.12"
__status__ = "testing"
- __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+'
+ __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w\-]+/[\w\-]+'
__config__ = [("use_premium", "bool" , "Use premium account if available", True ),
("quality" , "Lower;Higher", "Quality" , "Higher")]
diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py
index 354ba1b4c..418f38926 100644
--- a/module/plugins/hoster/YadiSk.py
+++ b/module/plugins/hoster/YadiSk.py
@@ -13,7 +13,7 @@ class YadiSk(SimpleHoster):
__version__ = "0.06"
__status__ = "testing"
- __pattern__ = r'https?://yadi\.sk/d/[\w-]+'
+ __pattern__ = r'https?://yadi\.sk/d/[\w\-]+'
__description__ = """Yadi.sk hoster plugin"""
__license__ = "GPLv3"