From d12e9889e75ee49d1644dc588e4de9cd5540358a Mon Sep 17 00:00:00 2001
From: shypike <shypike@sabnzbd.org>
Date: Tue, 9 Apr 2013 19:30:25 +0200
Subject: [PATCH] Make encryption detection more careful.

---
 sabnzbd/assembler.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py
index f2f7c41..e66337d 100644
--- a/sabnzbd/assembler.py
+++ b/sabnzbd/assembler.py
@@ -292,8 +292,12 @@ def is_cloaked(path, names):
     fname = unicoder(os.path.split(path)[1]).lower()
     for name in names:
         name = os.path.split(name.lower())[1]
-        name, ext = os.path.splitext(unicoder(name))
-        if (fname.startswith(name) and ext == '.rar') or 'password' in name:
+        ext = os.path.splitext(unicoder(name))[1]
+        if (ext == '.rar' and fname == name):
+            logging.debug('File %s is probably encrypted due to RAR with same name inside this RAR', fname)
+            return True
+        elif 'password' in name:
+            logging.debug('RAR %s is probably encrypted: "password" in filename %s', fname, name)
             return True
     return False