lordwelch/comictagger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more vebose output for zip errors

Browse Source 
git-svn-id: http://comictagger.googlecode.com/svn/trunk@353 6c5673fe-1810-88d6-992b-cd32ca31540c
This commit is contained in:
beville 2013-01-25 17:20:59 +00:00
parent 8d4a336b50
commit 9aa41823b4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
comicarchive.py
View File

@ -67,11 +67,13 @@ class ZipArchiver:
zf = zipfile.ZipFile( self.path, 'r' )
try:
data = zf.read( archive_file )
except zipfile.BadZipfile:
print "bad zipfile: {0} :: {1}".format(self.path, archive_file)
except zipfile.BadZipfile as e:
print "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
zf.close()
raise IOError
except Exception:
print "bad zipfile: {0} :: {1}".format(self.path, archive_file)
except Exception as e:
zf.close()
print "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
raise IOError
finally:
zf.close()
@ -491,7 +493,9 @@ class UnknownArchiver:
#------------------------------------------------------------------
class ComicArchive:
logo_data = None
class ArchiveType:
Zip, Rar, Folder, Unknown = range(4)
@ -516,6 +520,12 @@ class ComicArchive:
self.archive_type = self.ArchiveType.Unknown
self.archiver = UnknownArchiver( self.path )
if ComicArchive.logo_data is None:
fname = os.path.join(ComicTaggerSettings.baseDir(), 'graphics','nocover.png' )
with open(fname, 'rb') as fd:
ComicArchive.logo_data = fd.read()
print len(ComicArchive.logo_data)
# Clears the cached data
def resetCache( self ):
self.has_cix = None
@ -650,9 +660,7 @@ class ComicArchive:
image_data = self.archiver.readArchiveFile( filename )
except IOError:
print "Error reading in page. Substituting logo page."
fname = os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )
with open(fname) as x:
image_data = x.read()
image_data = ComicArchive.logo_data
return image_data