Merge pull request #1388 from GammaC0de/GammaC0de-report-no-send2trash

[ExtractArchive] [AntiVirus] report missing send2trash

1 files changed, 11 insertions, 3 deletions

diff --git a/module/plugins/hooks/AntiVirus.py b/module/plugins/hooks/AntiVirus.py
index ac9373a37..c620f556d 100644
--- a/module/plugins/hooks/AntiVirus.py
+++ b/module/plugins/hooks/AntiVirus.py
@@ -16,7 +16,7 @@ from module.utils import fs_encode, save_join
 class AntiVirus(Hook):
     __name__    = "AntiVirus"
     __type__    = "hook"
-    __version__ = "0.08"
+    __version__ = "0.09"
 
     #@TODO: add trash option (use Send2Trash lib)
     __config__ = [("action"    , "Antivirus default;Delete;Quarantine", "Manage infected files"                     , "Antivirus default"),
@@ -80,11 +80,19 @@ class AntiVirus(Hook):
                             try:
                                 send2trash.send2trash(file)
 
-                            except Exception:
-                                self.logWarning(_("Unable to move file to trash, move to quarantine instead"))
+                            except NameError:
+                                self.logWarning(_("Send2Trash lib not found, moving to quarantine instead"))
                                 pyfile.setCustomStatus(_("file moving"))
                                 shutil.move(file, self.getConfig('quardir'))
 
+                            except Exception, e:
+                                self.logWarning(_("Unable to move file to trash: %s, moving to quarantine instead") % e.message)
+                                pyfile.setCustomStatus(_("file moving"))
+                                shutil.move(file, self.getConfig('quardir'))
+
+                            else:
+                                self.logDebug(_("Successfully moved file to trash"))
+
                     elif action == "Quarantine":
                         pyfile.setCustomStatus(_("file moving"))
                         shutil.move(file, self.getConfig('quardir'))