From deca000a1b4d345082151910111f911546c74ee4 Mon Sep 17 00:00:00 2001 From: Safihre Date: Mon, 29 Mar 2021 14:05:39 +0200 Subject: [PATCH] Revert some improvements to the encrypted RAR-detection Closes #1840 --- sabnzbd/assembler.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sabnzbd/assembler.py b/sabnzbd/assembler.py index 4d82a4a..843089c 100644 --- a/sabnzbd/assembler.py +++ b/sabnzbd/assembler.py @@ -344,8 +344,9 @@ def check_encrypted_and_unwanted_files(nzo: NzbObject, filepath: str) -> Tuple[b # This one really didn't work pass except rarfile.RarCRCError as e: - # CRC errors can be thrown for wrong password and actual CRC errors - if "wrong password" not in str(e).lower(): + # CRC errors can be thrown for wrong password or + # missing the next volume (with correct password) + if "cannot find volume" in str(e).lower(): # We assume this one worked! password_hit = password break