From 2d7f6c2e5c64d9f354d676fdaf2b78bf5a4bfcb5 Mon Sep 17 00:00:00 2001
From: retiefjimm <retiefjimm@gmail.com>
Date: Fri, 26 Nov 2010 19:36:53 -0600
Subject: [PATCH] Correct story status for ficwad, change story status for
 fictionalley to 'Unknown' (site doesn't tell us status), change mobi file
 output mode to 'wb'(binary) so it works on windows.

---
 fanficdownloader/fictionalley.py |  2 +-
 fanficdownloader/ficwad.py       | 34 +++++++++++---------------------
 fanficdownloader/output.py       |  2 +-
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/fanficdownloader/fictionalley.py b/fanficdownloader/fictionalley.py
index 68cd36e..b1a3212 100644
--- a/fanficdownloader/fictionalley.py
+++ b/fanficdownloader/fictionalley.py
@@ -69,7 +69,7 @@ class FictionAlley(FanfictionSiteAdapter):
 		self.numWords = 0
 		self.genre = ''
 		self.category = 'Harry Potter'
-		self.storyStatus = 'In-Progress'
+		self.storyStatus = 'Unknown' # fictionalley doesn't give us in-progress/completed anywhere.
 		self.storyRating = 'K'
 		self.storyUserRating = '0'
 		self.storyCharacters = []
diff --git a/fanficdownloader/ficwad.py b/fanficdownloader/ficwad.py
index 058528b..9cb353c 100644
--- a/fanficdownloader/ficwad.py
+++ b/fanficdownloader/ficwad.py
@@ -111,26 +111,20 @@ class FicWad(FanfictionSiteAdapter):
 		
 		meta = soup.find('p', {'class' : 'meta'})
 		if meta is not None:
-			s = unicode(meta).replace('\n',' ').replace('\t','').split(' - ')
-			#logging.debug('meta.s=%s' % s)
+			logging.debug('meta.s pre=%s' % meta.__str__('utf8'))
+			s = re.sub('<[^>]+>','',unicode(meta)).replace('\n',' ').replace('\t','').split(' - ')
+			#logging.debug('meta.s post=%s' % s)
 			for ss in s:
 				s1 = ss.replace('&nbsp;','').split(':')
-				#logging.debug('meta.s.s1=%s' % s1)
+				#logging.debug('ss=%s' % ss)
 				if len(s1) > 1:
-					s2 = re.split ('<[^>]+>', s1[0])
-					#logging.debug('meta.s.s1.s2=%s' % s2)
-					if len(s2) > 1:
-						s1[0] = s2[1]
 					skey = s1[0].strip()
 					#logging.debug('Checking = %s' % skey)
 					if skey == 'Category':
-						soup1 = bs.BeautifulStoneSoup(s1[1])
-						allAs = soup1.findAll('a')
-						for a in allAs:
-							if self.category == 'Category':
-								self.category = unicode(a.string)
-								logging.debug('self.category=%s' % self.category)
-							self.addSubject(self.category)
+						# ficwad doesn't allow multiple categories.
+						self.category = unicode(s1[1])
+						logging.debug('self.category=%s' % self.category)
+						self.addSubject(self.category)
 						logging.debug('self.subjects=%s' % self.subjects)
 					elif skey == 'Rating':
 						self.storyRating = s1[1]
@@ -159,14 +153,10 @@ class FicWad(FanfictionSiteAdapter):
 						self.storyUpdated = datetime.datetime.fromtimestamp(time.mktime(time.strptime(s1[1].strip(' '), "%Y/%m/%d")))
 						logging.debug('self.storyUpdated=%s' % self.storyUpdated)
 				else:
-					s3 = re.split ('<[^>]+>', s1[0])
-					#logging.debug('meta.s.s1.s3=%s' % s3)
-					if len(s3) > 1:
-						s1[0] = s3[0]
-					s4 = s1[0].split('w')
-					#logging.debug('meta.s.s1.s4=%s' % s4)
-					if len(s4) > 1 and s4[1] == 'ords':
-						self.numWords = s4[0]
+					if ss == 'Complete' :
+						self.storyStatus = 'Completed'
+					elif ss.endswith('words'):
+						self.numWords=ss.replace('words','').replace('&nbsp;','')
 						logging.debug('self.numWords=%s' % self.numWords)
 					
 		
diff --git a/fanficdownloader/output.py b/fanficdownloader/output.py
index 10fb619..25487d6 100644
--- a/fanficdownloader/output.py
+++ b/fanficdownloader/output.py
@@ -109,7 +109,7 @@ class MobiWriter(FanficWriter):
 		if self.inmemory:
 			self.output = StringIO.StringIO()
 		else:
-			self.output = open(self.fileName, 'w')
+			self.output = open(self.fileName, 'wb')
 
 		self.xhtmlTemplate = string.Template(html_constants.XHTML_START)
 		self.chapterStartTemplate = string.Template(html_constants.XHTML_CHAPTER_START)