summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/AndroidPhoneNotify.py4
-rw-r--r--[-rwxr-xr-x]module/plugins/hooks/Captcha9Kw.py (renamed from module/plugins/hooks/Captcha9kw.py)0
-rw-r--r--module/plugins/hooks/ClickAndLoad.py56
-rw-r--r--module/plugins/hooks/DeathByCaptcha.py2
-rw-r--r--module/plugins/hooks/ExternalScripts.py8
-rw-r--r--module/plugins/hooks/ExtractArchive.py268
-rw-r--r--module/plugins/hooks/IRCInterface.py8
-rw-r--r--module/plugins/hooks/ImageTyperz.py4
-rw-r--r--module/plugins/hooks/LinkdecrypterCom.py9
-rw-r--r--module/plugins/hooks/SkipRev.py4
-rw-r--r--module/plugins/hooks/UpdateManager.py8
-rw-r--r--module/plugins/hooks/WindowsPhoneToastNotify.py4
-rw-r--r--module/plugins/hooks/XFileSharingPro.py8
-rw-r--r--module/plugins/hooks/XMPPInterface.py6
14 files changed, 195 insertions, 194 deletions
diff --git a/module/plugins/hooks/AndroidPhoneNotify.py b/module/plugins/hooks/AndroidPhoneNotify.py
index 18e1cce66..fbc2acd5c 100644
--- a/module/plugins/hooks/AndroidPhoneNotify.py
+++ b/module/plugins/hooks/AndroidPhoneNotify.py
@@ -9,7 +9,7 @@ from module.plugins.Hook import Hook
class AndroidPhoneNotify(Hook):
__name__ = "AndroidPhoneNotify"
__type__ = "hook"
- __version__ = "0.02"
+ __version__ = "0.03"
__config__ = [("apikey" , "str" , "API key" , "" ),
("notifycaptcha" , "bool", "Notify captcha request" , True ),
@@ -51,7 +51,7 @@ class AndroidPhoneNotify(Hook):
self.notify(_("Package finished"), pypack.name)
- def allDownloadsProcessed(self, thread):
+ def allDownloadsProcessed(self):
if not self.getConfig("notifyprocessed"):
return False
diff --git a/module/plugins/hooks/Captcha9kw.py b/module/plugins/hooks/Captcha9Kw.py
index 600694e78..600694e78 100755..100644
--- a/module/plugins/hooks/Captcha9kw.py
+++ b/module/plugins/hooks/Captcha9Kw.py
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
index 222310c25..94a240d4c 100644
--- a/module/plugins/hooks/ClickAndLoad.py
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -18,10 +18,55 @@ def forward(source, destination):
destination.shutdown(socket.SHUT_WR)
+#: socket.create_connection wrapper for python 2.5
+def create_connection(address, timeout=object(), source_address=None):
+ try:
+ return socket.create_connection(address,
+ socket._GLOBAL_DEFAULT_TIMEOUT if type(timeout) == object else timeout,
+ source_address)
+
+ except SyntaxError:
+ """Connect to *address* and return the socket object.
+
+ Convenience function. Connect to *address* (a 2-tuple ``(host,
+ port)``) and return the socket object. Passing the optional
+ *timeout* parameter will set the timeout on the socket instance
+ before attempting to connect. If no *timeout* is supplied, the
+ global default timeout setting returned by :func:`getdefaulttimeout`
+ is used. If *source_address* is set it must be a tuple of (host, port)
+ for the socket to bind as a source address before making the connection.
+ An host of \'\' or port 0 tells the OS to use the default.
+ """
+
+ host, port = address
+ err = None
+ for res in getaddrinfo(host, port, 0, SOCK_STREAM):
+ af, socktype, proto, canonname, sa = res
+ sock = None
+ try:
+ sock = socket(af, socktype, proto)
+ if type(timeout) != object:
+ sock.settimeout(timeout)
+ if source_address:
+ sock.bind(source_address)
+ sock.connect(sa)
+ return sock
+
+ except socket.error, _:
+ err = _
+ if sock is not None:
+ sock.close()
+
+ if err is not None:
+ raise err
+ else:
+ raise socket.error("getaddrinfo returns an empty list")
+
+
class ClickAndLoad(Hook):
__name__ = "ClickAndLoad"
__type__ = "hook"
- __version__ = "0.26"
+ __version__ = "0.31"
__config__ = [("activated", "bool", "Activated" , True ),
("port" , "int" , "Port" , 9666 ),
@@ -46,7 +91,7 @@ class ClickAndLoad(Hook):
@threaded
def proxy(self, ip, webport, cnlport):
- hookManager.startThread(self.server, ip, webport, cnlport)
+ self.manager.startThread(self.server, ip, webport, cnlport)
lock = Lock()
lock.acquire()
lock.acquire()
@@ -62,14 +107,13 @@ class ClickAndLoad(Hook):
while True:
server_socket = dock_socket.accept()[0]
- client_socket = socket.create_connection(("127.0.0.1", webport))
+ client_socket = create_connection(("127.0.0.1", webport))
- hookManager.startThread(forward, server_socket, client_socket)
- hookManager.startThread(forward, client_socket, server_socket)
+ self.manager.startThread(forward, server_socket, client_socket)
+ self.manager.startThread(forward, client_socket, server_socket)
except socket.error, e:
self.logError(e)
- self.server(ip, webport, cnlport)
finally:
dock_socket.close()
diff --git a/module/plugins/hooks/DeathByCaptcha.py b/module/plugins/hooks/DeathByCaptcha.py
index 050b6fe15..d513c446d 100644
--- a/module/plugins/hooks/DeathByCaptcha.py
+++ b/module/plugins/hooks/DeathByCaptcha.py
@@ -135,7 +135,7 @@ class DeathByCaptcha(Hook):
def submit(self, captcha, captchaType="file", match=None):
- #workaround multipart-post bug in HTTPRequest.py
+ #@NOTE: Workaround multipart-post bug in HTTPRequest.py
if re.match("^\w*$", self.getConfig("passkey")):
multipart = True
data = (FORM_FILE, captcha)
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py
index fc0cae44f..b2b4548a2 100644
--- a/module/plugins/hooks/ExternalScripts.py
+++ b/module/plugins/hooks/ExternalScripts.py
@@ -13,7 +13,7 @@ from module.utils import save_join
class ExternalScripts(Hook):
__name__ = "ExternalScripts"
__type__ = "hook"
- __version__ = "0.26"
+ __version__ = "0.27"
__config__ = [("activated", "bool", "Activated", True)]
@@ -59,7 +59,7 @@ class ExternalScripts(Hook):
if not exists(path):
try:
makedirs(path)
- except:
+ except Exception:
self.logDebug("Script folder %s not created" % folder)
return
@@ -136,11 +136,11 @@ class ExternalScripts(Hook):
self.callScript(script)
- def allDownloadsFinished(self, thread):
+ def allDownloadsFinished(self):
for script in chain(self.scripts['all_downloads_finished'], self.scripts['all_dls_finished']):
self.callScript(script)
- def allDownloadsProcessed(self, thread):
+ def allDownloadsProcessed(self):
for script in chain(self.scripts['all_downloads_processed'], self.scripts['all_dls_processed']):
self.callScript(script)
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 2e9efa2b0..5c4e9bc82 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -6,8 +6,6 @@ import os
import sys
from copy import copy
-from os import remove, chmod, makedirs
-from os.path import exists, basename, isfile, isdir
from traceback import print_exc
# monkey patch bug in python 2.6 and lower
@@ -47,18 +45,17 @@ if sys.version_info < (2, 7) and os.name != "nt":
if os.name != "nt":
from grp import getgrnam
- from os import chown
from pwd import getpwnam
from module.plugins.Hook import Hook, threaded, Expose
from module.plugins.internal.Extractor import ArchiveError, CRCError, PasswordError
-from module.utils import save_join, uniqify
+from module.utils import fs_decode, save_join, uniqify
class ExtractArchive(Hook):
__name__ = "ExtractArchive"
__type__ = "hook"
- __version__ = "1.03"
+ __version__ = "1.10"
__config__ = [("activated" , "bool" , "Activated" , True ),
("fullpath" , "bool" , "Extract full path" , True ),
@@ -77,7 +74,9 @@ class ExtractArchive(Hook):
__description__ = """Extract different kind of archives"""
__license__ = "GPLv3"
- __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+ __authors__ = [("RaNaN", "ranan@pyload.org"),
+ ("AndroKev", ""),
+ ("Walter Purcaro", "vuolter@gmail.com")]
event_list = ["allDownloadsProcessed"]
@@ -93,17 +92,18 @@ class ExtractArchive(Hook):
def setup(self):
- self.plugins = []
- self.passwords = []
- names = []
+ self.interval = 300
+ self.extractors = []
+ self.passwords = []
+ names = []
for p in ("UnRar", "SevenZip", "UnZip"):
try:
module = self.core.pluginManager.loadModule("internal", p)
klass = getattr(module, p)
if klass.checkDeps():
names.append(p)
- self.plugins.append(klass)
+ self.extractors.append(klass)
except OSError, e:
if e.errno == 2:
@@ -123,66 +123,48 @@ class ExtractArchive(Hook):
else:
self.logInfo(_("No Extract plugins activated"))
- # queue with package ids
- self.queue = []
-
def periodical(self):
- if not self.queue or self.extracting:
- return
-
- local = copy(self.queue)
- self.queue[:] = []
-
- self.extractPackages(*local)
+ if not self.extracting:
+ self.extractPackage(*self.getQueue())
@Expose
- def extractPackage(self, id):
- """ Extract package wrapper"""
- self.extractPackages(id)
-
-
- @Expose
- def extractPackages(self, *ids):
+ def extractPackage(self, *ids):
""" Extract packages with given id"""
self.manager.startThread(self.extract, ids)
def packageFinished(self, pypack):
- if self.getConfig("queue") or self.extracting:
+ if self.extracting or self.getConfig("queue"):
self.logInfo(_("Package %s queued for later extracting") % pypack.name)
- self.queue.append(pypack.id)
+ self.addToQueue(pypack.id)
else:
self.extractPackage(pypack.id)
@threaded
- def allDownloadsProcessed(self, thread):
- local = copy(self.queue)
- self.queue[:] = []
-
- if self.extract(local): #: check only if all gone fine, no failed reporting for now
+ def allDownloadsProcessed(self):
+ if self.extract(self.getQueue()): #@NOTE: check only if all gone fine, no failed reporting for now
self.manager.dispatchEvent("all_archives_extracted")
self.manager.dispatchEvent("all_archives_processed")
def extract(self, ids):
- self.extracting = True
-
processed = []
extracted = []
failed = []
- clearlist = lambda string: [x.lstrip('.') for x in string.replace(' ', '').replace(',', '|').replace(';', '|').split('|')]
+ clearList = lambda string: [x.lstrip('.') for x in string.replace(' ', '').replace(',', '|').replace(';', '|').split('|')]
destination = self.getConfig("destination")
subfolder = self.getConfig("subfolder")
fullpath = self.getConfig("fullpath")
overwrite = self.getConfig("overwrite")
- extensions = clearlist(self.getConfig("extensions"))
- excludefiles = clearlist(self.getConfig("excludefiles"))
+ extensions = clearList(self.getConfig("extensions"))
+ excludefiles = clearList(self.getConfig("excludefiles"))
+ excludefiles = self.getConfig("excludefiles")
renice = self.getConfig("renice")
recursive = self.getConfig("recursive")
delete = self.getConfig("delete")
@@ -197,25 +179,27 @@ class ExtractArchive(Hook):
# dl folder
dl = self.config['general']['download_folder']
- #iterate packages -> plugins -> targets
+ #iterate packages -> extractors -> targets
for pid in ids:
- p = self.core.files.getPackage(pid)
- self.logInfo(_("Check package: %s") % p.name)
- if not p:
+ pypack = self.core.files.getPackage(pid)
+
+ self.logInfo(_("Check package: %s") % pypack.name)
+
+ if not pypack:
continue
# determine output folder
- out = save_join(dl, p.folder, destination, "") #: force trailing slash
+ out = save_join(dl, pypack.folder, destination, "") #: force trailing slash
if subfolder:
- out = save_join(out, p.folder)
+ out = save_join(out, pypack.folder)
- if not exists(out):
- makedirs(out)
+ if not os.path.exists(out):
+ os.makedirs(out)
- files_ids = [(save_join(dl, p.folder, x['name']), x['id']) for x in p.getChildren().itervalues()]
matched = False
success = True
+ files_ids = [(save_join(dl, pypack.folder, x['name']), x['id']) for x in pypack.getChildren().itervalues()]
# check as long there are unseen files
while files_ids:
@@ -224,42 +208,41 @@ class ExtractArchive(Hook):
if extensions:
files_ids = [(file, id) for file, id in files_ids if filter(lambda ext: file.endswith(ext), extensions)]
- for plugin in self.plugins:
- targets = plugin.getTargets(files_ids)
-
+ for Extractor in self.extractors:
+ targets = Extractor.getTargets(files_ids)
if targets:
- self.logDebug("Targets for %s: %s" % (plugin.__name__, targets))
+ self.logDebug("Targets for %s: %s" % (Extractor.__name__, targets))
matched = True
- for target, fid in targets:
- if target in processed:
- self.logDebug(basename(target), "skipped")
+ for filename, fid in targets:
+ fname = os.path.basename(filename)
+
+ if filename in processed:
+ self.logDebug(fname, "Skipped")
continue
- processed.append(target) # prevent extracting same file twice
+ processed.append(filename) # prevent extracting same file twice
- self.logInfo(basename(target), _("Extract to: %s") % out)
+ self.logInfo(fname, _("Extract to: %s") % out)
try:
- klass = plugin(self,
- target,
- out,
- p.password,
- fullpath,
- overwrite,
- excludefiles,
- renice,
- delete,
- keepbroken)
+ self.extracting = True
+
+ klass = Extractor(self,
+ filename,
+ out,
+ fullpath,
+ overwrite,
+ excludefiles,
+ renice,
+ delete,
+ keepbroken,
+ fid)
klass.init()
- new_files = self._extract(klass, fid)
+ new_files = self._extract(klass, fid, pypack.password)
except Exception, e:
- self.logError(basename(target), e)
- new_files = None
-
- if new_files is None:
- self.logWarning(basename(target), _("No files extracted"))
+ self.logError(fname, e)
success = False
continue
@@ -267,10 +250,10 @@ class ExtractArchive(Hook):
self.setPermissions(new_files)
for file in new_files:
- if not exists(file):
+ if not os.path.exists(file):
self.logDebug("New file %s does not exists" % file)
continue
- if recursive and isfile(file):
+ if recursive and os.path.isfile(file):
new_files_ids.append((file, fid)) # append as new target
files_ids = new_files_ids # also check extracted files
@@ -278,10 +261,10 @@ class ExtractArchive(Hook):
if matched:
if success:
extracted.append(pid)
- self.manager.dispatchEvent("package_extracted", p)
+ self.manager.dispatchEvent("package_extracted", pypack)
else:
failed.append(pid)
- self.manager.dispatchEvent("package_extract_failed", p)
+ self.manager.dispatchEvent("package_extract_failed", pypack)
else:
self.logInfo(_("No files found to extract"))
@@ -295,124 +278,103 @@ class ExtractArchive(Hook):
return True if not failed else False
- def _extract(self, plugin, fid):
+ def _extract(self, archive, fid, password):
pyfile = self.core.files.getFile(fid)
+ fname = os.path.basename(fs_decode(archive.target))
pyfile.setCustomStatus(_("extracting"))
+ pyfile.setProgress(0)
try:
- progress = lambda x: pyfile.setProgress(x)
- encrypted = False
- passwords = self.getPasswords()
-
- try:
- self.logInfo(basename(plugin.file), "Verifying...")
-
- tmp_password = plugin.password
- plugin.password = "" #: Force verifying without password
-
- plugin.verify()
-
- except PasswordError:
- encrypted = True
-
- except CRCError:
- self.logWarning(basename(plugin.file), _("Archive damaged"))
-
- if not self.getConfig("repair"):
- raise CRCError
-
- elif plugin.repair():
- self.logInfo(basename(plugin.file), _("Successfully repaired"))
-
- elif not self.getConfig("keepbroken"):
- raise ArchiveError(_("Broken archive"))
-
- else:
- self.logInfo(basename(plugin.file), _("All OK"))
-
- plugin.password = tmp_password
-
- if not encrypted:
- plugin.extract(progress)
+ success = False
+ if not archive.checkArchive():
+ archive.extract(password)
+ success = True
else:
- self.logInfo(basename(plugin.file), _("Password protected"))
+ self.logInfo(fname, _("Password protected"))
+ self.logDebug("Password: %s" % (password or "No provided"))
- if plugin.password:
- passwords.insert(0, plugin.password)
- passwords = uniqify(self.passwords)
- self.logDebug("Password: %s" % plugin.password)
- else:
- self.logDebug("No package password provided")
-
- for pw in passwords:
+ for pw in set(self.getPasswords(False) + [password]):
try:
self.logDebug("Try password: %s" % pw)
-
- if plugin.setPassword(pw):
- plugin.extract(progress)
+ if archive.checkPassword(pw):
+ archive.extract(pw)
self.addPassword(pw)
+ success = True
break
- else:
- raise PasswordError
except PasswordError:
self.logDebug("Password was wrong")
else:
raise PasswordError
+ pyfile.setProgress(100)
+ pyfile.setStatus("processing")
+
if self.core.debug:
self.logDebug("Would delete: %s" % ", ".join(plugin.getDeleteFiles()))
if self.getConfig("delete"):
- files = plugin.getDeleteFiles()
+ files = archive.getDeleteFiles()
self.logInfo(_("Deleting %s files") % len(files))
for f in files:
- if exists(f):
- remove(f)
+ if os.path.exists(f):
+ os.remove(f)
else:
self.logDebug("%s does not exists" % f)
- self.logInfo(basename(plugin.file), _("Extracting finished"))
+ self.logInfo(fname, _("Extracting finished"))
- extracted_files = plugin.getExtractedFiles()
- self.manager.dispatchEvent("archive_extracted", pyfile, plugin.out, plugin.file, extracted_files)
+ extracted_files = archive.getExtractedFiles()
+ self.manager.dispatchEvent("archive_extracted", pyfile, archive.out, archive.file, extracted_files)
return extracted_files
except PasswordError:
- self.logError(basename(plugin.file), _("Wrong password" if passwords else "No password found"))
- plugin.password = ""
+ self.logError(fname, _("Wrong password" if password else "No password found"))
except CRCError:
- self.logError(basename(plugin.file), _("CRC Mismatch"))
+ self.logError(fname, _("CRC Mismatch"))
except ArchiveError, e:
- self.logError(basename(plugin.file), _("Archive Error"), e)
+ self.logError(fname, _("Archive Error"), e)
except Exception, e:
if self.core.debug:
print_exc()
- self.logError(basename(plugin.file), _("Unknown Error"), e)
+ self.logError(fname, _("Unknown Error"), e)
+
+ finally:
+ pyfile.finishIfDone()
self.manager.dispatchEvent("archive_extract_failed", pyfile)
- self.logError(basename(plugin.file), _("Extract failed"))
+ raise Exception(_("Extract failed"))
+
+
+ def getQueue(self):
+ return self.getStorage("ExtractArchive", [])
+
+
+ def addToQueue(self, item):
+ queue = self.getQueue()
+ return self.setStorage("ExtractArchive", queue + [item] if item not in queue else queue)
@Expose
- def getPasswords(self):
+ def getPasswords(self, reload=True):
""" List of saved passwords """
+ if reload:
+ self.reloadPasswords()
+
return self.passwords
def reloadPasswords(self):
- passwordfile = self.getConfig("passwordfile")
-
try:
passwords = []
- with open(passwordfile, "a+") as f:
+ with open(self.getConfig("passwordfile")) as f:
for pw in f.read().splitlines():
passwords.append(pw)
@@ -426,13 +388,10 @@ class ExtractArchive(Hook):
@Expose
def addPassword(self, pw):
""" Adds a password to saved list"""
- passwordfile = self.getConfig("passwordfile")
-
- self.passwords.insert(0, pw)
- self.passwords = uniqify(self.passwords)
-
try:
- with open(passwordfile, "wb") as f:
+ self.passwords = uniqify([pw] + self.passwords)
+
+ with open(self.getConfig("passwordfile"), "wb") as f:
for pw in self.passwords:
f.write(pw + '\n')
@@ -442,20 +401,21 @@ class ExtractArchive(Hook):
def setPermissions(self, files):
for f in files:
- if not exists(f):
+ if not os.path.exists(f):
continue
try:
if self.config['permission']['change_file']:
- if isfile(f):
- chmod(f, int(self.config['permission']['file'], 8))
- elif isdir(f):
- chmod(f, int(self.config['permission']['folder'], 8))
+ if os.path.isfile(f):
+ os.chmod(f, int(self.config['permission']['file'], 8))
+
+ elif os.path.isdir(f):
+ os.chmod(f, int(self.config['permission']['folder'], 8))
if self.config['permission']['change_dl'] and os.name != "nt":
uid = getpwnam(self.config['permission']['user'])[2]
gid = getgrnam(self.config['permission']['group'])[2]
- chown(f, uid, gid)
+ os.chown(f, uid, gid)
except Exception, e:
self.logWarning(_("Setting User and Group failed"), e)
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index efd4e411d..98fa1d030 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -61,7 +61,7 @@ class IRCInterface(Thread, Hook):
try:
if self.getConfig("info_pack"):
self.response(_("Package finished: %s") % pypack.name)
- except:
+ except Exception:
pass
@@ -70,7 +70,7 @@ class IRCInterface(Thread, Hook):
if self.getConfig("info_file"):
self.response(
_("Download finished: %(name)s @ %(plugin)s ") % {"name": pyfile.name, "plugin": pyfile.pluginname})
- except:
+ except Exception:
pass
@@ -183,7 +183,7 @@ class IRCInterface(Thread, Hook):
trigger = temp[0]
if len(temp) > 1:
args = temp[1:]
- except:
+ except Exception:
pass
handler = getattr(self, "event_%s" % trigger, self.event_pass)
@@ -347,7 +347,7 @@ class IRCInterface(Thread, Hook):
return ["INFO: Added %d links to Package %s [#%d]" % (len(links), pack['name'], id)]
- except:
+ except Exception:
# create new package
id = self.core.api.addPackage(pack, links, 1)
return ["INFO: Created new Package %s [#%d] with %d links." % (pack, id, len(links))]
diff --git a/module/plugins/hooks/ImageTyperz.py b/module/plugins/hooks/ImageTyperz.py
index d448d1be9..d62fed385 100644
--- a/module/plugins/hooks/ImageTyperz.py
+++ b/module/plugins/hooks/ImageTyperz.py
@@ -69,7 +69,7 @@ class ImageTyperz(Hook):
try:
balance = float(res)
- except:
+ except Exception:
raise ImageTyperzException("Invalid response")
self.logInfo(_("Account balance: $%s left") % res)
@@ -82,7 +82,7 @@ class ImageTyperz(Hook):
req.c.setopt(LOW_SPEED_TIME, 80)
try:
- #workaround multipart-post bug in HTTPRequest.py
+ #@NOTE: Workaround multipart-post bug in HTTPRequest.py
if re.match("^\w*$", self.getConfig("passkey")):
multipart = True
data = (FORM_FILE, captcha)
diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterCom.py
index d4924a687..f85a598bc 100644
--- a/module/plugins/hooks/LinkdecrypterCom.py
+++ b/module/plugins/hooks/LinkdecrypterCom.py
@@ -8,7 +8,7 @@ from module.plugins.internal.MultiHook import MultiHook
class LinkdecrypterCom(MultiHook):
__name__ = "LinkdecrypterCom"
__type__ = "hook"
- __version__ = "1.01"
+ __version__ = "1.02"
__config__ = [("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"),
("pluginlist" , "str" , "Plugin list (comma separated)" , "" ),
@@ -21,8 +21,5 @@ class LinkdecrypterCom(MultiHook):
def getCrypters(self):
- try:
- html = self.getURL("http://linkdecrypter.com/")
- return re.search(r'>Supported\(\d+\)</b>: <i>(.+?) \+ RSDF', html).group(1).split(', ')
- except Exception:
- return list()
+ return re.search(r'>Supported\(\d+\)</b>: <i>(.[\w.\-, ]+)',
+ self.getURL("http://linkdecrypter.com/").replace("(g)", "")).group(1).split(', ')
diff --git a/module/plugins/hooks/SkipRev.py b/module/plugins/hooks/SkipRev.py
index 6b4e715da..51d385bb4 100644
--- a/module/plugins/hooks/SkipRev.py
+++ b/module/plugins/hooks/SkipRev.py
@@ -18,7 +18,7 @@ def _setup(self):
class SkipRev(Hook):
__name__ = "SkipRev"
__type__ = "hook"
- __version__ = "0.23"
+ __version__ = "0.24"
__config__ = [("tokeep", "int", "Number of rev files to keep for package (-1 to auto)", -1)]
@@ -34,7 +34,7 @@ class SkipRev(Hook):
def _pyname(self, pyfile):
if hasattr(pyfile.pluginmodule, "getInfo"):
- return next(getattr(pyfile.pluginmodule, "getInfo")([pyfile.url]))[0]
+ return getattr(pyfile.pluginmodule, "getInfo")([pyfile.url]).next()[0]
else:
self.logWarning("Unable to grab file name")
return urlparse(unquote(pyfile.url)).path.split('/')[-1]
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index c72699228..b6a8bac7c 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -16,14 +16,14 @@ from module.utils import save_join
class UpdateManager(Hook):
__name__ = "UpdateManager"
__type__ = "hook"
- __version__ = "0.42"
+ __version__ = "0.43"
__config__ = [("activated" , "bool" , "Activated" , True ),
("mode" , "pyLoad + plugins;plugins only", "Check updates for" , "pyLoad + plugins"),
("interval" , "int" , "Check interval in hours" , 8 ),
("autorestart" , "bool" , "Automatically restart pyLoad when required" , True ),
("reloadplugins", "bool" , "Monitor plugins for code changes in debug mode", True ),
- ("nodebugupdate", "bool" , "Don't check for updates in debug mode" , True )]
+ ("nodebugupdate", "bool" , "Don't check for updates in debug mode" , False )]
__description__ = """ Check for updates """
__license__ = "GPLv3"
@@ -117,7 +117,7 @@ class UpdateManager(Hook):
def server_request(self):
try:
return getURL(self.SERVER_URL, get={'v': self.core.api.getServerVersion()}).splitlines()
- except:
+ except Exception:
self.logWarning(_("Unable to contact server to get updates"))
@@ -192,7 +192,7 @@ class UpdateManager(Hook):
# Protect UpdateManager from self-removing
try:
blacklisted.remove(("hook", "UpdateManager"))
- except:
+ except Exception:
pass
for t, n in blacklisted:
diff --git a/module/plugins/hooks/WindowsPhoneToastNotify.py b/module/plugins/hooks/WindowsPhoneToastNotify.py
index 886d4ca6a..20686ee36 100644
--- a/module/plugins/hooks/WindowsPhoneToastNotify.py
+++ b/module/plugins/hooks/WindowsPhoneToastNotify.py
@@ -10,7 +10,7 @@ from module.plugins.Hook import Hook
class WindowsPhoneToastNotify(Hook):
__name__ = "WindowsPhoneToastNotify"
__type__ = "hook"
- __version__ = "0.04"
+ __version__ = "0.05"
__config__ = [("id" , "str" , "Push ID" , "" ),
("url" , "str" , "Push url" , "" ),
@@ -53,7 +53,7 @@ class WindowsPhoneToastNotify(Hook):
self.notify(_("Package finished"), pypack.name)
- def allDownloadsProcessed(self, thread):
+ def allDownloadsProcessed(self):
if not self.getConfig("notifyprocessed"):
return False
diff --git a/module/plugins/hooks/XFileSharingPro.py b/module/plugins/hooks/XFileSharingPro.py
index 0745a6c7e..e6e30ca8f 100644
--- a/module/plugins/hooks/XFileSharingPro.py
+++ b/module/plugins/hooks/XFileSharingPro.py
@@ -8,7 +8,7 @@ from module.plugins.Hook import Hook
class XFileSharingPro(Hook):
__name__ = "XFileSharingPro"
__type__ = "hook"
- __version__ = "0.30"
+ __version__ = "0.31"
__config__ = [("activated" , "bool", "Activated" , True ),
("use_hoster_list" , "bool", "Load listed hosters only" , False),
@@ -30,15 +30,15 @@ class XFileSharingPro(Hook):
HOSTER_BUILTIN = [#WORKING HOSTERS:
"180upload.com", "backin.net", "eyesfile.ca", "file4safe.com", "fileband.com", "filedwon.com",
- "fileparadox.in", "filevice.com", "hostingbulk.com", "linestorage.com", "ravishare.com", "ryushare.com",
- "salefiles.com", "sendmyway.com", "sharesix.com", "thefile.me", "verzend.be", "xvidstage.com",
+ "fileparadox.in", "filevice.com", "hostingbulk.com", "junkyvideo.com", "linestorage.com", "ravishare.com",
+ "ryushare.com", "salefiles.com", "sendmyway.com", "sharesix.com", "thefile.me", "verzend.be", "xvidstage.com",
#NOT TESTED:
"101shared.com", "4upfiles.com", "filemaze.ws", "filenuke.com", "linkzhost.com", "mightyupload.com",
"rockdizfile.com", "sharebeast.com", "sharerepo.com", "shareswift.com", "uploadbaz.com", "uploadc.com",
"vidbull.com", "zalaa.com", "zomgupload.com",
#NOT WORKING:
"amonshare.com", "banicrazy.info", "boosterking.com", "host4desi.com", "laoupload.com", "rd-fs.com"]
- CRYPTER_BUILTIN = []
+ CRYPTER_BUILTIN = ["junocloud.me", "rapidfileshare.net"]
# def pluginConfigChanged(self.__name__, plugin, name, value):
diff --git a/module/plugins/hooks/XMPPInterface.py b/module/plugins/hooks/XMPPInterface.py
index bbeab4341..b8e9fc1ad 100644
--- a/module/plugins/hooks/XMPPInterface.py
+++ b/module/plugins/hooks/XMPPInterface.py
@@ -69,7 +69,7 @@ class XMPPInterface(IRCInterface, JabberClient):
try:
if self.getConfig("info_pack"):
self.announce(_("Package finished: %s") % pypack.name)
- except:
+ except Exception:
pass
@@ -78,7 +78,7 @@ class XMPPInterface(IRCInterface, JabberClient):
if self.getConfig("info_file"):
self.announce(
_("Download finished: %(name)s @ %(plugin)s") % {"name": pyfile.name, "plugin": pyfile.pluginname})
- except:
+ except Exception:
pass
@@ -152,7 +152,7 @@ class XMPPInterface(IRCInterface, JabberClient):
trigger = temp[0]
if len(temp) > 1:
args = temp[1:]
- except:
+ except Exception:
pass
handler = getattr(self, "event_%s" % trigger, self.event_pass)
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-03 11:09:37 +0100