From 9434431c7b847020c4c2bd875be9424c3d911e2e Mon Sep 17 00:00:00 2001 From: retiefjimm Date: Tue, 28 Sep 2010 19:52:30 -0500 Subject: [PATCH] Add twilighted.net(not com) to downaloder.py so it actually *works*. Add one-shot support for twilighted.net. --- downaloder.py | 3 ++- twilighted.py | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/downaloder.py b/downaloder.py index de93c79..e16dab4 100644 --- a/downaloder.py +++ b/downaloder.py @@ -20,6 +20,7 @@ import output import adapter import fictionalley import hpfiction +import twilighted import time @@ -88,7 +89,7 @@ if __name__ == '__main__': adapter = ffnet.FFNet(url) elif url.find('harrypotterfanfiction.com') != -1: adapter = hpfiction.HPFiction(url) - elif url.find('twilighted.com') != -1: + elif url.find('twilighted.net') != -1: adapter = twilighted.Twilighted(url) else: print >> sys.stderr, "Oi! I can haz not appropriate adapter for URL %s!" % url diff --git a/twilighted.py b/twilighted.py index 54ff35d..03bb08c 100644 --- a/twilighted.py +++ b/twilighted.py @@ -74,13 +74,17 @@ class Twilighted(FanfictionSiteAdapter): self.authorName = title.split(' by ')[1].strip() select = soup.find('select', { 'name' : 'chapter' } ) - - allOptions = select.findAll('option') + result = [] - for o in allOptions: - url = self.url + "&chapter=%s" % o['value'] - title = o.string - result.append((url,title)) + if select is None: + # no chapters found, try url by itself. + result.append((self.url,self.storyName)) + else: + allOptions = select.findAll('option') + for o in allOptions: + url = self.url + "&chapter=%s" % o['value'] + title = o.string + result.append((url,title)) return result