Moved tagstyle class to comicarchive module

git-svn-id: http://comictagger.googlecode.com/svn/trunk@490 6c5673fe-1810-88d6-992b-cd32ca31540c

comictaggerlib/autotagmatchwindow.py

@@ -26,7 +26,7 @@ from PyQt4.QtCore import QUrl, pyqtSignal, QByteArray
 
 from imagefetcher import  ImageFetcher
 from settings import ComicTaggerSettings
-from options import MetaDataStyle
+from comicarchive import MetaDataStyle
 from coverimagewidget import CoverImageWidget
 from comicvinetalker import ComicVineTalker
 import utils

comictaggerlib/cli.py

@@ -33,8 +33,8 @@ import locale
 filename_encoding = sys.getfilesystemencoding()
 
 from settings import ComicTaggerSettings
-from options import Options, MetaDataStyle
-from comicarchive import ComicArchive
+from options import Options
+from comicarchive import ComicArchive, MetaDataStyle
 from issueidentifier import IssueIdentifier
 from genericmetadata import GenericMetadata
 from comicvinetalker import ComicVineTalker, ComicVineTalkerException
@@ -179,7 +179,8 @@ def cli_mode( opts, settings ):
 	match_results = OnlineMatchResults()
 	
 	for f in opts.file_list:
-		f = f.decode(filename_encoding, 'replace')
+		if type(f) ==  str:
+			f = f.decode(filename_encoding, 'replace')
 		process_file_cli( f, opts, settings, match_results )
 		sys.stdout.flush()
 		
@@ -237,7 +238,7 @@ def process_file_cli( filename, opts, settings, match_results ):
 			brief = ""
 
 			if batch_mode:
-				brief = "{0}: ".format(filename)
+				brief = u"{0}: ".format(filename)
 
 			if ca.isZip():      brief += "ZIP archive    "
 			elif ca.isRar():    brief += "RAR archive    "

comictaggerlib/comicarchive.py

@@ -40,7 +40,6 @@ sys.path.insert(0, os.path.abspath(".") )
 import UnRAR2
 from UnRAR2.rar_exceptions import *
 
-from options import Options, MetaDataStyle
 from comicinfoxml import ComicInfoXml
 from comicbookinfo import ComicBookInfo
 from comet import CoMet
@@ -48,6 +47,12 @@ from genericmetadata import GenericMetadata, PageType
 from filenameparser import FileNameParser
 from settings import ComicTaggerSettings
 
+class MetaDataStyle:
+	CBI = 0
+	CIX = 1
+	COMET = 2
+	name = [ 'ComicBookLover', 'ComicRack', 'CoMet' ]
+
 class ZipArchiver:
 	
 	def __init__( self, path ):

comictaggerlib/coverimagewidget.py

@@ -26,7 +26,7 @@ from PyQt4 import uic
 
 from settings import ComicTaggerSettings
 from genericmetadata import GenericMetadata, PageType
-from options import MetaDataStyle
+from comicarchive import MetaDataStyle
 from comicvinetalker import ComicVineTalker, ComicVineTalkerException
 from imagefetcher import  ImageFetcher
 from pageloader import PageLoader

comictaggerlib/fileselectionlist.py

@@ -29,8 +29,8 @@ from PyQt4.QtCore import pyqtSignal
 
 from settings import ComicTaggerSettings
 from comicarchive import ComicArchive
+from comicarchive import MetaDataStyle
 from genericmetadata import GenericMetadata, PageType
-from options import MetaDataStyle
 import utils
 
 class FileTableWidget( QTableWidget ):