some more CoMet stuff

git-svn-id: http://comictagger.googlecode.com/svn/trunk@193 6c5673fe-1810-88d6-992b-cd32ca31540c
This commit is contained in:
beville 2012-12-04 01:15:12 +00:00
parent deeeef90a6
commit b385be4338
2 changed files with 4 additions and 14 deletions

View File

@ -34,18 +34,6 @@ class CoMet:
letterer_synonyms = [ 'letterer']
cover_synonyms = [ 'cover', 'covers', 'coverartist', 'cover artist' ]
editor_synonyms = [ 'editor']
def getParseableCredits( self ):
parsable_credits = []
parsable_credits.extend( self.writer_synonyms )
parsable_credits.extend( self.penciller_synonyms )
parsable_credits.extend( self.inker_synonyms )
parsable_credits.extend( self.colorist_synonyms )
parsable_credits.extend( self.letterer_synonyms )
parsable_credits.extend( self.cover_synonyms )
parsable_credits.extend( self.editor_synonyms )
return parsable_credits
def metadataFromString( self, string ):

View File

@ -589,7 +589,7 @@ class ComicArchive:
def readRawCIX( self ):
if not self.hasCIX():
print self.path, "doesn't has ComicInfo.xml data!"
print self.path, "doesn't have ComicInfo.xml data!"
return None
return self.archiver.readArchiveFile( self.ci_xml_filename )
@ -624,7 +624,7 @@ class ComicArchive:
def readRawCoMet( self ):
if not self.hasCoMet():
print self.path, "doesn't has CoMet data!"
print self.path, "doesn't have CoMet data!"
return None
return self.archiver.readArchiveFile( self.comet_filename )
@ -644,6 +644,8 @@ class ComicArchive:
def hasCoMet(self):
if not self.seemsToBeAComicArchive():
return False
#TODO look at all xml files in root, and search for CoMet data, get first
#TODO if doesn't exist, use default
elif self.comet_filename in self.archiver.getArchiveFilenameList():
return True
else: