fix for rar archives raising different exception

This commit is contained in:
2015-06-22 13:07:17 +01:00
parent f90e734bee
commit e3e37670ff

View File

@@ -29,7 +29,7 @@ class ComicBook(models.Model):
def get_image(self, archive_path, page): def get_image(self, archive_path, page):
try: try:
archive = rarfile.RarFile(archive_path) archive = rarfile.RarFile(archive_path)
except rarfile.BadRarFile: except rarfile.NotRarFile:
archive = zipfile.ZipFile(archive_path) archive = zipfile.ZipFile(archive_path)
except zipfile.BadZipfile: except zipfile.BadZipfile:
return False return False
@@ -127,7 +127,7 @@ class ComicBook(models.Model):
def process_comic_book(base_dir, comic_path, comic_file_name): def process_comic_book(base_dir, comic_path, comic_file_name):
try: try:
cbx = rarfile.RarFile(path.join(base_dir, comic_path)) cbx = rarfile.RarFile(path.join(base_dir, comic_path))
except rarfile.BadRarFile: except rarfile.NotRarFile:
cbx = zipfile.ZipFile(path.join(base_dir, comic_path)) cbx = zipfile.ZipFile(path.join(base_dir, comic_path))
except zipfile.BadZipfile: except zipfile.BadZipfile:
return False return False