diff --git a/fanficdownloader/adapters/adapter_adastrafanficcom.py b/fanficdownloader/adapters/adapter_adastrafanficcom.py index 628b1b5..9c71284 100644 --- a/fanficdownloader/adapters/adapter_adastrafanficcom.py +++ b/fanficdownloader/adapters/adapter_adastrafanficcom.py @@ -42,7 +42,7 @@ class AdAstraFanficComSiteAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_archiveofourownorg.py b/fanficdownloader/adapters/adapter_archiveofourownorg.py index af48e3c..ac54f2e 100644 --- a/fanficdownloader/adapters/adapter_archiveofourownorg.py +++ b/fanficdownloader/adapters/adapter_archiveofourownorg.py @@ -51,13 +51,13 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[2]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # get storyId from url--url validation guarantees query correct m = re.match(self.getSiteURLPattern(),url) if m: self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/works/'+self.story.getMetadata('storyId')) else: diff --git a/fanficdownloader/adapters/adapter_archiveskyehawkecom.py b/fanficdownloader/adapters/adapter_archiveskyehawkecom.py index 1089b0d..0cbfcbd 100644 --- a/fanficdownloader/adapters/adapter_archiveskyehawkecom.py +++ b/fanficdownloader/adapters/adapter_archiveskyehawkecom.py @@ -49,7 +49,7 @@ class ArchiveSkyeHawkeComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/story.php?no='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py b/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py index 61d5c04..9af3bbf 100644 --- a/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py @@ -48,7 +48,7 @@ class AshwinderSycophantHexComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_asr3slashzoneorg.py b/fanficdownloader/adapters/adapter_asr3slashzoneorg.py index 04a0459..56fa9c5 100644 --- a/fanficdownloader/adapters/adapter_asr3slashzoneorg.py +++ b/fanficdownloader/adapters/adapter_asr3slashzoneorg.py @@ -46,7 +46,7 @@ class Asr3SlashzoneOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/archive/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_bloodtiesfancom.py b/fanficdownloader/adapters/adapter_bloodtiesfancom.py index 01dc557..c9f0eb1 100644 --- a/fanficdownloader/adapters/adapter_bloodtiesfancom.py +++ b/fanficdownloader/adapters/adapter_bloodtiesfancom.py @@ -70,7 +70,7 @@ class BloodTiesFansComAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /fanfic part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_buffynfaithnet.py b/fanficdownloader/adapters/adapter_buffynfaithnet.py index d73a438..76b4b11 100644 --- a/fanficdownloader/adapters/adapter_buffynfaithnet.py +++ b/fanficdownloader/adapters/adapter_buffynfaithnet.py @@ -58,7 +58,7 @@ class BuffyNFaithNetAdapter(BaseSiteAdapter): m = re.match(self.getSiteURLPattern(),url) if m: self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. gets rid of chapter if there, left with ch 1 URL on this site nurl = "http://"+self.getSiteDomain()+"/fanfictions/index.php?act=vie&id="+self.story.getMetadata('storyId') self._setURL(nurl) @@ -69,7 +69,7 @@ class BuffyNFaithNetAdapter(BaseSiteAdapter): raise exceptions.InvalidStoryURL(url, self.getSiteDomain(), self.getSiteExampleURLs()) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # Each adapter needs to have a unique site abbreviation. self.story.setMetadata('siteabbrev','bnfnet') diff --git a/fanficdownloader/adapters/adapter_castlefansorg.py b/fanficdownloader/adapters/adapter_castlefansorg.py index 81fc66f..60f8607 100644 --- a/fanficdownloader/adapters/adapter_castlefansorg.py +++ b/fanficdownloader/adapters/adapter_castlefansorg.py @@ -72,7 +72,7 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /fanfic part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_chaossycophanthexcom.py b/fanficdownloader/adapters/adapter_chaossycophanthexcom.py index 3c01ea4..8160b1e 100644 --- a/fanficdownloader/adapters/adapter_chaossycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_chaossycophanthexcom.py @@ -48,7 +48,7 @@ class ChaosSycophantHexComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_checkmatedcom.py b/fanficdownloader/adapters/adapter_checkmatedcom.py index c0813f9..72be1f4 100644 --- a/fanficdownloader/adapters/adapter_checkmatedcom.py +++ b/fanficdownloader/adapters/adapter_checkmatedcom.py @@ -48,7 +48,7 @@ class CheckmatedComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + self._setURL('http://' + self.getSiteDomain() + '/story.php?story='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_darksolaceorg.py b/fanficdownloader/adapters/adapter_darksolaceorg.py index ac4356f..2cc3552 100644 --- a/fanficdownloader/adapters/adapter_darksolaceorg.py +++ b/fanficdownloader/adapters/adapter_darksolaceorg.py @@ -48,7 +48,7 @@ class DarkSolaceOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/elysian/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_destinysgatewaycom.py b/fanficdownloader/adapters/adapter_destinysgatewaycom.py index fe68619..61b300a 100644 --- a/fanficdownloader/adapters/adapter_destinysgatewaycom.py +++ b/fanficdownloader/adapters/adapter_destinysgatewaycom.py @@ -48,7 +48,7 @@ class DestinysGatewayComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_dokugacom.py b/fanficdownloader/adapters/adapter_dokugacom.py index 6870d59..826b7c9 100644 --- a/fanficdownloader/adapters/adapter_dokugacom.py +++ b/fanficdownloader/adapters/adapter_dokugacom.py @@ -48,7 +48,7 @@ class DokugaComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[3]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # www.dokuga.com has two 'sections', shown in URL as # 'fanfiction' and 'spark' that change how things should be diff --git a/fanficdownloader/adapters/adapter_dotmoonnet.py b/fanficdownloader/adapters/adapter_dotmoonnet.py index 1040291..af6cfa3 100644 --- a/fanficdownloader/adapters/adapter_dotmoonnet.py +++ b/fanficdownloader/adapters/adapter_dotmoonnet.py @@ -48,7 +48,7 @@ class DotMoonNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. www.dotmoon.net/library_view.php?storyid=3 self._setURL('http://' + self.getSiteDomain() + '/library_view.php?storyid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_dracoandginnycom.py b/fanficdownloader/adapters/adapter_dracoandginnycom.py index e10624c..c1b5b5d 100644 --- a/fanficdownloader/adapters/adapter_dracoandginnycom.py +++ b/fanficdownloader/adapters/adapter_dracoandginnycom.py @@ -48,7 +48,7 @@ class DracoAndGinnyComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_dramioneorg.py b/fanficdownloader/adapters/adapter_dramioneorg.py index bc644f9..f3b4a46 100644 --- a/fanficdownloader/adapters/adapter_dramioneorg.py +++ b/fanficdownloader/adapters/adapter_dramioneorg.py @@ -48,7 +48,7 @@ class DramioneOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_efictionestelielde.py b/fanficdownloader/adapters/adapter_efictionestelielde.py index 0cf059f..8036278 100644 --- a/fanficdownloader/adapters/adapter_efictionestelielde.py +++ b/fanficdownloader/adapters/adapter_efictionestelielde.py @@ -48,7 +48,7 @@ class EfictionEstelielDeAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_efpfanficnet.py b/fanficdownloader/adapters/adapter_efpfanficnet.py index ca36e11..fca6bd6 100644 --- a/fanficdownloader/adapters/adapter_efpfanficnet.py +++ b/fanficdownloader/adapters/adapter_efpfanficnet.py @@ -48,7 +48,7 @@ class EFPFanFicNet(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) @@ -166,7 +166,7 @@ class EFPFanFicNet(BaseSiteAdapter): logger.debug("Normalizing to URL: "+url) self._setURL(url) self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # eFiction sites don't help us out a lot with their meta data # formating, so it's a little ugly. diff --git a/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py b/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py index 4327369..4602ae7 100644 --- a/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py @@ -48,7 +48,7 @@ class ErosnSapphoSycophantHexComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_fanfiktionde.py b/fanficdownloader/adapters/adapter_fanfiktionde.py index df3644b..0ad6332 100644 --- a/fanficdownloader/adapters/adapter_fanfiktionde.py +++ b/fanficdownloader/adapters/adapter_fanfiktionde.py @@ -50,7 +50,7 @@ class FanFiktionDeAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[2]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/s/'+self.story.getMetadata('storyId') + '/1') diff --git a/fanficdownloader/adapters/adapter_ficbooknet.py b/fanficdownloader/adapters/adapter_ficbooknet.py index e66ec85..33cde7f 100644 --- a/fanficdownloader/adapters/adapter_ficbooknet.py +++ b/fanficdownloader/adapters/adapter_ficbooknet.py @@ -52,7 +52,7 @@ class FicBookNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[2]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/readfic/'+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_fictionalleyorg.py b/fanficdownloader/adapters/adapter_fictionalleyorg.py index b5bf671..67787aa 100644 --- a/fanficdownloader/adapters/adapter_fictionalleyorg.py +++ b/fanficdownloader/adapters/adapter_fictionalleyorg.py @@ -45,7 +45,7 @@ class FictionAlleyOrgSiteAdapter(BaseSiteAdapter): if m: self.story.setMetadata('authorId',m.group('auth')) self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL(url) else: diff --git a/fanficdownloader/adapters/adapter_finestoriescom.py b/fanficdownloader/adapters/adapter_finestoriescom.py index e0279ae..2bb4239 100644 --- a/fanficdownloader/adapters/adapter_finestoriescom.py +++ b/fanficdownloader/adapters/adapter_finestoriescom.py @@ -50,7 +50,7 @@ class FineStoriesComAdapter(BaseSiteAdapter): self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[2].split(':')[0]) if 'storyInfo' in self.story.getMetadata('storyId'): self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/s/storyInfo.php?id='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_grangerenchantedcom.py b/fanficdownloader/adapters/adapter_grangerenchantedcom.py index df5740b..cb9caf7 100644 --- a/fanficdownloader/adapters/adapter_grangerenchantedcom.py +++ b/fanficdownloader/adapters/adapter_grangerenchantedcom.py @@ -48,7 +48,7 @@ class GrangerEnchantedCom(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + self.section=self.parsedUrl.path.split('/',)[1] # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_harrypotterfanfictioncom.py b/fanficdownloader/adapters/adapter_harrypotterfanfictioncom.py index f0cacf0..7a012dc 100644 --- a/fanficdownloader/adapters/adapter_harrypotterfanfictioncom.py +++ b/fanficdownloader/adapters/adapter_harrypotterfanfictioncom.py @@ -42,7 +42,7 @@ class HarryPotterFanFictionComSiteAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only psid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?psid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_hennethannunnet.py b/fanficdownloader/adapters/adapter_hennethannunnet.py index 4c88b71..015fdcf 100644 --- a/fanficdownloader/adapters/adapter_hennethannunnet.py +++ b/fanficdownloader/adapters/adapter_hennethannunnet.py @@ -48,7 +48,7 @@ class HennethAnnunNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/stories/chapter.cfm?stid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_hlfictionnet.py b/fanficdownloader/adapters/adapter_hlfictionnet.py index 6e8e613..c7edf4b 100644 --- a/fanficdownloader/adapters/adapter_hlfictionnet.py +++ b/fanficdownloader/adapters/adapter_hlfictionnet.py @@ -48,7 +48,7 @@ class HLFictionNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_hpfandomnet.py b/fanficdownloader/adapters/adapter_hpfandomnet.py index 8d3c2d8..a2aabd8 100644 --- a/fanficdownloader/adapters/adapter_hpfandomnet.py +++ b/fanficdownloader/adapters/adapter_hpfandomnet.py @@ -52,7 +52,7 @@ class HPFandomNetAdapterAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /eff part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py index 7fb386a..a7b8fee 100644 --- a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py +++ b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py @@ -53,7 +53,7 @@ class HPFanficArchiveComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/stories/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_iketernalnet.py b/fanficdownloader/adapters/adapter_iketernalnet.py index 3fb686b..dd2aa1b 100644 --- a/fanficdownloader/adapters/adapter_iketernalnet.py +++ b/fanficdownloader/adapters/adapter_iketernalnet.py @@ -48,7 +48,7 @@ class IkEternalNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_imagineeficcom.py b/fanficdownloader/adapters/adapter_imagineeficcom.py index 46d6f19..b524fdd 100644 --- a/fanficdownloader/adapters/adapter_imagineeficcom.py +++ b/fanficdownloader/adapters/adapter_imagineeficcom.py @@ -48,7 +48,7 @@ class ImagineEFicComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_indeathnet.py b/fanficdownloader/adapters/adapter_indeathnet.py index 8f5fce9..4988bef 100644 --- a/fanficdownloader/adapters/adapter_indeathnet.py +++ b/fanficdownloader/adapters/adapter_indeathnet.py @@ -51,7 +51,7 @@ class InDeathNetAdapter(BaseSiteAdapter): m = re.match(self.getSiteURLPattern(),url) if m: self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://www.' + self.getSiteDomain() + '/blog/archive/'+self.story.getMetadata('storyId')+'-'+m.group('name')+'/') else: diff --git a/fanficdownloader/adapters/adapter_ksarchivecom.py b/fanficdownloader/adapters/adapter_ksarchivecom.py index 65627d3..96fd224 100644 --- a/fanficdownloader/adapters/adapter_ksarchivecom.py +++ b/fanficdownloader/adapters/adapter_ksarchivecom.py @@ -52,7 +52,7 @@ class KSArchiveComAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /fanfic part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_libraryofmoriacom.py b/fanficdownloader/adapters/adapter_libraryofmoriacom.py index f76e23b..57083b2 100644 --- a/fanficdownloader/adapters/adapter_libraryofmoriacom.py +++ b/fanficdownloader/adapters/adapter_libraryofmoriacom.py @@ -49,7 +49,7 @@ class LibraryOfMoriaComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/a/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_lumossycophanthexcom.py b/fanficdownloader/adapters/adapter_lumossycophanthexcom.py index 6e06537..07c416b 100644 --- a/fanficdownloader/adapters/adapter_lumossycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_lumossycophanthexcom.py @@ -48,7 +48,7 @@ class LumosSycophantHexComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_mediaminerorg.py b/fanficdownloader/adapters/adapter_mediaminerorg.py index 3cd8683..93d7abe 100644 --- a/fanficdownloader/adapters/adapter_mediaminerorg.py +++ b/fanficdownloader/adapters/adapter_mediaminerorg.py @@ -43,7 +43,7 @@ class MediaMinerOrgSiteAdapter(BaseSiteAdapter): m = re.match(self.getSiteURLPattern(),url) if m: self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/fanfic/view_st.php/'+self.story.getMetadata('storyId')) else: diff --git a/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py b/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py index d724e21..480e454 100644 --- a/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py +++ b/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py @@ -48,7 +48,7 @@ class MerlinFicDtwinsCoUk(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_midnightwhispersca.py b/fanficdownloader/adapters/adapter_midnightwhispersca.py index d7ab59a..d919772 100644 --- a/fanficdownloader/adapters/adapter_midnightwhispersca.py +++ b/fanficdownloader/adapters/adapter_midnightwhispersca.py @@ -52,7 +52,7 @@ class MidnightwhispersCaAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /fanfic part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_mugglenetcom.py b/fanficdownloader/adapters/adapter_mugglenetcom.py index f40e5d0..d3bf5a2 100644 --- a/fanficdownloader/adapters/adapter_mugglenetcom.py +++ b/fanficdownloader/adapters/adapter_mugglenetcom.py @@ -52,7 +52,7 @@ class MuggleNetComAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_nationallibrarynet.py b/fanficdownloader/adapters/adapter_nationallibrarynet.py index 9aeee8d..c4ad08d 100644 --- a/fanficdownloader/adapters/adapter_nationallibrarynet.py +++ b/fanficdownloader/adapters/adapter_nationallibrarynet.py @@ -48,7 +48,7 @@ class NationalLibraryNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only storyid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?storyid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_ncisficcom.py b/fanficdownloader/adapters/adapter_ncisficcom.py index 41d187b..85d7a6e 100644 --- a/fanficdownloader/adapters/adapter_ncisficcom.py +++ b/fanficdownloader/adapters/adapter_ncisficcom.py @@ -48,7 +48,7 @@ class NCISFicComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only storyid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?storyid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_ncisfictionnet.py b/fanficdownloader/adapters/adapter_ncisfictionnet.py index 9b1f987..f057c8f 100644 --- a/fanficdownloader/adapters/adapter_ncisfictionnet.py +++ b/fanficdownloader/adapters/adapter_ncisfictionnet.py @@ -53,7 +53,7 @@ class NCISFictionNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL("http://"+self.getSiteDomain()\ diff --git a/fanficdownloader/adapters/adapter_netraptororg.py b/fanficdownloader/adapters/adapter_netraptororg.py index 888a0b2..86082f4 100644 --- a/fanficdownloader/adapters/adapter_netraptororg.py +++ b/fanficdownloader/adapters/adapter_netraptororg.py @@ -46,7 +46,7 @@ class NetRaptorOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/fanfiction/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_nfacommunitycom.py b/fanficdownloader/adapters/adapter_nfacommunitycom.py index 109b2c4..01cdb42 100644 --- a/fanficdownloader/adapters/adapter_nfacommunitycom.py +++ b/fanficdownloader/adapters/adapter_nfacommunitycom.py @@ -52,7 +52,7 @@ class NfaCommunityComAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /fanfic part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_nhamagicalworldsus.py b/fanficdownloader/adapters/adapter_nhamagicalworldsus.py index cf4e07f..f8574f9 100644 --- a/fanficdownloader/adapters/adapter_nhamagicalworldsus.py +++ b/fanficdownloader/adapters/adapter_nhamagicalworldsus.py @@ -48,7 +48,7 @@ class NHAMagicalWorldsUsAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_nickandgregnet.py b/fanficdownloader/adapters/adapter_nickandgregnet.py index a02be34..9ece5a8 100644 --- a/fanficdownloader/adapters/adapter_nickandgregnet.py +++ b/fanficdownloader/adapters/adapter_nickandgregnet.py @@ -48,7 +48,7 @@ class NickAndGregNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /fanfic part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py b/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py index ca4476b..2dc80b2 100644 --- a/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py @@ -48,7 +48,7 @@ class OcclumencySycophantHexComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py b/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py index 9f45aed..596244b 100644 --- a/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py +++ b/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py @@ -48,7 +48,7 @@ class OneDirectionFanfictionComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_phoenixsongnet.py b/fanficdownloader/adapters/adapter_phoenixsongnet.py index 5cdb20e..9de6bb8 100644 --- a/fanficdownloader/adapters/adapter_phoenixsongnet.py +++ b/fanficdownloader/adapters/adapter_phoenixsongnet.py @@ -48,7 +48,7 @@ class PhoenixSongNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[3]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/fanfiction/story/' +self.story.getMetadata('storyId')+'/') diff --git a/fanficdownloader/adapters/adapter_pommedesangcom.py b/fanficdownloader/adapters/adapter_pommedesangcom.py index 8c409c0..15edf9e 100644 --- a/fanficdownloader/adapters/adapter_pommedesangcom.py +++ b/fanficdownloader/adapters/adapter_pommedesangcom.py @@ -48,7 +48,7 @@ class PommeDeSangComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # pommedesang.com has two 'sections', shown in URL as # 'efiction' and 'sds' that change how things should be diff --git a/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py b/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py index 09765cf..2d62b2a 100644 --- a/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py +++ b/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py @@ -48,7 +48,7 @@ class PonyFictionArchiveNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + logger.info(self.parsedUrl.netloc) # normalized story URL. if "explicit" in self.parsedUrl.netloc: diff --git a/fanficdownloader/adapters/adapter_portkeyorg.py b/fanficdownloader/adapters/adapter_portkeyorg.py index ddbbdc5..de6cc68 100644 --- a/fanficdownloader/adapters/adapter_portkeyorg.py +++ b/fanficdownloader/adapters/adapter_portkeyorg.py @@ -55,7 +55,7 @@ class PortkeyOrgAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[2]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/story/'+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_potionsandsnitchesnet.py b/fanficdownloader/adapters/adapter_potionsandsnitchesnet.py index f02bedf..4427e9b 100644 --- a/fanficdownloader/adapters/adapter_potionsandsnitchesnet.py +++ b/fanficdownloader/adapters/adapter_potionsandsnitchesnet.py @@ -41,7 +41,7 @@ class PotionsAndSnitchesNetSiteAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/fanfiction/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_potterficscom.py b/fanficdownloader/adapters/adapter_potterficscom.py index 897a2c1..730a898 100644 --- a/fanficdownloader/adapters/adapter_potterficscom.py +++ b/fanficdownloader/adapters/adapter_potterficscom.py @@ -54,7 +54,7 @@ class PotterFicsComAdapter(BaseSiteAdapter): m = re.match(self.getSiteURLPattern(),url) if m: self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. gets rid of chapter if there, left with chapter index URL nurl = "http://"+self.getSiteDomain()+"/historias/"+self.story.getMetadata('storyId') self._setURL(nurl) @@ -62,7 +62,7 @@ class PotterFicsComAdapter(BaseSiteAdapter): raise exceptions.InvalidStoryURL(url, self.getSiteDomain(), self.getSiteExampleURLs()) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # Each adapter needs to have a unique site abbreviation. self.story.setMetadata('siteabbrev','potficscom') diff --git a/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py b/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py index aca131a..d387474 100644 --- a/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py +++ b/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py @@ -48,7 +48,7 @@ class PotterHeadsAnonymousComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_pretendercentrecom.py b/fanficdownloader/adapters/adapter_pretendercentrecom.py index 256b092..ef65b71 100644 --- a/fanficdownloader/adapters/adapter_pretendercentrecom.py +++ b/fanficdownloader/adapters/adapter_pretendercentrecom.py @@ -48,7 +48,7 @@ class PretenderCenterComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/missingpieces/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_psychficcom.py b/fanficdownloader/adapters/adapter_psychficcom.py index bc13e1c..33f53d8 100644 --- a/fanficdownloader/adapters/adapter_psychficcom.py +++ b/fanficdownloader/adapters/adapter_psychficcom.py @@ -48,7 +48,7 @@ class PsychFicComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_qafficcom.py b/fanficdownloader/adapters/adapter_qafficcom.py index d9a621a..f557351 100644 --- a/fanficdownloader/adapters/adapter_qafficcom.py +++ b/fanficdownloader/adapters/adapter_qafficcom.py @@ -48,7 +48,7 @@ class QafFicComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/atp/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_restrictedsectionorg.py b/fanficdownloader/adapters/adapter_restrictedsectionorg.py index e695a92..e18a3df 100644 --- a/fanficdownloader/adapters/adapter_restrictedsectionorg.py +++ b/fanficdownloader/adapters/adapter_restrictedsectionorg.py @@ -52,7 +52,7 @@ class RestrictedSectionOrgSiteAdapter(BaseSiteAdapter): m = re.match(self.getSiteURLPattern(),url) if m: self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/' + m.group('filestory') + '.php?' + m.group('filestory') + '=' + self.story.getMetadata('storyId')) logger.debug("storyUrl: (%s)"%self.story.getMetadata('storyUrl')) diff --git a/fanficdownloader/adapters/adapter_samdeanarchivenu.py b/fanficdownloader/adapters/adapter_samdeanarchivenu.py index 16ce056..c0549a5 100644 --- a/fanficdownloader/adapters/adapter_samdeanarchivenu.py +++ b/fanficdownloader/adapters/adapter_samdeanarchivenu.py @@ -48,7 +48,7 @@ class SamDeanArchiveNuAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_scarheadnet.py b/fanficdownloader/adapters/adapter_scarheadnet.py index 6161d37..736c047 100644 --- a/fanficdownloader/adapters/adapter_scarheadnet.py +++ b/fanficdownloader/adapters/adapter_scarheadnet.py @@ -48,7 +48,7 @@ class ScarHeadNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py b/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py index 92a95a0..7267599 100644 --- a/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py +++ b/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py @@ -48,7 +48,7 @@ class ScarvesAndCoffeeNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_sg1heliopoliscom.py b/fanficdownloader/adapters/adapter_sg1heliopoliscom.py index 8ca3719..b8a9e22 100644 --- a/fanficdownloader/adapters/adapter_sg1heliopoliscom.py +++ b/fanficdownloader/adapters/adapter_sg1heliopoliscom.py @@ -48,7 +48,7 @@ class SG1HeliopolisComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + self.section=self.parsedUrl.path.split('/',)[1] # normalized story URL. diff --git a/fanficdownloader/adapters/adapter_simplyundeniablecom.py b/fanficdownloader/adapters/adapter_simplyundeniablecom.py index 4e75b69..990e372 100644 --- a/fanficdownloader/adapters/adapter_simplyundeniablecom.py +++ b/fanficdownloader/adapters/adapter_simplyundeniablecom.py @@ -48,7 +48,7 @@ class SimplyUndeniableComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_sinfuldesireorg.py b/fanficdownloader/adapters/adapter_sinfuldesireorg.py index 31ceb19..d6a96a7 100644 --- a/fanficdownloader/adapters/adapter_sinfuldesireorg.py +++ b/fanficdownloader/adapters/adapter_sinfuldesireorg.py @@ -48,7 +48,7 @@ class SinfulDesireOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/archive/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_siyecouk.py b/fanficdownloader/adapters/adapter_siyecouk.py index ee36ea0..62371f5 100644 --- a/fanficdownloader/adapters/adapter_siyecouk.py +++ b/fanficdownloader/adapters/adapter_siyecouk.py @@ -49,7 +49,7 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/siye/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_squidgeorgpeja.py b/fanficdownloader/adapters/adapter_squidgeorgpeja.py index e6b601a..ba2d3e6 100644 --- a/fanficdownloader/adapters/adapter_squidgeorgpeja.py +++ b/fanficdownloader/adapters/adapter_squidgeorgpeja.py @@ -59,7 +59,7 @@ class SquidgeOrgPejaAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/peja/cgi-bin/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_stargateatlantisorg.py b/fanficdownloader/adapters/adapter_stargateatlantisorg.py index 615be14..612f995 100644 --- a/fanficdownloader/adapters/adapter_stargateatlantisorg.py +++ b/fanficdownloader/adapters/adapter_stargateatlantisorg.py @@ -48,7 +48,7 @@ class StargateAtlantisOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/fanfics/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_storiesofardacom.py b/fanficdownloader/adapters/adapter_storiesofardacom.py index ab69d50..acdddda 100644 --- a/fanficdownloader/adapters/adapter_storiesofardacom.py +++ b/fanficdownloader/adapters/adapter_storiesofardacom.py @@ -48,7 +48,7 @@ class StoriesOfArdaComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/chapterlistview.asp?SID='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_tenhawkpresentscom.py b/fanficdownloader/adapters/adapter_tenhawkpresentscom.py index ecf638c..f724d39 100644 --- a/fanficdownloader/adapters/adapter_tenhawkpresentscom.py +++ b/fanficdownloader/adapters/adapter_tenhawkpresentscom.py @@ -44,7 +44,7 @@ class TenhawkPresentsComSiteAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_thealphagatecom.py b/fanficdownloader/adapters/adapter_thealphagatecom.py index 35b1587..fa28e40 100644 --- a/fanficdownloader/adapters/adapter_thealphagatecom.py +++ b/fanficdownloader/adapters/adapter_thealphagatecom.py @@ -48,7 +48,7 @@ class TheAlphaGateComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_thehexfilesnet.py b/fanficdownloader/adapters/adapter_thehexfilesnet.py index dd1cef6..8490f46 100644 --- a/fanficdownloader/adapters/adapter_thehexfilesnet.py +++ b/fanficdownloader/adapters/adapter_thehexfilesnet.py @@ -48,7 +48,7 @@ class TheHexFilesNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_thehookupzonenet.py b/fanficdownloader/adapters/adapter_thehookupzonenet.py index a0fb262..618c21e 100644 --- a/fanficdownloader/adapters/adapter_thehookupzonenet.py +++ b/fanficdownloader/adapters/adapter_thehookupzonenet.py @@ -72,7 +72,7 @@ class TheHookupZoneNetAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the /fanfic part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_themasquenet.py b/fanficdownloader/adapters/adapter_themasquenet.py index 7cd80ff..2be75ff 100644 --- a/fanficdownloader/adapters/adapter_themasquenet.py +++ b/fanficdownloader/adapters/adapter_themasquenet.py @@ -48,7 +48,7 @@ class TheMasqueNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + if self.parsedUrl.path.split('/',)[1] == 'wiktt': self.story.addToList("category","Harry Potter") diff --git a/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py b/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py index 7ee4fce..159a946 100644 --- a/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py +++ b/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py @@ -48,7 +48,7 @@ class ThePetulantPoetessComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId') +'&i=1') diff --git a/fanficdownloader/adapters/adapter_thequidditchpitchorg.py b/fanficdownloader/adapters/adapter_thequidditchpitchorg.py index 8bb281c..bdf26d2 100644 --- a/fanficdownloader/adapters/adapter_thequidditchpitchorg.py +++ b/fanficdownloader/adapters/adapter_thequidditchpitchorg.py @@ -52,7 +52,7 @@ class TheQuidditchPitchOrgAdapter(BaseSiteAdapter): # XXX # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. # XXX Most sites don't have the part. Replace all to remove it usually. diff --git a/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py b/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py index 6485f4f..543ac1e 100644 --- a/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py +++ b/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py @@ -44,7 +44,7 @@ class TheWritersCoffeeShopComSiteAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/library/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_tokrafandomnetcom.py b/fanficdownloader/adapters/adapter_tokrafandomnetcom.py index c4f55ef..3576f97 100644 --- a/fanficdownloader/adapters/adapter_tokrafandomnetcom.py +++ b/fanficdownloader/adapters/adapter_tokrafandomnetcom.py @@ -48,7 +48,7 @@ class TokraFandomnetComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_tthfanficorg.py b/fanficdownloader/adapters/adapter_tthfanficorg.py index 284e56b..4090afc 100644 --- a/fanficdownloader/adapters/adapter_tthfanficorg.py +++ b/fanficdownloader/adapters/adapter_tthfanficorg.py @@ -41,7 +41,7 @@ class TwistingTheHellmouthSiteAdapter(BaseSiteAdapter): m = re.match(self.getSiteURLPattern(),url) if m: self.story.setMetadata('storyId',m.group('id')) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL("http://"+self.getSiteDomain()\ +"/Story-"+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_twilightarchivescom.py b/fanficdownloader/adapters/adapter_twilightarchivescom.py index ee7fe6c..99a5c7e 100644 --- a/fanficdownloader/adapters/adapter_twilightarchivescom.py +++ b/fanficdownloader/adapters/adapter_twilightarchivescom.py @@ -48,7 +48,7 @@ class TwilightArchivesComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.path.split('/',)[2]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. http://www.twilightarchives.com/read/9353 self._setURL('http://' + self.getSiteDomain() + '/read/'+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_twilightednet.py b/fanficdownloader/adapters/adapter_twilightednet.py index 3a081d1..c45b3e9 100644 --- a/fanficdownloader/adapters/adapter_twilightednet.py +++ b/fanficdownloader/adapters/adapter_twilightednet.py @@ -43,7 +43,7 @@ class TwilightedNetSiteAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_twiwritenet.py b/fanficdownloader/adapters/adapter_twiwritenet.py index 6a6abe1..38ce580 100644 --- a/fanficdownloader/adapters/adapter_twiwritenet.py +++ b/fanficdownloader/adapters/adapter_twiwritenet.py @@ -44,7 +44,7 @@ class TwiwriteNetSiteAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_walkingtheplankorg.py b/fanficdownloader/adapters/adapter_walkingtheplankorg.py index 0939f7a..890fc64 100644 --- a/fanficdownloader/adapters/adapter_walkingtheplankorg.py +++ b/fanficdownloader/adapters/adapter_walkingtheplankorg.py @@ -46,7 +46,7 @@ class WalkingThePlankOrgAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/archive/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_wizardtalesnet.py b/fanficdownloader/adapters/adapter_wizardtalesnet.py index e86ab94..3054ea6 100644 --- a/fanficdownloader/adapters/adapter_wizardtalesnet.py +++ b/fanficdownloader/adapters/adapter_wizardtalesnet.py @@ -48,7 +48,7 @@ class WizardTalesNetAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_wolverineandroguecom.py b/fanficdownloader/adapters/adapter_wolverineandroguecom.py index 8da9a99..cf16068 100644 --- a/fanficdownloader/adapters/adapter_wolverineandroguecom.py +++ b/fanficdownloader/adapters/adapter_wolverineandroguecom.py @@ -48,7 +48,7 @@ class WolverineAndRogueComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/wrfa/viewstory.php?sid='+self.story.getMetadata('storyId')) diff --git a/fanficdownloader/adapters/adapter_wraithbaitcom.py b/fanficdownloader/adapters/adapter_wraithbaitcom.py index 77d2380..0b17a2e 100644 --- a/fanficdownloader/adapters/adapter_wraithbaitcom.py +++ b/fanficdownloader/adapters/adapter_wraithbaitcom.py @@ -49,7 +49,7 @@ class WraithBaitComAdapter(BaseSiteAdapter): # get storyId from url--url validation guarantees query is only sid=1234 self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1]) - logger.debug("storyId: (%s)"%self.story.getMetadata('storyId')) + self._setURL('http://' + self.getSiteDomain() + '/viewstory.php?sid='+self.story.getMetadata('storyId'))