diff --git a/SABnzbd.py b/SABnzbd.py index 76f46e5..977295a 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -433,6 +433,9 @@ def print_modules(): if sabnzbd.newsunpack.PAR2C_COMMAND: logging.info("par2cmdline binary... found (%s)", sabnzbd.newsunpack.PAR2C_COMMAND) + if sabnzbd.newsunpack.MULTIPAR_COMMAND: + logging.info("MultiPar binary... found (%s)", sabnzbd.newsunpack.MULTIPAR_COMMAND) + if sabnzbd.newsunpack.RAR_COMMAND: logging.info("UNRAR binary... found (%s)", sabnzbd.newsunpack.RAR_COMMAND) diff --git a/sabnzbd/api.py b/sabnzbd/api.py index cc2edd2..2117e98 100644 --- a/sabnzbd/api.py +++ b/sabnzbd/api.py @@ -1526,6 +1526,7 @@ def options_list(output): 'yenc': sabnzbd.decoder.HAVE_YENC, 'par2': sabnzbd.newsunpack.PAR2_COMMAND, 'par2c': sabnzbd.newsunpack.PAR2C_COMMAND, + 'multipar': sabnzbd.newsunpack.MULTIPAR_COMMAND, 'rar': sabnzbd.newsunpack.RAR_COMMAND, 'zip': sabnzbd.newsunpack.ZIP_COMMAND, '7zip': sabnzbd.newsunpack.SEVEN_COMMAND, diff --git a/sabnzbd/newsunpack.py b/sabnzbd/newsunpack.py index ce31729..90ea17d 100644 --- a/sabnzbd/newsunpack.py +++ b/sabnzbd/newsunpack.py @@ -74,6 +74,7 @@ TS_RE = re.compile(r'\.(\d+)\.(ts$)', re.I) PAR2_COMMAND = None PAR2C_COMMAND = None +MULTIPAR_COMMAND = None RAR_COMMAND = None NICE_COMMAND = None ZIP_COMMAND = None @@ -118,10 +119,14 @@ def find_programs(curdir): if sabnzbd.WIN32: if sabnzbd.WIN64 and cfg.allow_64bit_tools.get(): + # 64 bit versions sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, 'win/par2/x64/par2.exe') + sabnzbd.newsunpack.MULTIPAR_COMMAND = check(curdir, 'win/multipar/par2j64.exe') sabnzbd.newsunpack.RAR_COMMAND = check(curdir, 'win/unrar/x64/UnRAR.exe') else: + # 32 bit versions sabnzbd.newsunpack.PAR2_COMMAND = check(curdir, 'win/par2/par2.exe') + sabnzbd.newsunpack.MULTIPAR_COMMAND = check(curdir, 'win/multipar/par2j.exe') sabnzbd.newsunpack.RAR_COMMAND = check(curdir, 'win/unrar/UnRAR.exe') sabnzbd.newsunpack.PAR2C_COMMAND = check(curdir, 'win/par2/par2cmdline.exe') sabnzbd.newsunpack.ZIP_COMMAND = check(curdir, 'win/unzip/unzip.exe') diff --git a/win/par2/multipar/par2j.exe b/win/par2/multipar/par2j.exe new file mode 100644 index 0000000..a106b96 Binary files /dev/null and b/win/par2/multipar/par2j.exe differ diff --git a/win/par2/multipar/par2j64.exe b/win/par2/multipar/par2j64.exe new file mode 100644 index 0000000..62a5011 Binary files /dev/null and b/win/par2/multipar/par2j64.exe differ