From ac8ef286a4060a7fad4d2b92b060f58dea267cb8 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Tue, 23 Jul 2013 17:06:35 +0000 Subject: [PATCH] Perform the rar test first, since some rars can be falsly identified as zips, somehow... git-svn-id: http://comictagger.googlecode.com/svn/trunk@641 6c5673fe-1810-88d6-992b-cd32ca31540c --- comictaggerlib/comicarchive.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/comictaggerlib/comicarchive.py b/comictaggerlib/comicarchive.py index 8114581..4a8fb6b 100644 --- a/comictaggerlib/comicarchive.py +++ b/comictaggerlib/comicarchive.py @@ -517,14 +517,14 @@ class ComicArchive: self.resetCache() self.settings = settings - if self.zipTest(): - self.archive_type = self.ArchiveType.Zip - self.archiver = ZipArchiver( self.path ) - - elif self.rarTest(): + if self.rarTest(): self.archive_type = self.ArchiveType.Rar self.archiver = RarArchiver( self.path, settings ) + elif self.zipTest(): + self.archive_type = self.ArchiveType.Zip + self.archiver = ZipArchiver( self.path ) + elif os.path.isdir( self.path ): self.archive_type = self.ArchiveType.Folder self.archiver = FolderArchiver( self.path )