Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 95 insertions, 0 deletions

diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py
new file mode 100644
index 000000000..cc3c5c754
--- /dev/null
+++ b/module/plugins/hooks/AntiVirus.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shutil
+import subprocess
+
+from module.plugins.Hook import Hook, Expose, threaded
+from module.utils import fs_encode, save_join
+
+
+class AntiVirus(Hook):
+    __name__    = "AntiVirus"
+    __type__    = "hook"
+    __version__ = "0.05"
+
+    #@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              )]
+
+    __description__ = """Scan downloaded files with antivirus program"""
+    __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
+
+
+    @Expose
+    @threaded
+    def scan(self, pyfile, thread):
+        file     = fs_encode(pyfile.plugin.lastDownload)
+        filename = os.path.basename(pyfile.plugin.lastDownload)
+        cmdfile  = fs_encode(self.getConfig('cmdfile'))
+        cmdargs  = fs_encode(self.getConfig('cmdargs').strip())
+
+        if not os.path.isfile(file) or not os.path.isfile(cmdfile):
+            return
+
+        thread.addActive(pyfile)
+        pyfile.setCustomStatus(_("virus scanning"))
+
+        try:
+            p = subprocess.Popen([cmdfile, cmdargs, file], bufsize=-1, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+            out, err = map(str.strip, p.communicate())
+
+            if out:
+                self.logInfo(filename, out)
+
+            if err:
+                self.logWarning(filename, err)
+                if not self.getConfig('ignore-err'):
+                    self.logDebug("Delete/Quarantine task is aborted")
+                    return
+
+            if p.returncode:
+                pyfile.error = _("infected file")
+                action = self.getConfig('action')
+                try:
+                    if action == "Delete":
+                        os.remove(file)
+
+                    elif action == "Quarantine":
+                        pyfile.setCustomStatus(_("file moving"))
+                        pyfile.setProgress(0)
+                        shutil.move(file, self.getConfig('quardir'))
+
+                except (IOError, shutil.Error), e:
+                    self.logError(filename, action + " action failed!", e)
+
+            elif not out and not err:
+                self.logDebug(filename, "No infected file found")
+
+        finally:
+            pyfile.setProgress(100)
+            thread.finishFile(pyfile)
+
+
+    def downloadFinished(self, pyfile):
+        return self.scan(pyfile)
+
+
+    def downloadFailed(self, pyfile):
+        #: Check if pyfile is still "failed",
+        #  maybe might has been restarted in meantime
+        if pyfile.status == 8 and self.getConfig('scanfailed'):
+            return self.scan(pyfile)