diff --git a/comet.py b/comet.py index a1bf73d..d28bb8f 100644 --- a/comet.py +++ b/comet.py @@ -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 ): diff --git a/comicarchive.py b/comicarchive.py index 2d175f3..b96bd7f 100644 --- a/comicarchive.py +++ b/comicarchive.py @@ -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: