diff --git a/fanficfare/adapters/adapter_darksolaceorg.py b/fanficfare/adapters/adapter_darksolaceorg.py
index 817048b..e68e763 100644
--- a/fanficfare/adapters/adapter_darksolaceorg.py
+++ b/fanficfare/adapters/adapter_darksolaceorg.py
@@ -16,321 +16,26 @@
#
# Software: eFiction
-import time
-import logging
-logger = logging.getLogger(__name__)
-import re
-import urllib2
+from base_efiction_adapter import BaseEfictionAdapter
-from .. import BeautifulSoup as bs
-from ..htmlcleanup import stripHTML
-from .. import exceptions as exceptions
+class DarkSolaceOrgAdapter(BaseEfictionAdapter):
-from base_adapter import BaseSiteAdapter, makeDate
+ @staticmethod
+ def getSiteDomain():
+ return 'dark-solace.org'
+ @classmethod
+ def getPathToArchive(self):
+ return '/elysian'
+
+ @classmethod
+ def getSiteAbbrev(self):
+ return 'dksl'
+
+ @classmethod
+ def getDateFormat(self):
+ return "%B %d, %Y"
+
def getClass():
return DarkSolaceOrgAdapter
-
-# Class name has to be unique. Our convention is camel case the
-# sitename with Adapter at the end. www is skipped.
-class DarkSolaceOrgAdapter(BaseSiteAdapter):
-
- def __init__(self, config, url):
- BaseSiteAdapter.__init__(self, config, url)
-
- self.decode = ["Windows-1252",
- "utf8"] # 1252 is a superset of iso-8859-1.
- # Most sites that claim to be
- # iso-8859-1 (and some that claim to be
- # utf8) are really windows-1252.
- self.username = "NoneGiven" # if left empty, site doesn't return any message at all.
- self.password = ""
- self.is_adult=False
-
- # get storyId from url--url validation guarantees query is only sid=1234
- self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1])
-
-
- # normalized story URL.
- self._setURL('http://' + self.getSiteDomain() + '/elysian/viewstory.php?sid='+self.story.getMetadata('storyId'))
-
- # Each adapter needs to have a unique site abbreviation.
- self.story.setMetadata('siteabbrev','dksl')
-
- # The date format will vary from site to site.
- # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
- self.dateformat = "%B %d, %Y"
-
- @staticmethod # must be @staticmethod, don't remove it.
- def getSiteDomain():
- # The site domain. Does have www here, if it uses it.
- return 'dark-solace.org'
-
- @classmethod
- def getAcceptDomains(cls):
- return ['www.dark-solace.org','dark-solace.org']
-
- @classmethod
- def getSiteExampleURLs(cls):
- return "http://"+cls.getSiteDomain()+"/elysian/viewstory.php?sid=1234"
-
- def getSiteURLPattern(self):
- return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/elysian/viewstory.php?sid=")+r"\d+$"
-
- ## Login seems to be reasonably standard across eFiction sites.
- def needToLoginCheck(self, data):
- if 'This story contains adult content not suitable for children' in data \
- or "That password doesn't match the one in our database" in data \
- or "Registered Users Only" in data:
- return True
- else:
- return False
-
- def performLogin(self, url):
- params = {}
-
- if self.password:
- params['penname'] = self.username
- params['password'] = self.password
- else:
- params['penname'] = self.getConfig("username")
- params['password'] = self.getConfig("password")
- params['action'] = 'login'
- params['submit'] = 'Submit'
- loginUrl = 'http://www.' + self.getSiteDomain() + '/elysian/user.php'
- logger.debug("Will now login to URL (%s) as (%s)" % (loginUrl,
- params['penname']))
-
- d = self._postUrl(loginUrl, params)
-
- if "Member Account" not in d : #User Account Page
- logger.info("Failed to login to URL %s as %s, or have no authorization to access the story" % (loginUrl, params['penname']))
- raise exceptions.FailedToLogin(url,params['penname'])
- return False
- else:
- return True
-
- ## Getting the chapter list and the meta data, plus 'is adult' checking.
- def extractChapterUrlsAndMetadata(self):
-
- if self.is_adult or self.getConfig("is_adult"):
- # Weirdly, different sites use different warning numbers.
- # If the title search below fails, there's a good chance
- # you need a different number. print data at that point
- # and see what the 'click here to continue' url says.
- addurl = "&ageconsent=ok&warning=5"
- else:
- addurl=""
-
- # index=1 makes sure we see the story chapter index. Some
- # sites skip that for one-chapter stories.
- url = self.url+'&index=1'+addurl
- logger.debug("URL: "+url)
-
- try:
- data = self._fetchUrl(url)
- except urllib2.HTTPError, e:
- if e.code == 404:
- raise exceptions.StoryDoesNotExist(self.url)
- else:
- raise e
-
- if self.needToLoginCheck(data):
- # need to log in for this one.
- self.performLogin(url)
- data = self._fetchUrl(url)
-
- m = re.search(r"'viewstory.php\?sid=\d+((?:&ageconsent=ok)?&warning=\d+)'",data)
- if m != None:
- if self.is_adult or self.getConfig("is_adult"):
- # We tried the default and still got a warning, so
- # let's pull the warning number from the 'continue'
- # link and reload data.
- addurl = m.group(1)
- # correct stupid & error in url.
- addurl = addurl.replace("&","&")
- url = self.url+'&index=1'+addurl
- logger.debug("URL 2nd try: "+url)
-
- try:
- data = self._fetchUrl(url)
- except urllib2.HTTPError, e:
- if e.code == 404:
- raise exceptions.StoryDoesNotExist(self.url)
- else:
- raise e
- else:
- raise exceptions.AdultCheckRequired(self.url)
-
- if "Access denied. This story has not been validated by the adminstrators of this site." in data:
- raise exceptions.FailedToDownload(self.getSiteDomain() +" says: Access denied. This story has not been validated by the adminstrators of this site.")
-
- # use BeautifulSoup HTML parser to make everything easier to find.
- soup = bs.BeautifulSoup(data)
- # print data
-
- # Now go hunting for all the meta data and the chapter list.
-
- ## Title and author
- div = soup.find('div', {'id' : 'pagetitle'})
-
- aut = div.find('a', href=re.compile(r"viewuser.php\?uid=\d+"))
- self.story.setMetadata('authorId',aut['href'].split('=')[1])
- self.story.setMetadata('authorUrl','http://'+self.host+'/elysian/'+aut['href'])
- self.story.setMetadata('author',aut.string)
- aut.extract()
-
- # first a tag in pagetitle is title
- self.story.setMetadata('title',stripHTML(div.find('a')))
- div.find('a').extract()
- # only thing left in div(pagetitle) now should be 'by' and rating.
- rating = stripHTML(div)
- if '[' in rating:
- self.story.setMetadata('rating', rating[rating.index('[')+1:-1])
-
- for chapa in soup.findAll('a', href=re.compile(r'viewstory.php\?sid='+
- self.story.getMetadata('storyId')+'&chapter=\d+')):
- self.chapterUrls.append((stripHTML(chapa),'http://'+self.host+'/elysian/'+chapa['href']))
-
- self.story.setMetadata('numChapters',len(self.chapterUrls))
-
- asoup = bs.BeautifulSoup(self._fetchUrl(self.story.getMetadata('authorUrl')))
- storylink = asoup.find('a', href=re.compile(r'viewstory.php\?sid='+
- self.story.getMetadata('storyId')+'($|[^\d])'))
- # author's story list is paginated if there's a pagelinks div.
- # Only need to look in it if the story wasn't on the first page.
- pagelinks = asoup.find('div',{'id':'pagelinks'})
- if pagelinks and storylink==None:
- authpageslist = pagelinks.findAll('a',href=re.compile(r'action=storiesby'))
- for page in authpageslist[1:]: # skip first, already checked above.
- asoup = bs.BeautifulSoup(self._fetchUrl('http://'+self.host+'/elysian/'+page['href']))
- storylink = asoup.find('a', href=re.compile(r'viewstory.php\?sid='+
- self.story.getMetadata('storyId')+'($|[^\d])'))
- if storylink:
- break
-
- if not storylink:
- raise exceptions.FailedToDownload("Unable to find story metadata on author's page(s)")
-
- metalist = storylink.parent.parent
- # eFiction sites don't help us out a lot with their meta data
- # formating, so it's a little ugly.
-
- # utility method
- def defaultGetattr(d,k):
- try:
- return d[k]
- except:
- return ""
-
-
- # Rated: NC-17
etc
- labels = metalist.findAll('span', {'class' : 'label'})
- for labelspan in labels:
- label = labelspan.text
- value = labelspan.nextSibling
-
- if 'Summary' in label:
- ## Everything until the next span class='label'
- svalue = ""
- while value and not (defaultGetattr(value,'class') == 'label' or "Chapters: " in stripHTML(value)):
- svalue += str(value)
- value = value.nextSibling
- self.setDescription(url,svalue)
- #self.story.setMetadata('description',stripHTML(svalue))
-
- if 'Word count' in label:
- self.story.setMetadata('numWords', value)
-
- if 'Categories' in label:
- cats = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=categories'))
- for cat in cats:
- self.story.addToList('category',cat.string)
-
- if 'Characters' in label:
- chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters'))
- for char in chars:
- self.story.addToList('characters',char.string)
-
- if 'Genre' in label:
- genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=1'))
- for genre in genres:
- self.story.addToList('genre',genre.string)
-
- if 'Warnings' in label:
- warnings = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=2'))
- for warning in warnings:
- self.story.addToList('warnings',warning.string)
-
- if 'Completed' in label:
- if 'Yes' in value:
- self.story.setMetadata('status', 'Completed')
- else:
- self.story.setMetadata('status', 'In-Progress')
-
- if 'Published' in label:
- self.story.setMetadata('datePublished', makeDate(stripHTML(value), self.dateformat))
-
- if 'Updated' in label:
- # there's a stray [ at the end.
- #value = value[0:-1]
- self.story.setMetadata('dateUpdated', makeDate(stripHTML(value), self.dateformat))
-
- try:
- # Find Series name from series URL.
- a = metalist.find('a', href=re.compile(r"series.php\?seriesid=\d+"))
- series_name = a.string
- series_url = 'http://'+self.host+'/elysian/'+a['href']
-
- # use BeautifulSoup HTML parser to make everything easier to find.
- seriessoup = bs.BeautifulSoup(self._fetchUrl(series_url))
- # can't use ^viewstory...$ in case of higher rated stories with javascript href.
- storylink = seriessoup.find('a', href=re.compile(r'viewstory.php\?sid='+
- self.story.getMetadata('storyId')+'($|[^\d])'))
- if storylink and storylink.parent and storylink.parent['class'] != 'title': # in case of links inside story summaries.
- storylink = None
-
- offset = 0
- # series story list is paginated if there's a pagelinks div.
- # Only need to look in it if the story wasn't on the first page.
- pagelinks = seriessoup.find('div',{'id':'pagelinks'})
- if pagelinks and storylink==None:
- authpageslist = pagelinks.findAll('a',href=re.compile(r'offset='))
- for page in authpageslist[1:]: # skip first, already checked above.
- seriessoup = bs.BeautifulSoup(self._fetchUrl('http://'+self.host+'/elysian/'+page['href']))
- storylink = seriessoup.find('a', href=re.compile(r'viewstory.php\?sid='+
- self.story.getMetadata('storyId')+'($|[^\d])'))
- if storylink and storylink.parent and storylink.parent['class'] != 'title': # in case of links inside story summaries.
- storylink = None
- if storylink:
- offset = int(page['href'].split('=')[-1]) # offset is last.
- break
-
- # for reasons I don't understand, searching for story
- # links by regex wasn't working reliably. It was missing
- # the javascript links sometimes. This is cleaner anyway.
- for i, div in enumerate(seriessoup.findAll('div', {'class':'title'})):
- a = div.find('a') # first a is story link.
- # skip 'report this' and 'TOC' links
- if a == storylink:
- self.setSeries(series_name, 1+i+offset)
- self.story.setMetadata('seriesUrl',series_url)
- break
-
- except Exception, e:
- logger.debug("Series parsing failed: %s"%e)
-
- # grab the text for an individual chapter.
- def getChapterText(self, url):
-
- logger.debug('Getting chapter text from: %s' % url)
-
- soup = bs.BeautifulSoup(self._fetchUrl(url))
-
- div = soup.find('div', {'id' : 'story'})
-
- if None == div:
- raise exceptions.FailedToDownload("Error downloading Chapter: %s! Missing required element!" % url)
-
- return self.utf8FromSoup(url,div)