summaryrefslogtreecommitdiffstats
path: root/module/plugins/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hooks')
-rw-r--r--module/plugins/hooks/AlldebridComHook.py (renamed from module/plugins/hooks/AlldebridCom.py)4
-rw-r--r--module/plugins/hooks/AntiVirus.py38
-rw-r--r--module/plugins/hooks/DebridItaliaComHook.py (renamed from module/plugins/hooks/DebridItaliaCom.py)4
-rw-r--r--module/plugins/hooks/EasybytezComHook.py (renamed from module/plugins/hooks/EasybytezCom.py)4
-rw-r--r--module/plugins/hooks/ExtractArchive.py89
-rw-r--r--module/plugins/hooks/FastixRuHook.py (renamed from module/plugins/hooks/FastixRu.py)4
-rw-r--r--module/plugins/hooks/FreeWayMeHook.py (renamed from module/plugins/hooks/FreeWayMe.py)4
-rw-r--r--module/plugins/hooks/IRCInterface.py4
-rw-r--r--module/plugins/hooks/LinkdecrypterComHook.py (renamed from module/plugins/hooks/LinkdecrypterCom.py)15
-rw-r--r--module/plugins/hooks/LinksnappyComHook.py (renamed from module/plugins/hooks/LinksnappyCom.py)4
-rw-r--r--module/plugins/hooks/MegaDebridEuHook.py (renamed from module/plugins/hooks/MegaDebridEu.py)4
-rw-r--r--module/plugins/hooks/MegaRapidoNetHook.py (renamed from module/plugins/hooks/MegaRapidoNet.py)4
-rw-r--r--module/plugins/hooks/MergeFiles.py5
-rw-r--r--module/plugins/hooks/MultihostersComHook.py (renamed from module/plugins/hooks/MultihostersCom.py)6
-rw-r--r--module/plugins/hooks/MultishareCzHook.py (renamed from module/plugins/hooks/MultishareCz.py)4
-rw-r--r--module/plugins/hooks/MyfastfileComHook.py (renamed from module/plugins/hooks/MyfastfileCom.py)4
-rw-r--r--module/plugins/hooks/NoPremiumPlHook.py (renamed from module/plugins/hooks/NoPremiumPl.py)4
-rw-r--r--module/plugins/hooks/OverLoadMeHook.py (renamed from module/plugins/hooks/OverLoadMe.py)4
-rw-r--r--module/plugins/hooks/PremiumToHook.py (renamed from module/plugins/hooks/PremiumTo.py)4
-rw-r--r--module/plugins/hooks/PremiumizeMeHook.py (renamed from module/plugins/hooks/PremiumizeMe.py)4
-rw-r--r--module/plugins/hooks/PutdriveComHook.py (renamed from module/plugins/hooks/PutdriveCom.py)6
-rw-r--r--module/plugins/hooks/RPNetBizHook.py (renamed from module/plugins/hooks/RPNetBiz.py)4
-rw-r--r--module/plugins/hooks/RapideoPlHook.py (renamed from module/plugins/hooks/RapideoPl.py)4
-rw-r--r--module/plugins/hooks/RealdebridComHook.py (renamed from module/plugins/hooks/RealdebridCom.py)4
-rw-r--r--module/plugins/hooks/RehostToHook.py (renamed from module/plugins/hooks/RehostTo.py)4
-rw-r--r--module/plugins/hooks/SimplyPremiumComHook.py (renamed from module/plugins/hooks/SimplyPremiumCom.py)4
-rw-r--r--module/plugins/hooks/SimplydebridComHook.py (renamed from module/plugins/hooks/SimplydebridCom.py)4
-rw-r--r--module/plugins/hooks/SmoozedComHook.py (renamed from module/plugins/hooks/SmoozedCom.py)4
-rw-r--r--module/plugins/hooks/UnrestrictLiHook.py (renamed from module/plugins/hooks/UnrestrictLi.py)4
-rw-r--r--module/plugins/hooks/UpdateManager.py4
-rw-r--r--module/plugins/hooks/UserAgentSwitcher.py47
-rw-r--r--module/plugins/hooks/ZeveraComHook.py (renamed from module/plugins/hooks/ZeveraCom.py)4
32 files changed, 189 insertions, 117 deletions
diff --git a/module/plugins/hooks/AlldebridCom.py b/module/plugins/hooks/AlldebridComHook.py
index 34f44c91d..092921134 100644
--- a/module/plugins/hooks/AlldebridCom.py
+++ b/module/plugins/hooks/AlldebridComHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class AlldebridCom(MultiHook):
- __name__ = "AlldebridCom"
+class AlldebridComHook(MultiHook):
+ __name__ = "AlldebridComHook"
__type__ = "hook"
__version__ = "0.16"
diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py
index cc3c5c754..27e3801b5 100644
--- a/module/plugins/hooks/AntiVirus.py
+++ b/module/plugins/hooks/AntiVirus.py
@@ -11,15 +11,16 @@ from module.utils import fs_encode, save_join
class AntiVirus(Hook):
__name__ = "AntiVirus"
__type__ = "hook"
- __version__ = "0.05"
+ __version__ = "0.07"
#@TODO: add trash option (use Send2Trash lib)
- __config__ = [("action" , "Antivirus default;Delete;Quarantine", "Manage infected files" , "Antivirus default"),
- ("quardir" , "folder" , "Quarantine folder" , "" ),
- ("scanfailed", "bool" , "Scan incompleted files (failed downloads)", False ),
- ("cmdfile" , "file" , "Antivirus executable" , "" ),
- ("cmdargs" , "str" , "Scan options" , "" ),
- ("ignore-err", "bool" , "Ignore scan errors" , False )]
+ __config__ = [("action" , "Antivirus default;Delete;Quarantine", "Manage infected files" , "Antivirus default"),
+ ("quardir" , "folder" , "Quarantine folder" , "" ),
+ ("deltotrash", "bool" , "Move to trash (recycle bin) instead delete", True ),
+ ("scanfailed", "bool" , "Scan incompleted files (failed downloads)" , False ),
+ ("cmdfile" , "file" , "Antivirus executable" , "" ),
+ ("cmdargs" , "str" , "Scan options" , "" ),
+ ("ignore-err", "bool" , "Ignore scan errors" , False )]
__description__ = """Scan downloaded files with antivirus program"""
__license__ = "GPLv3"
@@ -32,6 +33,16 @@ class AntiVirus(Hook):
def setup(self):
self.info = {} #@TODO: Remove in 0.4.10
+ try:
+ import send2trash
+
+ except ImportError:
+ self.logDebug("Send2Trash lib not found")
+ self.trashable = False
+
+ else:
+ self.trashable = True
+
@Expose
@threaded
@@ -46,6 +57,7 @@ class AntiVirus(Hook):
thread.addActive(pyfile)
pyfile.setCustomStatus(_("virus scanning"))
+ pyfile.setProgress(0)
try:
p = subprocess.Popen([cmdfile, cmdargs, file], bufsize=-1, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -66,11 +78,19 @@ class AntiVirus(Hook):
action = self.getConfig('action')
try:
if action == "Delete":
- os.remove(file)
+ if not self.getConfig('deltotrash'):
+ os.remove(file)
+
+ elif self.trashable:
+ send2trash.send2trash(file)
+
+ else:
+ self.logWarning(_("Unable to move file to trash, move to quarantine instead"))
+ pyfile.setCustomStatus(_("file moving"))
+ shutil.move(file, self.getConfig('quardir'))
elif action == "Quarantine":
pyfile.setCustomStatus(_("file moving"))
- pyfile.setProgress(0)
shutil.move(file, self.getConfig('quardir'))
except (IOError, shutil.Error), e:
diff --git a/module/plugins/hooks/DebridItaliaCom.py b/module/plugins/hooks/DebridItaliaComHook.py
index a970ae195..36b307696 100644
--- a/module/plugins/hooks/DebridItaliaCom.py
+++ b/module/plugins/hooks/DebridItaliaComHook.py
@@ -5,8 +5,8 @@ import re
from module.plugins.internal.MultiHook import MultiHook
-class DebridItaliaCom(MultiHook):
- __name__ = "DebridItaliaCom"
+class DebridItaliaComHook(MultiHook):
+ __name__ = "DebridItaliaComHook"
__type__ = "hook"
__version__ = "0.12"
diff --git a/module/plugins/hooks/EasybytezCom.py b/module/plugins/hooks/EasybytezComHook.py
index 04da21ee2..43efb5048 100644
--- a/module/plugins/hooks/EasybytezCom.py
+++ b/module/plugins/hooks/EasybytezComHook.py
@@ -5,8 +5,8 @@ import re
from module.plugins.internal.MultiHook import MultiHook
-class EasybytezCom(MultiHook):
- __name__ = "EasybytezCom"
+class EasybytezComHook(MultiHook):
+ __name__ = "EasybytezComHook"
__type__ = "hook"
__version__ = "0.07"
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index 8c40667c2..9e6f2d379 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -4,9 +4,9 @@ from __future__ import with_statement
import os
import sys
+import traceback
from copy import copy
-from traceback import print_exc
# monkey patch bug in python 2.6 and lower
# http://bugs.python.org/issue6122 , http://bugs.python.org/issue1236 , http://bugs.python.org/issue1731717
@@ -106,24 +106,25 @@ class ArchiveQueue(object):
class ExtractArchive(Hook):
__name__ = "ExtractArchive"
__type__ = "hook"
- __version__ = "1.38"
-
- __config__ = [("activated" , "bool" , "Activated" , True ),
- ("fullpath" , "bool" , "Extract with full paths" , True ),
- ("overwrite" , "bool" , "Overwrite files" , False ),
- ("keepbroken" , "bool" , "Try to extract broken archives" , False ),
- ("repair" , "bool" , "Repair broken archives (RAR required)" , False ),
- ("test" , "bool" , "Test archive before extracting" , False ),
- ("usepasswordfile", "bool" , "Use password file" , True ),
- ("passwordfile" , "file" , "Password file" , "archive_password.txt" ),
- ("delete" , "No;Permanent;Trash", "Delete archive after extraction" , "No" ),
- ("subfolder" , "bool" , "Create subfolder for each package" , False ),
- ("destination" , "folder" , "Extract files to folder" , "" ),
- ("extensions" , "str" , "Extract archives ending with extension", "7z,bz2,bzip2,gz,gzip,lha,lzh,lzma,rar,tar,taz,tbz,tbz2,tgz,xar,xz,z,zip"),
- ("excludefiles" , "str" , "Don't extract the following files" , "*.nfo,*.DS_Store,index.dat,thumb.db" ),
- ("recursive" , "bool" , "Extract archives in archives" , True ),
- ("waitall" , "bool" , "Run after all downloads was processed" , False ),
- ("renice" , "int" , "CPU priority" , 0 )]
+ __version__ = "1.41"
+
+ __config__ = [("activated" , "bool" , "Activated" , True ),
+ ("fullpath" , "bool" , "Extract with full paths" , True ),
+ ("overwrite" , "bool" , "Overwrite files" , False ),
+ ("keepbroken" , "bool" , "Try to extract broken archives" , False ),
+ ("repair" , "bool" , "Repair broken archives (RAR required)" , False ),
+ ("test" , "bool" , "Test archive before extracting" , False ),
+ ("usepasswordfile", "bool" , "Use password file" , True ),
+ ("passwordfile" , "file" , "Password file" , "archive_password.txt" ),
+ ("delete" , "bool" , "Delete archive after extraction" , True ),
+ ("deltotrash" , "bool" , "Move to trash (recycle bin) instead delete", True ),
+ ("subfolder" , "bool" , "Create subfolder for each package" , False ),
+ ("destination" , "folder" , "Extract files to folder" , "" ),
+ ("extensions" , "str" , "Extract archives ending with extension" , "7z,bz2,bzip2,gz,gzip,lha,lzh,lzma,rar,tar,taz,tbz,tbz2,tgz,xar,xz,z,zip"),
+ ("excludefiles" , "str" , "Don't extract the following files" , "*.nfo,*.DS_Store,index.dat,thumb.db" ),
+ ("recursive" , "bool" , "Extract archives in archives" , True ),
+ ("waitall" , "bool" , "Run after all downloads was processed" , False ),
+ ("renice" , "int" , "CPU priority" , 0 )]
__description__ = """Extract different kind of archives"""
__license__ = "GPLv3"
@@ -148,7 +149,16 @@ class ExtractArchive(Hook):
self.extractors = []
self.passwords = []
self.repair = False
- self.trash = False
+
+ try:
+ import send2trash
+
+ except ImportError:
+ self.logDebug("Send2Trash lib not found")
+ self.trashable = False
+
+ else:
+ self.trashable = True
def coreReady(self):
@@ -167,12 +177,12 @@ class ExtractArchive(Hook):
else:
self.logWarning(_("Could not activate: %s") % p, e)
if self.core.debug:
- print_exc()
+ traceback.print_exc()
except Exception, e:
self.logWarning(_("Could not activate: %s") % p, e)
if self.core.debug:
- print_exc()
+ traceback.print_exc()
if self.extractors:
self.logInfo(_("Activated") + " " + "|".join("%s %s" % (Extractor.__name__, Extractor.VERSION) for Extractor in self.extractors))
@@ -321,6 +331,7 @@ class ExtractArchive(Hook):
new_files = self._extract(pyfile, archive, pypack.password)
finally:
+ pyfile.setProgress(100)
thread.finishFile(pyfile)
except Exception, e:
@@ -449,31 +460,25 @@ class ExtractArchive(Hook):
pyfile.setStatus("processing")
delfiles = archive.getDeleteFiles()
- if self.core.debug:
- self.logDebug("Would delete: %s" % ", ".join(delfiles))
+ self.logDebug("Would delete: " + ", ".join(delfiles))
- if self.getConfig('delete') != 'No':
- try:
- from send2trash import send2trash
- if self.getConfig('delete') == "Trash":
- self.trash = True
- self.logInfo(_("Sending %s files to trash") % len(delfiles))
- except ImportError:
- self.logError(name, _("Send2Trash not installed, no files deleted"))
- self.trash = False
-
- if self.getConfig('delete') == "Permanent":
- self.trash = False
- self.logInfo(_("Deleting %s files") % len(delfiles))
+ if self.getConfig('delete'):
+ self.logInfo(_("Deleting %s files") % len(delfiles))
+ deltotrash = self.getConfig('deltotrash')
for f in delfiles:
file = fs_encode(f)
- if os.path.exists(file) and self.trash:
- send2trash(file)
- elif os.path.exists(file):
+ if not os.path.exists(file):
+ continue
+
+ if not deltotrash:
os.remove(file)
+
+ elif self.trashable:
+ send2trash.send2trash(file)
+
else:
- self.logDebug("%s does not exists" % f)
+ self.logWarning(_("Unable to move %s to trash") % os.path.basename(f))
self.logInfo(name, _("Extracting finished"))
extracted_files = archive.files or archive.list()
@@ -492,7 +497,7 @@ class ExtractArchive(Hook):
except Exception, e:
self.logError(name, _("Unknown error"), e)
if self.core.debug:
- print_exc()
+ traceback.print_exc()
self.manager.dispatchEvent("archive_extract_failed", pyfile, archive)
diff --git a/module/plugins/hooks/FastixRu.py b/module/plugins/hooks/FastixRuHook.py
index 9e74587ac..16e30e93a 100644
--- a/module/plugins/hooks/FastixRu.py
+++ b/module/plugins/hooks/FastixRuHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class FastixRu(MultiHook):
- __name__ = "FastixRu"
+class FastixRuHook(MultiHook):
+ __name__ = "FastixRuHook"
__type__ = "hook"
__version__ = "0.05"
diff --git a/module/plugins/hooks/FreeWayMe.py b/module/plugins/hooks/FreeWayMeHook.py
index 31ef8201f..baea44540 100644
--- a/module/plugins/hooks/FreeWayMe.py
+++ b/module/plugins/hooks/FreeWayMeHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class FreeWayMe(MultiHook):
- __name__ = "FreeWayMe"
+class FreeWayMeHook(MultiHook):
+ __name__ = "FreeWayMeHook"
__type__ = "hook"
__version__ = "0.15"
diff --git a/module/plugins/hooks/IRCInterface.py b/module/plugins/hooks/IRCInterface.py
index d76b9cb85..9e2f670e6 100644
--- a/module/plugins/hooks/IRCInterface.py
+++ b/module/plugins/hooks/IRCInterface.py
@@ -4,11 +4,11 @@ import re
import socket
import ssl
import time
+import traceback
from pycurl import FORM_FILE
from select import select
from threading import Thread
-from traceback import print_exc
from module.Api import PackageDoesNotExists, FileDoesNotExists
from module.network.RequestFactory import getURL
@@ -106,7 +106,7 @@ class IRCInterface(Thread, Hook):
except IRCError, ex:
self.sock.send("QUIT :byebye\r\n")
- print_exc()
+ traceback.print_exc()
self.sock.close()
diff --git a/module/plugins/hooks/LinkdecrypterCom.py b/module/plugins/hooks/LinkdecrypterComHook.py
index 769e63e81..596a397a4 100644
--- a/module/plugins/hooks/LinkdecrypterCom.py
+++ b/module/plugins/hooks/LinkdecrypterComHook.py
@@ -5,15 +5,16 @@ import re
from module.plugins.internal.MultiHook import MultiHook
-class LinkdecrypterCom(MultiHook):
- __name__ = "LinkdecrypterCom"
+class LinkdecrypterComHook(MultiHook):
+ __name__ = "LinkdecrypterComHook"
__type__ = "hook"
- __version__ = "1.03"
+ __version__ = "1.04"
- __config__ = [("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"),
- ("pluginlist" , "str" , "Plugin list (comma separated)" , "" ),
- ("reload" , "bool" , "Reload plugin list" , True ),
- ("reloadinterval", "int" , "Reload interval in hours" , 12 )]
+ __config__ = [("activated" , "bool" , "Activated" , True ),
+ ("pluginmode" , "all;listed;unlisted", "Use for plugins" , "all"),
+ ("pluginlist" , "str" , "Plugin list (comma separated)", "" ),
+ ("reload" , "bool" , "Reload plugin list" , True ),
+ ("reloadinterval", "int" , "Reload interval in hours" , 12 )]
__description__ = """Linkdecrypter.com hook plugin"""
__license__ = "GPLv3"
diff --git a/module/plugins/hooks/LinksnappyCom.py b/module/plugins/hooks/LinksnappyComHook.py
index a5b77b93f..72282575b 100644
--- a/module/plugins/hooks/LinksnappyCom.py
+++ b/module/plugins/hooks/LinksnappyComHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class LinksnappyCom(MultiHook):
- __name__ = "LinksnappyCom"
+class LinksnappyComHook(MultiHook):
+ __name__ = "LinksnappyComHook"
__type__ = "hook"
__version__ = "0.04"
diff --git a/module/plugins/hooks/MegaDebridEu.py b/module/plugins/hooks/MegaDebridEuHook.py
index b32656019..0de7b4dcf 100644
--- a/module/plugins/hooks/MegaDebridEu.py
+++ b/module/plugins/hooks/MegaDebridEuHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class MegaDebridEu(MultiHook):
- __name__ = "MegaDebridEu"
+class MegaDebridEuHook(MultiHook):
+ __name__ = "MegaDebridEuHook"
__type__ = "hook"
__version__ = "0.05"
diff --git a/module/plugins/hooks/MegaRapidoNet.py b/module/plugins/hooks/MegaRapidoNetHook.py
index fb5e77994..e113b305e 100644
--- a/module/plugins/hooks/MegaRapidoNet.py
+++ b/module/plugins/hooks/MegaRapidoNetHook.py
@@ -5,8 +5,8 @@ import re
from module.plugins.internal.MultiHook import MultiHook
-class MegaRapidoNet(MultiHook):
- __name__ = "MegaRapidoNet"
+class MegaRapidoNetHook(MultiHook):
+ __name__ = "MegaRapidoNetHook"
__type__ = "hook"
__version__ = "0.02"
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py
index 2900b0d29..941938920 100644
--- a/module/plugins/hooks/MergeFiles.py
+++ b/module/plugins/hooks/MergeFiles.py
@@ -4,8 +4,7 @@ from __future__ import with_statement
import os
import re
-
-from traceback import print_exc
+import traceback
from module.plugins.Hook import Hook, threaded
from module.utils import save_join
@@ -75,7 +74,7 @@ class MergeFiles(Hook):
self.logDebug("Finished merging part", splitted_file)
except Exception, e:
- print_exc()
+ traceback.print_exc()
finally:
pyfile.setProgress(100)
diff --git a/module/plugins/hooks/MultihostersCom.py b/module/plugins/hooks/MultihostersComHook.py
index bf88cfae7..7b5e49c49 100644
--- a/module/plugins/hooks/MultihostersCom.py
+++ b/module/plugins/hooks/MultihostersComHook.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
-from module.plugins.hooks.ZeveraCom import ZeveraCom
+from module.plugins.hooks.ZeveraComHook import ZeveraComHook
-class MultihostersCom(ZeveraCom):
- __name__ = "MultihostersCom"
+class MultihostersComHook(ZeveraComHook):
+ __name__ = "MultihostersComHook"
__type__ = "hook"
__version__ = "0.02"
diff --git a/module/plugins/hooks/MultishareCz.py b/module/plugins/hooks/MultishareCzHook.py
index 6ead88c34..6052b7673 100644
--- a/module/plugins/hooks/MultishareCz.py
+++ b/module/plugins/hooks/MultishareCzHook.py
@@ -5,8 +5,8 @@ import re
from module.plugins.internal.MultiHook import MultiHook
-class MultishareCz(MultiHook):
- __name__ = "MultishareCz"
+class MultishareCzHook(MultiHook):
+ __name__ = "MultishareCzHook"
__type__ = "hook"
__version__ = "0.07"
diff --git a/module/plugins/hooks/MyfastfileCom.py b/module/plugins/hooks/MyfastfileComHook.py
index 1e7a6421d..20a1cfac2 100644
--- a/module/plugins/hooks/MyfastfileCom.py
+++ b/module/plugins/hooks/MyfastfileComHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class MyfastfileCom(MultiHook):
- __name__ = "MyfastfileCom"
+class MyfastfileComHook(MultiHook):
+ __name__ = "MyfastfileComHook"
__type__ = "hook"
__version__ = "0.05"
diff --git a/module/plugins/hooks/NoPremiumPl.py b/module/plugins/hooks/NoPremiumPlHook.py
index 77ee83cb1..b5a007ff9 100644
--- a/module/plugins/hooks/NoPremiumPl.py
+++ b/module/plugins/hooks/NoPremiumPlHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class NoPremiumPl(MultiHook):
- __name__ = "NoPremiumPl"
+class NoPremiumPlHook(MultiHook):
+ __name__ = "NoPremiumPlHook"
__type__ = "hook"
__version__ = "0.03"
diff --git a/module/plugins/hooks/OverLoadMe.py b/module/plugins/hooks/OverLoadMeHook.py
index 7b9a1f414..d608a2ecd 100644
--- a/module/plugins/hooks/OverLoadMe.py
+++ b/module/plugins/hooks/OverLoadMeHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class OverLoadMe(MultiHook):
- __name__ = "OverLoadMe"
+class OverLoadMeHook(MultiHook):
+ __name__ = "OverLoadMeHook"
__type__ = "hook"
__version__ = "0.04"
diff --git a/module/plugins/hooks/PremiumTo.py b/module/plugins/hooks/PremiumToHook.py
index f5636cb72..ef2a84223 100644
--- a/module/plugins/hooks/PremiumTo.py
+++ b/module/plugins/hooks/PremiumToHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class PremiumTo(MultiHook):
- __name__ = "PremiumTo"
+class PremiumToHook(MultiHook):
+ __name__ = "PremiumToHook"
__type__ = "hook"
__version__ = "0.08"
diff --git a/module/plugins/hooks/PremiumizeMe.py b/module/plugins/hooks/PremiumizeMeHook.py
index 266c62549..e081fb389 100644
--- a/module/plugins/hooks/PremiumizeMe.py
+++ b/module/plugins/hooks/PremiumizeMeHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class PremiumizeMe(MultiHook):
- __name__ = "PremiumizeMe"
+class PremiumizeMeHook(MultiHook):
+ __name__ = "PremiumizeMeHook"
__type__ = "hook"
__version__ = "0.17"
diff --git a/module/plugins/hooks/PutdriveCom.py b/module/plugins/hooks/PutdriveComHook.py
index f665dabee..c3ebf4ff3 100644
--- a/module/plugins/hooks/PutdriveCom.py
+++ b/module/plugins/hooks/PutdriveComHook.py
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
-from module.plugins.hooks.ZeveraCom import ZeveraCom
+from module.plugins.hooks.ZeveraComHook import ZeveraComHook
-class PutdriveCom(ZeveraCom):
- __name__ = "PutdriveCom"
+class PutdriveComHook(ZeveraComHook):
+ __name__ = "PutdriveComHook"
__type__ = "hook"
__version__ = "0.01"
diff --git a/module/plugins/hooks/RPNetBiz.py b/module/plugins/hooks/RPNetBizHook.py
index a24697265..10332948d 100644
--- a/module/plugins/hooks/RPNetBiz.py
+++ b/module/plugins/hooks/RPNetBizHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class RPNetBiz(MultiHook):
- __name__ = "RPNetBiz"
+class RPNetBizHook(MultiHook):
+ __name__ = "RPNetBizHook"
__type__ = "hook"
__version__ = "0.14"
diff --git a/module/plugins/hooks/RapideoPl.py b/module/plugins/hooks/RapideoPlHook.py
index 70d499de5..0400f07ba 100644
--- a/module/plugins/hooks/RapideoPl.py
+++ b/module/plugins/hooks/RapideoPlHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class RapideoPl(MultiHook):
- __name__ = "RapideoPl"
+class RapideoPlHook(MultiHook):
+ __name__ = "RapideoPlHook"
__type__ = "hook"
__version__ = "0.03"
diff --git a/module/plugins/hooks/RealdebridCom.py b/module/plugins/hooks/RealdebridComHook.py
index 4260940d0..aa0c9f640 100644
--- a/module/plugins/hooks/RealdebridCom.py
+++ b/module/plugins/hooks/RealdebridComHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class RealdebridCom(MultiHook):
- __name__ = "RealdebridCom"
+class RealdebridComHook(MultiHook):
+ __name__ = "RealdebridComHook"
__type__ = "hook"
__version__ = "0.46"
diff --git a/module/plugins/hooks/RehostTo.py b/module/plugins/hooks/RehostToHook.py
index 1e608f87a..a2415129a 100644
--- a/module/plugins/hooks/RehostTo.py
+++ b/module/plugins/hooks/RehostToHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class RehostTo(MultiHook):
- __name__ = "RehostTo"
+class RehostToHook(MultiHook):
+ __name__ = "RehostToHook"
__type__ = "hook"
__version__ = "0.50"
diff --git a/module/plugins/hooks/SimplyPremiumCom.py b/module/plugins/hooks/SimplyPremiumComHook.py
index a5173dbfa..116e3a76e 100644
--- a/module/plugins/hooks/SimplyPremiumCom.py
+++ b/module/plugins/hooks/SimplyPremiumComHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class SimplyPremiumCom(MultiHook):
- __name__ = "SimplyPremiumCom"
+class SimplyPremiumComHook(MultiHook):
+ __name__ = "SimplyPremiumComHook"
__type__ = "hook"
__version__ = "0.05"
diff --git a/module/plugins/hooks/SimplydebridCom.py b/module/plugins/hooks/SimplydebridComHook.py
index a37a6eb7f..01629df99 100644
--- a/module/plugins/hooks/SimplydebridCom.py
+++ b/module/plugins/hooks/SimplydebridComHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class SimplydebridCom(MultiHook):
- __name__ = "SimplydebridCom"
+class SimplydebridComHook(MultiHook):
+ __name__ = "SimplydebridComHook"
__type__ = "hook"
__version__ = "0.04"
diff --git a/module/plugins/hooks/SmoozedCom.py b/module/plugins/hooks/SmoozedComHook.py
index cd9b2fa6e..24b7c8df0 100644
--- a/module/plugins/hooks/SmoozedCom.py
+++ b/module/plugins/hooks/SmoozedComHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class SmoozedCom(MultiHook):
- __name__ = "SmoozedCom"
+class SmoozedComHook(MultiHook):
+ __name__ = "SmoozedComHook"
__type__ = "hook"
__version__ = "0.03"
diff --git a/module/plugins/hooks/UnrestrictLi.py b/module/plugins/hooks/UnrestrictLiHook.py
index 58f31f2aa..f1ffd1886 100644
--- a/module/plugins/hooks/UnrestrictLi.py
+++ b/module/plugins/hooks/UnrestrictLiHook.py
@@ -4,8 +4,8 @@ from module.common.json_layer import json_loads
from module.plugins.internal.MultiHook import MultiHook
-class UnrestrictLi(MultiHook):
- __name__ = "UnrestrictLi"
+class UnrestrictLiHook(MultiHook):
+ __name__ = "UnrestrictLiHook"
__type__ = "hook"
__version__ = "0.05"
diff --git a/module/plugins/hooks/UpdateManager.py b/module/plugins/hooks/UpdateManager.py
index 643b5c2d1..d66810d6d 100644
--- a/module/plugins/hooks/UpdateManager.py
+++ b/module/plugins/hooks/UpdateManager.py
@@ -117,7 +117,7 @@ class UpdateManager(Hook):
return getURL(self.SERVER_URL, get={'v': self.core.api.getServerVersion()}).splitlines()
except Exception:
- self.logWarning(_("Unable to contact server to get updates"))
+ self.logWarning(_("Unable to retrieve server to get updates"))
@Expose
@@ -258,7 +258,7 @@ class UpdateManager(Hook):
if self.core.pluginManager.reloadPlugins(updated):
exitcode = 1
else:
- self.logWarning(_("pyLoad restart required to reload the updated plugins"))
+ self.logWarning(_("Restart pyLoad to reload the updated plugins"))
self.info['plugins'] = True
exitcode = 2
diff --git a/module/plugins/hooks/UserAgentSwitcher.py b/module/plugins/hooks/UserAgentSwitcher.py
new file mode 100644
index 000000000..912c2ef09
--- /dev/null
+++ b/module/plugins/hooks/UserAgentSwitcher.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+import os
+import pycurl
+import random
+
+from module.plugins.Hook import Hook
+from module.utils import fs_encode
+
+
+class UserAgentSwitcher(Hook):
+ __name__ = "UserAgentSwitcher"
+ __type__ = "hook"
+ __version__ = "0.04"
+
+ __config__ = [("activated", "bool", "Activated" , True ),
+ ("uaf" , "file", "Random user-agents file" , "" ),
+ ("uar" , "bool", "Random user-agent" , False ),
+ ("uas" , "str" , "Custom user-agent string", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0")]
+
+ __description__ = """Custom user-agent"""
+ __license__ = "GPLv3"
+ __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+ interval = 0 #@TODO: Remove in 0.4.10
+
+
+ def setup(self):
+ self.info = {} #@TODO: Remove in 0.4.10
+
+
+ def downloadPreparing(self, pyfile):
+ uar = self.getConfig('uar')
+ uaf = fs_encode(self.getConfig('uaf'))
+
+ if uar and os.path.isfile(uaf):
+ with open(uaf) as f:
+ uas = random.choice([ua for ua in f.read().splitlines()])
+ else:
+ uas = self.getConfig('uas')
+
+ if uas:
+ self.logDebug("Use custom user-agent string: " + uas)
+ pyfile.plugin.req.http.c.setopt(pycurl.USERAGENT, uas.encode('utf-8'))
diff --git a/module/plugins/hooks/ZeveraCom.py b/module/plugins/hooks/ZeveraComHook.py
index 7fcfb18da..21c1741d2 100644
--- a/module/plugins/hooks/ZeveraCom.py
+++ b/module/plugins/hooks/ZeveraComHook.py
@@ -3,8 +3,8 @@
from module.plugins.internal.MultiHook import MultiHook
-class ZeveraCom(MultiHook):
- __name__ = "ZeveraCom"
+class ZeveraComHook(MultiHook):
+ __name__ = "ZeveraComHook"
__type__ = "hook"
__version__ = "0.05"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 03:38:31 +0100