summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r--module/plugins/hoster/FastixRu.py12
-rw-r--r--module/plugins/hoster/FileserveCom.py8
-rw-r--r--module/plugins/hoster/FourSharedCom.py2
-rw-r--r--module/plugins/hoster/Keep2ShareCc.py2
-rw-r--r--module/plugins/hoster/LinksnappyCom.py2
-rw-r--r--module/plugins/hoster/NitroflareCom.py2
-rw-r--r--module/plugins/hoster/OpenloadIo.py15
-rw-r--r--module/plugins/hoster/SoundcloudCom.py2
-rw-r--r--module/plugins/hoster/XFileSharingPro.py4
-rw-r--r--module/plugins/hoster/YadiSk.py2
10 files changed, 22 insertions, 29 deletions
diff --git a/module/plugins/hoster/FastixRu.py b/module/plugins/hoster/FastixRu.py
index d932bb22e..83d91e8c3 100644
--- a/module/plugins/hoster/FastixRu.py
+++ b/module/plugins/hoster/FastixRu.py
@@ -10,7 +10,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo
class FastixRu(MultiHoster):
__name__ = "FastixRu"
__type__ = "hoster"
- __version__ = "0.15"
+ __version__ = "0.16"
__status__ = "testing"
__pattern__ = r'http://(?:www\.)?fastix\.(ru|it)/file/\w{24}'
@@ -27,11 +27,11 @@ class FastixRu(MultiHoster):
def handle_premium(self, pyfile):
- self.html = json_loads(self.load("http://fastix.ru/api_v2/",
- get={'apikey': self.account.get_data('apikey'),
- 'sub' : "getdirectlink",
- 'link' : pyfile.url})
- data = self.html)
+ self.html = self.load("http://fastix.ru/api_v2/",
+ get={'apikey': self.account.get_data('apikey'),
+ 'sub' : "getdirectlink",
+ 'link' : pyfile.url})
+ data = json_loads(self.html)
self.log_debug("Json data", data)
diff --git a/module/plugins/hoster/FileserveCom.py b/module/plugins/hoster/FileserveCom.py
index fb1b7c631..9ccc5df86 100644
--- a/module/plugins/hoster/FileserveCom.py
+++ b/module/plugins/hoster/FileserveCom.py
@@ -190,16 +190,16 @@ class FileserveCom(Hoster):
res = json_loads(res)
if res['error_code'] == "302":
premium_url = res['next']
-
+
elif res['error_code'] in ["305", "500"]:
self.temp_offline()
-
+
elif res['error_code'] in ["403", "605"]:
self.restart(premium=False)
-
+
elif res['error_code'] in ["606", "607", "608"]:
self.offline()
-
+
else:
self.log_error(res['error_code'], res['error_message'])
diff --git a/module/plugins/hoster/FourSharedCom.py b/module/plugins/hoster/FourSharedCom.py
index d767f4ca1..5b4efab00 100644
--- a/module/plugins/hoster/FourSharedCom.py
+++ b/module/plugins/hoster/FourSharedCom.py
@@ -11,7 +11,7 @@ class FourSharedCom(SimpleHoster):
__version__ = "0.32"
__status__ = "testing"
- __pattern__ = r'https?://(?:www\.)?4shared(\-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+'
+ __pattern__ = r'https?://(?:www\.)?4shared(-china)?\.com/(account/)?(download|get|file|document|photo|video|audio|mp3|office|rar|zip|archive|music)/.+'
__config__ = [("use_premium", "bool", "Use premium account if available", True)]
__description__ = """4Shared.com hoster plugin"""
diff --git a/module/plugins/hoster/Keep2ShareCc.py b/module/plugins/hoster/Keep2ShareCc.py
index 427dbbec7..d4a17610d 100644
--- a/module/plugins/hoster/Keep2ShareCc.py
+++ b/module/plugins/hoster/Keep2ShareCc.py
@@ -94,7 +94,7 @@ class Keep2ShareCc(SimpleHoster):
'uniqueId' : self.fid,
'yt0' : ''}
- m = re.search(r'id="(captcha\-form)"', self.html)
+ m = re.search(r'id="(captcha-form)"', self.html)
self.log_debug("Captcha form found", m)
m = re.search(self.CAPTCHA_PATTERN, self.html)
diff --git a/module/plugins/hoster/LinksnappyCom.py b/module/plugins/hoster/LinksnappyCom.py
index 3301eda7c..f92681f60 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/NitroflareCom.py b/module/plugins/hoster/NitroflareCom.py
index ad0573960..431698596 100644
--- a/module/plugins/hoster/NitroflareCom.py
+++ b/module/plugins/hoster/NitroflareCom.py
@@ -24,7 +24,7 @@ class NitroflareCom(SimpleHoster):
INFO_PATTERN = r'title="(?P<N>.+?)".+>(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
OFFLINE_PATTERN = r'>File doesn\'t exist'
- LINK_PREMIUM_PATTERN = LINK_FREE_PATTERN = r'(https?://[\w\-]+\.nitroflare\.com/.+?)"'
+ LINK_PREMIUM_PATTERN = LINK_FREE_PATTERN = r'(https?://[\w-]+\.nitroflare\.com/.+?)"'
RECAPTCHA_KEY = "6Lenx_USAAAAAF5L1pmTWvWcH73dipAEzNnmNLgy"
PREMIUM_ONLY_PATTERN = r'This file is available with Premium only'
diff --git a/module/plugins/hoster/OpenloadIo.py b/module/plugins/hoster/OpenloadIo.py
index ee67be95b..842879203 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.08"
+ __version__ = "0.09"
__status__ = "testing"
- __pattern__ = r'https?://(?:www\.)?openload\.(?:co|io)/(?:f|embed)/([\w\-]+)'
+ __pattern__ = r'https?://(?:www\.)?openload\.(co|io)/(f|embed)/(?P<ID>[\w-]+)'
__description__ = """Openload.co hoster plugin"""
__license__ = "GPLv3"
@@ -23,8 +23,6 @@ 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|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}'
@@ -39,11 +37,7 @@ class OpenloadIo(SimpleHoster):
@classmethod
def get_info(cls, url="", html=""):
- file_id = re.findall(cls._FILE_ID_PATTERN, url, re.I)
- if not file_id:
- return super(OpenloadIo, cls).get_info(url)
-
- file_id = file_id[0]
+ file_id = self.info['pattern']['ID']
info_json = cls._load_json(cls._FILE_INFO_URI_PATTERN.format(file_id))
file_info = info_json['result'][file_id]
@@ -61,8 +55,7 @@ class OpenloadIo(SimpleHoster):
def handle_free(self, pyfile):
# If the link is being handled here, then it matches the file_id_pattern,
# therefore, we can call [0] safely.
- file_id = re.findall(self._FILE_ID_PATTERN, pyfile.url, re.I)[0]
-
+ file_id = self.info['pattern']['ID']
ticket_json = self._load_json(self._DOWNLOAD_TICKET_URI_PATTERN.format(file_id))
self.wait(ticket_json['result']['wait_time'])
diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py
index a7a45d028..b189ee1ba 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/XFileSharingPro.py b/module/plugins/hoster/XFileSharingPro.py
index c7d8a7761..a5d76763d 100644
--- a/module/plugins/hoster/XFileSharingPro.py
+++ b/module/plugins/hoster/XFileSharingPro.py
@@ -11,7 +11,7 @@ class XFileSharingPro(XFSHoster):
__version__ = "0.54"
__status__ = "testing"
- __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w\-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)'
+ __pattern__ = r'https?://(?:www\.)?(?:\w+\.)*?(?P<DOMAIN>(?:[\d.]+|[\w-^_]{3,}(?:\.[a-zA-Z]{2,}){1,2})(?:\:\d+)?)/(?:embed-)?\w{12}(?:\W|$)'
__description__ = """XFileSharingPro dummy hoster plugin for hook"""
__license__ = "GPLv3"
@@ -32,7 +32,7 @@ class XFileSharingPro(XFSHoster):
self.__pattern__ = self.pyload.pluginManager.hosterPlugins[self.__name__]['pattern']
self.PLUGIN_DOMAIN = re.match(self.__pattern__, self.pyfile.url).group("DOMAIN").lower()
- self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|\-)', self.PLUGIN_DOMAIN) if part != '.')
+ self.PLUGIN_NAME = "".join(part.capitalize() for part in re.split(r'(\.|\d+|-)', self.PLUGIN_DOMAIN) if part != '.')
def _setup(self):
diff --git a/module/plugins/hoster/YadiSk.py b/module/plugins/hoster/YadiSk.py
index 418f38926..354ba1b4c 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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 21:14:05 +0100