summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster')
-rw-r--r--module/plugins/hoster/CatShareNet.py4
-rw-r--r--module/plugins/hoster/CzshareCom.py6
-rw-r--r--module/plugins/hoster/NoPremiumPl.py9
-rw-r--r--module/plugins/hoster/OneFichierCom.py5
-rw-r--r--module/plugins/hoster/OpenloadIo.py10
-rw-r--r--module/plugins/hoster/RapideoPl.py9
-rw-r--r--module/plugins/hoster/TurbobitNet.py2
7 files changed, 19 insertions, 26 deletions
diff --git a/module/plugins/hoster/CatShareNet.py b/module/plugins/hoster/CatShareNet.py
index c2b8d9257..aceaa3461 100644
--- a/module/plugins/hoster/CatShareNet.py
+++ b/module/plugins/hoster/CatShareNet.py
@@ -9,10 +9,10 @@ from module.plugins.captcha.ReCaptcha import ReCaptcha
class CatShareNet(SimpleHoster):
__name__ = "CatShareNet"
__type__ = "hoster"
- __version__ = "0.16"
+ __version__ = "0.17"
__status__ = "testing"
- __pattern__ = r'http://(?:www\.)?catshare\.net/\w{16}'
+ __pattern__ = r'http://(?:www\.)?catshare\.net/\w{15,16}'
__config__ = [("use_premium", "bool", "Use premium account if available", True)]
__description__ = """CatShare.net hoster plugin"""
diff --git a/module/plugins/hoster/CzshareCom.py b/module/plugins/hoster/CzshareCom.py
index 75fcf39d8..d61bb310d 100644
--- a/module/plugins/hoster/CzshareCom.py
+++ b/module/plugins/hoster/CzshareCom.py
@@ -61,7 +61,7 @@ class CzshareCom(SimpleHoster):
except Exception, e:
#: let's continue and see what happens...
- self.log_error(e)
+ self.log_error(e, trace=True)
return True
@@ -72,7 +72,7 @@ class CzshareCom(SimpleHoster):
inputs = dict(re.findall(self.FORM_INPUT_PATTERN, form))
except Exception, e:
- self.log_error(e)
+ self.log_error(e, trace=True)
self.restart(premium=False)
#: Download the file, destination is determined by pyLoad
@@ -100,7 +100,7 @@ class CzshareCom(SimpleHoster):
pyfile.size = int(inputs['size'])
except Exception, e:
- self.log_error(e)
+ self.log_error(e, trace=True)
self.error(_("Form"))
#: Get and decrypt captcha
diff --git a/module/plugins/hoster/NoPremiumPl.py b/module/plugins/hoster/NoPremiumPl.py
index 8657d4527..7486423b1 100644
--- a/module/plugins/hoster/NoPremiumPl.py
+++ b/module/plugins/hoster/NoPremiumPl.py
@@ -66,15 +66,13 @@ class NoPremiumPl(MultiHoster):
data = self.run_file_query(pyfile.url, 'fileinfo')
except Exception:
- self.log_debug("Query error #1")
- self.temp_offline()
+ self.temp_offline("Query error #1")
try:
parsed = json_loads(data)
except Exception:
- self.log_debug("Data not found")
- self.temp_offline()
+ self.temp_offline("Data not found")
self.log_debug(parsed)
@@ -100,5 +98,4 @@ class NoPremiumPl(MultiHoster):
self.link = self.run_file_query(pyfile.url, 'filedownload')
except Exception:
- self.log_debug("Query error #2")
- self.temp_offline()
+ self.temp_offline("Query error #2")
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index f525e5b33..e7f2602a0 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -9,7 +9,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
class OneFichierCom(SimpleHoster):
__name__ = "OneFichierCom"
__type__ = "hoster"
- __version__ = "0.90"
+ __version__ = "0.91"
__status__ = "testing"
__pattern__ = r'https?://(?:www\.)?(?:(?P<ID1>\w+)\.)?(?P<HOST>1fichier\.com|alterupload\.com|cjoint\.net|d(es)?fichiers\.com|dl4free\.com|megadl\.fr|mesfichiers\.org|piecejointe\.net|pjointe\.com|tenvoi\.com)(?:/\?(?P<ID2>\w+))?'
@@ -27,8 +27,9 @@ class OneFichierCom(SimpleHoster):
("Ludovic Lehmann", "ludo.lehmann@gmail.com")]
- COOKIES = [("1fichier.com", "LG", "en")]
+ URL_REPLACEMENTS = [("https:", "http:")] #@TODO: Remove in 0.4.10
+ COOKIES = [("1fichier.com", "LG", "en")]
DIRECT_LINK = True
NAME_PATTERN = r'>File\s*Name :</td>\s*<td.*>(?P<N>.+?)<'
diff --git a/module/plugins/hoster/OpenloadIo.py b/module/plugins/hoster/OpenloadIo.py
index fb552626c..4081cf1f2 100644
--- a/module/plugins/hoster/OpenloadIo.py
+++ b/module/plugins/hoster/OpenloadIo.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
class OpenloadIo(SimpleHoster):
__name__ = "OpenloadIo"
__type__ = "hoster"
- __version__ = "0.09"
+ __version__ = "0.10"
__status__ = "testing"
__pattern__ = r'https?://(?:www\.)?openload\.(co|io)/(f|embed)/(?P<ID>[\w\-]+)'
@@ -36,15 +36,13 @@ class OpenloadIo(SimpleHoster):
@classmethod
- def get_info(cls, url="", html=""):
- file_id = self.info['pattern']['ID']
+ def api_info(cls, url):
+ file_id = cls.info['pattern']['ID']
info_json = cls._load_json(cls._FILE_INFO_URI_PATTERN.format(file_id))
file_info = info_json['result'][file_id]
return {'name' : file_info['name'],
- 'size' : file_info['size'],
- 'status': 3 if url.strip() else 8,
- 'url' : url}
+ 'size' : file_info['size']}
def setup(self):
diff --git a/module/plugins/hoster/RapideoPl.py b/module/plugins/hoster/RapideoPl.py
index a43440e61..d4c753c07 100644
--- a/module/plugins/hoster/RapideoPl.py
+++ b/module/plugins/hoster/RapideoPl.py
@@ -66,15 +66,13 @@ class RapideoPl(MultiHoster):
data = self.run_file_query(pyfile.url, 'fileinfo')
except Exception:
- self.log_debug("RunFileQuery error")
- self.temp_offline()
+ self.temp_offline("Query error #1")
try:
parsed = json_loads(data)
except Exception:
- self.log_debug("Loads error")
- self.temp_offline()
+ self.temp_offline("Data not found")
self.log_debug(parsed)
@@ -100,5 +98,4 @@ class RapideoPl(MultiHoster):
self.link = self.run_file_query(pyfile.url, 'filedownload')
except Exception:
- self.log_debug("runFileQuery error #2")
- self.temp_offline()
+ self.temp_offline("Query error #2")
diff --git a/module/plugins/hoster/TurbobitNet.py b/module/plugins/hoster/TurbobitNet.py
index d20d1cadd..6d83c3b56 100644
--- a/module/plugins/hoster/TurbobitNet.py
+++ b/module/plugins/hoster/TurbobitNet.py
@@ -143,7 +143,7 @@ class TurbobitNet(SimpleHoster):
return "http://turbobit.net%s" % out.strip()
except Exception, e:
- self.log_error(e)
+ self.log_error(e, trace=True)
else:
if self.retries >= 2:
#: Retry with updated js
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-09 09:19:22 +0100