diff --git a/fanficdownloader/adapters/adapter_adastrafanficcom.py b/fanficdownloader/adapters/adapter_adastrafanficcom.py index 7bb26a0..1b5fb74 100644 --- a/fanficdownloader/adapters/adapter_adastrafanficcom.py +++ b/fanficdownloader/adapters/adapter_adastrafanficcom.py @@ -55,7 +55,7 @@ class AdAstraFanficComSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_archiveofourownorg.py b/fanficdownloader/adapters/adapter_archiveofourownorg.py index e2d85c6..ad0c82e 100644 --- a/fanficdownloader/adapters/adapter_archiveofourownorg.py +++ b/fanficdownloader/adapters/adapter_archiveofourownorg.py @@ -79,7 +79,7 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/works/123456 http://"+self.getSiteDomain()+"/collections/Some_Archive/works/123456 http://"+self.getSiteDomain()+"/works/123456/chapters/78901" + return "http://"+cls.getSiteDomain()+"/works/123456 http://"+cls.getSiteDomain()+"/collections/Some_Archive/works/123456 http://"+cls.getSiteDomain()+"/works/123456/chapters/78901" def getSiteURLPattern(self): # http://archiveofourown.org/collections/Smallville_Slash_Archive/works/159770 diff --git a/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py b/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py index 3a5cc31..be15c8e 100644 --- a/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_ashwindersycophanthexcom.py @@ -69,7 +69,7 @@ class AshwinderSycophantHexComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_asr3slashzoneorg.py b/fanficdownloader/adapters/adapter_asr3slashzoneorg.py index 89a6dab..74e1d6c 100644 --- a/fanficdownloader/adapters/adapter_asr3slashzoneorg.py +++ b/fanficdownloader/adapters/adapter_asr3slashzoneorg.py @@ -66,7 +66,7 @@ class Asr3SlashzoneOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/archive/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_bloodtiesfancom.py b/fanficdownloader/adapters/adapter_bloodtiesfancom.py index cd791a4..6da5260 100644 --- a/fanficdownloader/adapters/adapter_bloodtiesfancom.py +++ b/fanficdownloader/adapters/adapter_bloodtiesfancom.py @@ -91,7 +91,7 @@ class BloodTiesFansComAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fiction/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/fiction/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/fiction/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_buffynfaithnet.py b/fanficdownloader/adapters/adapter_buffynfaithnet.py index e8bdf16..8d33b1e 100644 --- a/fanficdownloader/adapters/adapter_buffynfaithnet.py +++ b/fanficdownloader/adapters/adapter_buffynfaithnet.py @@ -91,7 +91,7 @@ class BuffyNFaithNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfictions/index.php?act=vie&id=1234 http://buffynfaith.net/fanfictions/index.php?act=ovr&id=1234 http://buffynfaith.net/fanfictions/index.php?act=vie&id=1234&ch=2" + return "http://"+cls.getSiteDomain()+"/fanfictions/index.php?act=vie&id=1234 http://"+cls.getSiteDomain()+"/fanfictions/index.php?act=ovr&id=1234 http://"+cls.getSiteDomain()+"/fanfictions/index.php?act=vie&id=1234&ch=2" def getSiteURLPattern(self): #http://buffynfaith.net/fanfictions/index.php?act=vie&id=963 diff --git a/fanficdownloader/adapters/adapter_castlefansorg.py b/fanficdownloader/adapters/adapter_castlefansorg.py index cd3d817..47a6ded 100644 --- a/fanficdownloader/adapters/adapter_castlefansorg.py +++ b/fanficdownloader/adapters/adapter_castlefansorg.py @@ -93,7 +93,7 @@ class CastleFansOrgAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfic/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/fanfic/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/fanfic/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_chaossycophanthexcom.py b/fanficdownloader/adapters/adapter_chaossycophanthexcom.py index e2e5845..b5b945f 100644 --- a/fanficdownloader/adapters/adapter_chaossycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_chaossycophanthexcom.py @@ -69,7 +69,7 @@ class ChaosSycophantHexComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_checkmatedcom.py b/fanficdownloader/adapters/adapter_checkmatedcom.py index b7a05e3..7772995 100644 --- a/fanficdownloader/adapters/adapter_checkmatedcom.py +++ b/fanficdownloader/adapters/adapter_checkmatedcom.py @@ -66,7 +66,7 @@ class CheckmatedComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/story.php?story=1234" + return "http://"+cls.getSiteDomain()+"/story.php?story=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/story.php?story=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_darksolaceorg.py b/fanficdownloader/adapters/adapter_darksolaceorg.py index c6bc1bc..d641f75 100644 --- a/fanficdownloader/adapters/adapter_darksolaceorg.py +++ b/fanficdownloader/adapters/adapter_darksolaceorg.py @@ -72,7 +72,7 @@ class DarkSolaceOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/elysian/viewstory.php?sid=1234" + 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+$" diff --git a/fanficdownloader/adapters/adapter_destinysgatewaycom.py b/fanficdownloader/adapters/adapter_destinysgatewaycom.py index a71a477..3551860 100644 --- a/fanficdownloader/adapters/adapter_destinysgatewaycom.py +++ b/fanficdownloader/adapters/adapter_destinysgatewaycom.py @@ -68,7 +68,7 @@ class DestinysGatewayComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_dokugacom.py b/fanficdownloader/adapters/adapter_dokugacom.py index 3fa1354..43e5a70 100644 --- a/fanficdownloader/adapters/adapter_dokugacom.py +++ b/fanficdownloader/adapters/adapter_dokugacom.py @@ -77,7 +77,7 @@ class DokugaComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfiction/story/1234/1 http://"+self.getSiteDomain()+"/spark/story/1234/1" + return "http://"+cls.getSiteDomain()+"/fanfiction/story/1234/1 http://"+cls.getSiteDomain()+"/spark/story/1234/1" def getSiteURLPattern(self): return r"http://"+self.getSiteDomain()+"/(fanfiction|spark)?/story/\d+/?\d+?$" diff --git a/fanficdownloader/adapters/adapter_dotmoonnet.py b/fanficdownloader/adapters/adapter_dotmoonnet.py index 8c67f49..f41d3f3 100644 --- a/fanficdownloader/adapters/adapter_dotmoonnet.py +++ b/fanficdownloader/adapters/adapter_dotmoonnet.py @@ -67,7 +67,7 @@ class DotMoonNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/library_view.php?storyid=1234" + return "http://"+cls.getSiteDomain()+"/library_view.php?storyid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/library_view.php?storyid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_dracoandginnycom.py b/fanficdownloader/adapters/adapter_dracoandginnycom.py index 5aab8bb..1a73283 100644 --- a/fanficdownloader/adapters/adapter_dracoandginnycom.py +++ b/fanficdownloader/adapters/adapter_dracoandginnycom.py @@ -68,7 +68,7 @@ class DracoAndGinnyComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_dramioneorg.py b/fanficdownloader/adapters/adapter_dramioneorg.py index 4c5ac88..3b3768f 100644 --- a/fanficdownloader/adapters/adapter_dramioneorg.py +++ b/fanficdownloader/adapters/adapter_dramioneorg.py @@ -68,7 +68,7 @@ class DramioneOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_efictionestelielde.py b/fanficdownloader/adapters/adapter_efictionestelielde.py index cd24111..2c50505 100644 --- a/fanficdownloader/adapters/adapter_efictionestelielde.py +++ b/fanficdownloader/adapters/adapter_efictionestelielde.py @@ -68,7 +68,7 @@ class EfictionEstelielDeAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_efpfanficnet.py b/fanficdownloader/adapters/adapter_efpfanficnet.py index 1256ea7..26df765 100644 --- a/fanficdownloader/adapters/adapter_efpfanficnet.py +++ b/fanficdownloader/adapters/adapter_efpfanficnet.py @@ -68,7 +68,7 @@ class EFPFanFicNet(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py b/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py index 38c0939..d57ca0b 100644 --- a/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_erosnsapphosycophanthexcom.py @@ -69,7 +69,7 @@ class ErosnSapphoSycophantHexComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_fanfiktionde.py b/fanficdownloader/adapters/adapter_fanfiktionde.py index 875a597..23a7455 100644 --- a/fanficdownloader/adapters/adapter_fanfiktionde.py +++ b/fanficdownloader/adapters/adapter_fanfiktionde.py @@ -69,7 +69,7 @@ class FanFiktionDeAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/s/46ccbef30000616306614050 http://"+self.getSiteDomain()+"/s/46ccbef30000616306614050/1 http://"+self.getSiteDomain()+"/s/46ccbef30000616306614050/1/story-name" + return "http://"+cls.getSiteDomain()+"/s/46ccbef30000616306614050 http://"+cls.getSiteDomain()+"/s/46ccbef30000616306614050/1 http://"+cls.getSiteDomain()+"/s/46ccbef30000616306614050/1/story-name" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/s/")+r"\w+(/\d+)?" diff --git a/fanficdownloader/adapters/adapter_ficbooknet.py b/fanficdownloader/adapters/adapter_ficbooknet.py index af2bc85..edced6a 100644 --- a/fanficdownloader/adapters/adapter_ficbooknet.py +++ b/fanficdownloader/adapters/adapter_ficbooknet.py @@ -71,7 +71,7 @@ class FicBookNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/readfic/12345 http://"+self.getSiteDomain()+"/readfic/93626/246417#part_content" + return "http://"+cls.getSiteDomain()+"/readfic/12345 http://"+cls.getSiteDomain()+"/readfic/93626/246417#part_content" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/readfic/")+r"\d+" diff --git a/fanficdownloader/adapters/adapter_fictionalleyorg.py b/fanficdownloader/adapters/adapter_fictionalleyorg.py index 0365914..2e51d33 100644 --- a/fanficdownloader/adapters/adapter_fictionalleyorg.py +++ b/fanficdownloader/adapters/adapter_fictionalleyorg.py @@ -59,7 +59,7 @@ class FictionAlleyOrgSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/authors/drt/DA.html http://"+self.getSiteDomain()+"/authors/drt/JOTP01a.html" + return "http://"+cls.getSiteDomain()+"/authors/drt/DA.html http://"+cls.getSiteDomain()+"/authors/drt/JOTP01a.html" def getSiteURLPattern(self): # http://www.fictionalley.org/authors/drt/DA.html diff --git a/fanficdownloader/adapters/adapter_finestoriescom.py b/fanficdownloader/adapters/adapter_finestoriescom.py index 7690d2c..6c99f9d 100644 --- a/fanficdownloader/adapters/adapter_finestoriescom.py +++ b/fanficdownloader/adapters/adapter_finestoriescom.py @@ -63,7 +63,7 @@ class FineStoriesComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/s/1234 http://"+self.getSiteDomain()+"/s/1234:4010 http://"+self.getSiteDomain()+"/library/storyInfo.php?id=1234" + return "http://"+cls.getSiteDomain()+"/s/1234 http://"+cls.getSiteDomain()+"/s/1234:4010 http://"+cls.getSiteDomain()+"/library/storyInfo.php?id=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain())+r"/(s|library)?/(storyInfo.php\?id=)?\d+(:\d+)?(;\d+)?$" diff --git a/fanficdownloader/adapters/adapter_hennethannunnet.py b/fanficdownloader/adapters/adapter_hennethannunnet.py index d8d8ead..4a5391d 100644 --- a/fanficdownloader/adapters/adapter_hennethannunnet.py +++ b/fanficdownloader/adapters/adapter_hennethannunnet.py @@ -67,7 +67,7 @@ class HennethAnnunNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/stories/chapter.cfm?stid=1234" + return "http://"+cls.getSiteDomain()+"/stories/chapter.cfm?stid=1234" def getSiteURLPattern(self): return "http://"+self.getSiteDomain()+"/stories/chapter(_view)?.cfm\?stid="+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_hlfictionnet.py b/fanficdownloader/adapters/adapter_hlfictionnet.py index e1a84de..96deb95 100644 --- a/fanficdownloader/adapters/adapter_hlfictionnet.py +++ b/fanficdownloader/adapters/adapter_hlfictionnet.py @@ -68,7 +68,7 @@ class HLFictionNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_hpfandomnet.py b/fanficdownloader/adapters/adapter_hpfandomnet.py index 1d83e3f..16a4cfc 100644 --- a/fanficdownloader/adapters/adapter_hpfandomnet.py +++ b/fanficdownloader/adapters/adapter_hpfandomnet.py @@ -73,7 +73,7 @@ class HPFandomNetAdapterAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/eff/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/eff/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/eff/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py index 735fe88..9d1c1f1 100644 --- a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py +++ b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py @@ -68,7 +68,7 @@ class HPFanficArchiveComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/stories/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/stories/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/stories/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_iketernalnet.py b/fanficdownloader/adapters/adapter_iketernalnet.py index 340d398..846aee7 100644 --- a/fanficdownloader/adapters/adapter_iketernalnet.py +++ b/fanficdownloader/adapters/adapter_iketernalnet.py @@ -68,7 +68,7 @@ class IkEternalNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_imagineeficcom.py b/fanficdownloader/adapters/adapter_imagineeficcom.py index 2a50f81..f32c584 100644 --- a/fanficdownloader/adapters/adapter_imagineeficcom.py +++ b/fanficdownloader/adapters/adapter_imagineeficcom.py @@ -68,7 +68,7 @@ class ImagineEFicComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_indeathnet.py b/fanficdownloader/adapters/adapter_indeathnet.py index cf02fbb..5c0175e 100644 --- a/fanficdownloader/adapters/adapter_indeathnet.py +++ b/fanficdownloader/adapters/adapter_indeathnet.py @@ -74,7 +74,7 @@ class InDeathNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/blog/archive/123-story-in-death/" + return "http://"+cls.getSiteDomain()+"/blog/archive/123-story-in-death/" def getSiteURLPattern(self): # http://www.indeath.net/blog/archive/169-ransom-in-death/ diff --git a/fanficdownloader/adapters/adapter_ksarchivecom.py b/fanficdownloader/adapters/adapter_ksarchivecom.py index dd0e28d..e3fdd59 100644 --- a/fanficdownloader/adapters/adapter_ksarchivecom.py +++ b/fanficdownloader/adapters/adapter_ksarchivecom.py @@ -77,7 +77,7 @@ class KSArchiveComAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return "http://(www.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_libraryofmoriacom.py b/fanficdownloader/adapters/adapter_libraryofmoriacom.py index 79c15c0..3df41bd 100644 --- a/fanficdownloader/adapters/adapter_libraryofmoriacom.py +++ b/fanficdownloader/adapters/adapter_libraryofmoriacom.py @@ -69,7 +69,7 @@ class LibraryOfMoriaComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/a/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/a/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/a/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_lumossycophanthexcom.py b/fanficdownloader/adapters/adapter_lumossycophanthexcom.py index 4e51067..805d752 100644 --- a/fanficdownloader/adapters/adapter_lumossycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_lumossycophanthexcom.py @@ -69,7 +69,7 @@ class LumosSycophantHexComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_mediaminerorg.py b/fanficdownloader/adapters/adapter_mediaminerorg.py index cef8a68..261b1f7 100644 --- a/fanficdownloader/adapters/adapter_mediaminerorg.py +++ b/fanficdownloader/adapters/adapter_mediaminerorg.py @@ -57,7 +57,7 @@ class MediaMinerOrgSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfic/view_st.php/123456 http://"+self.getSiteDomain()+"/fanfic/view_ch.php/1234123/123444#fic_c" + return "http://"+cls.getSiteDomain()+"/fanfic/view_st.php/123456 http://"+cls.getSiteDomain()+"/fanfic/view_ch.php/1234123/123444#fic_c" def getSiteURLPattern(self): ## http://www.mediaminer.org/fanfic/view_st.php/76882 diff --git a/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py b/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py index bbad3fc..ea518ea 100644 --- a/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py +++ b/fanficdownloader/adapters/adapter_merlinficdtwinscouk.py @@ -68,7 +68,7 @@ class MerlinFicDtwinsCoUk(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_midnightwhispersca.py b/fanficdownloader/adapters/adapter_midnightwhispersca.py index 8fea863..ec884d6 100644 --- a/fanficdownloader/adapters/adapter_midnightwhispersca.py +++ b/fanficdownloader/adapters/adapter_midnightwhispersca.py @@ -73,7 +73,7 @@ class MidnightwhispersCaAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_mugglenetcom.py b/fanficdownloader/adapters/adapter_mugglenetcom.py index 27aae0d..261a623 100644 --- a/fanficdownloader/adapters/adapter_mugglenetcom.py +++ b/fanficdownloader/adapters/adapter_mugglenetcom.py @@ -76,7 +76,7 @@ class MuggleNetComAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+r"fanfic(tion)?\.mugglenet\.com"+re.escape("/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_nationallibrarynet.py b/fanficdownloader/adapters/adapter_nationallibrarynet.py index e6acbd8..c9d7531 100644 --- a/fanficdownloader/adapters/adapter_nationallibrarynet.py +++ b/fanficdownloader/adapters/adapter_nationallibrarynet.py @@ -72,7 +72,7 @@ class NationalLibraryNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): # ONLY the stories archived on or after June 17, 2006 and that are hosted on the website: - return "http://"+self.getSiteDomain()+"/viewstory.php?storyid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?storyid=1234" def getSiteURLPattern(self): return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?storyid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_ncisficcom.py b/fanficdownloader/adapters/adapter_ncisficcom.py index 366c7fb..dbbf3fb 100644 --- a/fanficdownloader/adapters/adapter_ncisficcom.py +++ b/fanficdownloader/adapters/adapter_ncisficcom.py @@ -71,7 +71,7 @@ class NCISFicComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?storyid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?storyid=1234" def getSiteURLPattern(self): return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?storyid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_ncisfictionnet.py b/fanficdownloader/adapters/adapter_ncisfictionnet.py index 0f82824..58abedf 100644 --- a/fanficdownloader/adapters/adapter_ncisfictionnet.py +++ b/fanficdownloader/adapters/adapter_ncisfictionnet.py @@ -76,7 +76,7 @@ class NCISFictionNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/story.php?stid=01234 http://"+self.getSiteDomain()+"/chapters.php?stid=1234" + return "http://"+cls.getSiteDomain()+"/story.php?stid=01234 http://"+cls.getSiteDomain()+"/chapters.php?stid=1234" def getSiteURLPattern(self): return r'http://www\.ncisfiction\.(net|com)/(chapters|story)?.php\?stid=\d+' diff --git a/fanficdownloader/adapters/adapter_netraptororg.py b/fanficdownloader/adapters/adapter_netraptororg.py index 7b89caa..6d4effb 100644 --- a/fanficdownloader/adapters/adapter_netraptororg.py +++ b/fanficdownloader/adapters/adapter_netraptororg.py @@ -66,7 +66,7 @@ class NetRaptorOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfiction/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/fanfiction/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/fanfiction/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_nfacommunitycom.py b/fanficdownloader/adapters/adapter_nfacommunitycom.py index f3c1353..4d428e7 100644 --- a/fanficdownloader/adapters/adapter_nfacommunitycom.py +++ b/fanficdownloader/adapters/adapter_nfacommunitycom.py @@ -77,7 +77,7 @@ class NfaCommunityComAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return "http://(www.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_nhamagicalworldsus.py b/fanficdownloader/adapters/adapter_nhamagicalworldsus.py index 799205e..498b043 100644 --- a/fanficdownloader/adapters/adapter_nhamagicalworldsus.py +++ b/fanficdownloader/adapters/adapter_nhamagicalworldsus.py @@ -69,7 +69,7 @@ class NHAMagicalWorldsUsAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_nickandgregnet.py b/fanficdownloader/adapters/adapter_nickandgregnet.py index 5a23e8b..cd0fd48 100644 --- a/fanficdownloader/adapters/adapter_nickandgregnet.py +++ b/fanficdownloader/adapters/adapter_nickandgregnet.py @@ -69,7 +69,7 @@ class NickAndGregNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/desert_archive/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/desert_archive/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/desert_archive/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py b/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py index 052a8bf..87008a5 100644 --- a/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py +++ b/fanficdownloader/adapters/adapter_occlumencysycophanthexcom.py @@ -69,7 +69,7 @@ class OcclumencySycophantHexComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py b/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py index 8d287d4..d4ae909 100644 --- a/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py +++ b/fanficdownloader/adapters/adapter_onedirectionfanfictioncom.py @@ -73,7 +73,7 @@ class OneDirectionFanfictionComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_phoenixsongnet.py b/fanficdownloader/adapters/adapter_phoenixsongnet.py index 209a954..d8918d0 100644 --- a/fanficdownloader/adapters/adapter_phoenixsongnet.py +++ b/fanficdownloader/adapters/adapter_phoenixsongnet.py @@ -67,7 +67,7 @@ class PhoenixSongNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfiction/story/1234/" + return "http://"+cls.getSiteDomain()+"/fanfiction/story/1234/" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/fanfiction/story/")+r"\d+/?$" diff --git a/fanficdownloader/adapters/adapter_pommedesangcom.py b/fanficdownloader/adapters/adapter_pommedesangcom.py index fec417f..4d553a0 100644 --- a/fanficdownloader/adapters/adapter_pommedesangcom.py +++ b/fanficdownloader/adapters/adapter_pommedesangcom.py @@ -78,7 +78,7 @@ class PommeDeSangComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/efiction/viewstory.php?sid=1234 http://"+self.getSiteDomain()+"/sds/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/efiction/viewstory.php?sid=1234 http://"+cls.getSiteDomain()+"/sds/viewstory.php?sid=1234" def getSiteURLPattern(self): return r"http://"+self.getSiteDomain()+"/(efiction|sds)?/viewstory.php\?sid=\d+$" diff --git a/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py b/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py index b12b771..eceb332 100644 --- a/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py +++ b/fanficdownloader/adapters/adapter_ponyfictionarchivenet.py @@ -72,7 +72,7 @@ class PonyFictionArchiveNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234 http://explicit."+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234 http://explicit."+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+"(www\.|explicit\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_portkeyorg.py b/fanficdownloader/adapters/adapter_portkeyorg.py index 6c9813b..64b77b6 100644 --- a/fanficdownloader/adapters/adapter_portkeyorg.py +++ b/fanficdownloader/adapters/adapter_portkeyorg.py @@ -74,7 +74,7 @@ class PortkeyOrgAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/story/1234" + return "http://"+cls.getSiteDomain()+"/story/1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/story/")+r"\d+(/\d+)?$" diff --git a/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py b/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py index 5e35c1d..c8f061c 100644 --- a/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py +++ b/fanficdownloader/adapters/adapter_potterheadsanonymouscom.py @@ -68,7 +68,7 @@ class PotterHeadsAnonymousComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_pretendercentrecom.py b/fanficdownloader/adapters/adapter_pretendercentrecom.py index 0562e71..5e9590a 100644 --- a/fanficdownloader/adapters/adapter_pretendercentrecom.py +++ b/fanficdownloader/adapters/adapter_pretendercentrecom.py @@ -72,7 +72,7 @@ class PretenderCenterComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/missingpieces/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/missingpieces/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/missingpieces/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_psychficcom.py b/fanficdownloader/adapters/adapter_psychficcom.py index a22a460..fa53815 100644 --- a/fanficdownloader/adapters/adapter_psychficcom.py +++ b/fanficdownloader/adapters/adapter_psychficcom.py @@ -68,7 +68,7 @@ class PsychFicComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_qafficcom.py b/fanficdownloader/adapters/adapter_qafficcom.py index 9aa9610..c60c330 100644 --- a/fanficdownloader/adapters/adapter_qafficcom.py +++ b/fanficdownloader/adapters/adapter_qafficcom.py @@ -68,7 +68,7 @@ class QafFicComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/atp/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/atp/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/atp/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_restrictedsectionorg.py b/fanficdownloader/adapters/adapter_restrictedsectionorg.py index 080f918..f03b4e3 100644 --- a/fanficdownloader/adapters/adapter_restrictedsectionorg.py +++ b/fanficdownloader/adapters/adapter_restrictedsectionorg.py @@ -70,7 +70,7 @@ class RestrictedSectionOrgSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/story.php?story=1234 http://"+self.getSiteDomain()+"/file.php?file=1234" + return "http://"+cls.getSiteDomain()+"/story.php?story=1234 http://"+cls.getSiteDomain()+"/file.php?file=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain())+r"/(?Pfile|story).php\?(file|story)=(?P\d+)$" diff --git a/fanficdownloader/adapters/adapter_samdeanarchivenu.py b/fanficdownloader/adapters/adapter_samdeanarchivenu.py index 3038ef7..398a2bc 100644 --- a/fanficdownloader/adapters/adapter_samdeanarchivenu.py +++ b/fanficdownloader/adapters/adapter_samdeanarchivenu.py @@ -72,7 +72,7 @@ class SamDeanArchiveNuAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+r"(www\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_scarheadnet.py b/fanficdownloader/adapters/adapter_scarheadnet.py index a761894..8ba6044 100644 --- a/fanficdownloader/adapters/adapter_scarheadnet.py +++ b/fanficdownloader/adapters/adapter_scarheadnet.py @@ -68,7 +68,7 @@ class ScarHeadNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py b/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py index 128e324..f90a77e 100644 --- a/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py +++ b/fanficdownloader/adapters/adapter_scarvesandcoffeenet.py @@ -68,7 +68,7 @@ class ScarvesAndCoffeeNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_sg1heliopoliscom.py b/fanficdownloader/adapters/adapter_sg1heliopoliscom.py index f8408f0..f36edae 100644 --- a/fanficdownloader/adapters/adapter_sg1heliopoliscom.py +++ b/fanficdownloader/adapters/adapter_sg1heliopoliscom.py @@ -77,7 +77,7 @@ class SG1HeliopolisComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=1234 http://"+self.getSiteDomain()+"/adult/viewstory.php?sid=1234 http://"+self.getSiteDomain()+"/atlantis/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/archive/viewstory.php?sid=1234 http://"+cls.getSiteDomain()+"/adult/viewstory.php?sid=1234 http://"+cls.getSiteDomain()+"/atlantis/viewstory.php?sid=1234" def getSiteURLPattern(self): return r"http://sg1-heliopolis.com/(archive|adult|atlantis)?/viewstory.php\?sid=\d+$" diff --git a/fanficdownloader/adapters/adapter_sheppardweircom.py b/fanficdownloader/adapters/adapter_sheppardweircom.py index 8bdd958..2d349c6 100644 --- a/fanficdownloader/adapters/adapter_sheppardweircom.py +++ b/fanficdownloader/adapters/adapter_sheppardweircom.py @@ -92,7 +92,7 @@ class SheppardWeirComAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfics/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/fanfics/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/fanfics/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_simplyundeniablecom.py b/fanficdownloader/adapters/adapter_simplyundeniablecom.py index 63703fe..131b8be 100644 --- a/fanficdownloader/adapters/adapter_simplyundeniablecom.py +++ b/fanficdownloader/adapters/adapter_simplyundeniablecom.py @@ -68,7 +68,7 @@ class SimplyUndeniableComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_sinfuldesireorg.py b/fanficdownloader/adapters/adapter_sinfuldesireorg.py index 454f7f8..2187c68 100644 --- a/fanficdownloader/adapters/adapter_sinfuldesireorg.py +++ b/fanficdownloader/adapters/adapter_sinfuldesireorg.py @@ -68,7 +68,7 @@ class SinfulDesireOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/archive/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_siyecouk.py b/fanficdownloader/adapters/adapter_siyecouk.py index e099e6c..9129bfc 100644 --- a/fanficdownloader/adapters/adapter_siyecouk.py +++ b/fanficdownloader/adapters/adapter_siyecouk.py @@ -73,7 +73,7 @@ class SiyeCoUkAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/siye/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/siye/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+r"(www\.)?siye\.co\.uk/(siye/)?"+re.escape("viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_squidgeorgpeja.py b/fanficdownloader/adapters/adapter_squidgeorgpeja.py index 1599391..4960676 100644 --- a/fanficdownloader/adapters/adapter_squidgeorgpeja.py +++ b/fanficdownloader/adapters/adapter_squidgeorgpeja.py @@ -84,7 +84,7 @@ class SquidgeOrgPejaAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "https://"+self.getSiteDomain()+"/peja/cgi-bin/viewstory.php?sid=1234" + return "https://"+cls.getSiteDomain()+"/peja/cgi-bin/viewstory.php?sid=1234" def getSiteURLPattern(self): return r"https?"+re.escape("://"+self.getSiteDomain()+"/")+r"~?"+re.escape("peja/cgi-bin/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_stargateatlantisorg.py b/fanficdownloader/adapters/adapter_stargateatlantisorg.py index 2364976..f842853 100644 --- a/fanficdownloader/adapters/adapter_stargateatlantisorg.py +++ b/fanficdownloader/adapters/adapter_stargateatlantisorg.py @@ -68,7 +68,7 @@ class StargateAtlantisOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/fanfics/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/fanfics/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/fanfics/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_storiesofardacom.py b/fanficdownloader/adapters/adapter_storiesofardacom.py index ac6a537..5ad3ef8 100644 --- a/fanficdownloader/adapters/adapter_storiesofardacom.py +++ b/fanficdownloader/adapters/adapter_storiesofardacom.py @@ -67,7 +67,7 @@ class StoriesOfArdaComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/chapterlistview.asp?SID=1234" + return "http://"+cls.getSiteDomain()+"/chapterlistview.asp?SID=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/chapterlistview.asp?SID=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_storiesonlinenet.py b/fanficdownloader/adapters/adapter_storiesonlinenet.py index 9aef3c1..6648153 100644 --- a/fanficdownloader/adapters/adapter_storiesonlinenet.py +++ b/fanficdownloader/adapters/adapter_storiesonlinenet.py @@ -63,7 +63,7 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/s/1234 http://"+self.getSiteDomain()+"/s/1234:4010" + return "http://"+cls.getSiteDomain()+"/s/1234 http://"+cls.getSiteDomain()+"/s/1234:4010" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain())+r"/s/\d+((:\d+)?(;\d+)?$|(:i)?$)?" diff --git a/fanficdownloader/adapters/adapter_tenhawkpresentscom.py b/fanficdownloader/adapters/adapter_tenhawkpresentscom.py index 3aa85a3..634adfe 100644 --- a/fanficdownloader/adapters/adapter_tenhawkpresentscom.py +++ b/fanficdownloader/adapters/adapter_tenhawkpresentscom.py @@ -58,7 +58,7 @@ class TenhawkPresentsComSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_test1.py b/fanficdownloader/adapters/adapter_test1.py index 02a12a1..e3b5c5f 100644 --- a/fanficdownloader/adapters/adapter_test1.py +++ b/fanficdownloader/adapters/adapter_test1.py @@ -42,7 +42,7 @@ class TestSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"?sid=1234" + return "http://"+cls.getSiteDomain()+"?sid=1234" def getSiteURLPattern(self): return BaseSiteAdapter.getSiteURLPattern(self)+r'/?\?sid=\d+$' diff --git a/fanficdownloader/adapters/adapter_thealphagatecom.py b/fanficdownloader/adapters/adapter_thealphagatecom.py index 1f1ff0f..4420616 100644 --- a/fanficdownloader/adapters/adapter_thealphagatecom.py +++ b/fanficdownloader/adapters/adapter_thealphagatecom.py @@ -68,7 +68,7 @@ class TheAlphaGateComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_thehexfilesnet.py b/fanficdownloader/adapters/adapter_thehexfilesnet.py index 16f2b71..1316b08 100644 --- a/fanficdownloader/adapters/adapter_thehexfilesnet.py +++ b/fanficdownloader/adapters/adapter_thehexfilesnet.py @@ -72,7 +72,7 @@ class TheHexFilesNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_thehookupzonenet.py b/fanficdownloader/adapters/adapter_thehookupzonenet.py index 5ede49b..2b6c52e 100644 --- a/fanficdownloader/adapters/adapter_thehookupzonenet.py +++ b/fanficdownloader/adapters/adapter_thehookupzonenet.py @@ -93,7 +93,7 @@ class TheHookupZoneNetAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/CriminalMinds/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/CriminalMinds/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/CriminalMinds/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py b/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py index c5ae718..b35eaa5 100644 --- a/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py +++ b/fanficdownloader/adapters/adapter_thepetulantpoetesscom.py @@ -68,7 +68,7 @@ class ThePetulantPoetessComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_thequidditchpitchorg.py b/fanficdownloader/adapters/adapter_thequidditchpitchorg.py index a1cf319..68401bf 100644 --- a/fanficdownloader/adapters/adapter_thequidditchpitchorg.py +++ b/fanficdownloader/adapters/adapter_thequidditchpitchorg.py @@ -77,7 +77,7 @@ class TheQuidditchPitchOrgAdapter(BaseSiteAdapter): # XXX @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://")+"(www\.)?"+re.escape(self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py b/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py index 5d8c56d..ea9afcc 100644 --- a/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py +++ b/fanficdownloader/adapters/adapter_thewriterscoffeeshopcom.py @@ -58,7 +58,7 @@ class TheWritersCoffeeShopComSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/library/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/library/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/library/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_tokrafandomnetcom.py b/fanficdownloader/adapters/adapter_tokrafandomnetcom.py index f624790..1d3a927 100644 --- a/fanficdownloader/adapters/adapter_tokrafandomnetcom.py +++ b/fanficdownloader/adapters/adapter_tokrafandomnetcom.py @@ -69,7 +69,7 @@ class TokraFandomnetComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_trekiverseorg.py b/fanficdownloader/adapters/adapter_trekiverseorg.py index aa53e2e..7b44068 100644 --- a/fanficdownloader/adapters/adapter_trekiverseorg.py +++ b/fanficdownloader/adapters/adapter_trekiverseorg.py @@ -70,8 +70,8 @@ class TrekiverseOrgAdapter(BaseSiteAdapter): return ['trekiverse.org','efiction.trekiverse.org'] @classmethod - def getSiteExampleURLs(self): - return "http://"+self.getSiteDomain()+"/efiction/viewstory.php?sid=1234 http://efiction."+self.getSiteDomain()+"/viewstory.php?sid=1234" + def getSiteExampleURLs(cls): + return "http://"+cls.getSiteDomain()+"/efiction/viewstory.php?sid=1234 http://efiction."+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return r'(http://trekiverse\.org/efiction/viewstory\.php\?sid=\d+|http://efiction\.trekiverse\.org/viewstory\.php\?sid=\d+)' diff --git a/fanficdownloader/adapters/adapter_twilightarchivescom.py b/fanficdownloader/adapters/adapter_twilightarchivescom.py index 8591495..2b8fc20 100644 --- a/fanficdownloader/adapters/adapter_twilightarchivescom.py +++ b/fanficdownloader/adapters/adapter_twilightarchivescom.py @@ -68,7 +68,7 @@ class TwilightArchivesComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/read/1234" + return "http://"+cls.getSiteDomain()+"/read/1234" def getSiteURLPattern(self): return re.escape("http://" + self.getSiteDomain()+"/read/")+r"\d+(/d+)?$" diff --git a/fanficdownloader/adapters/adapter_walkingtheplankorg.py b/fanficdownloader/adapters/adapter_walkingtheplankorg.py index 6fc0f83..8e0cb19 100644 --- a/fanficdownloader/adapters/adapter_walkingtheplankorg.py +++ b/fanficdownloader/adapters/adapter_walkingtheplankorg.py @@ -66,7 +66,7 @@ class WalkingThePlankOrgAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/archive/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/archive/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_whoficcom.py b/fanficdownloader/adapters/adapter_whoficcom.py index 1b91a5e..099dcf4 100644 --- a/fanficdownloader/adapters/adapter_whoficcom.py +++ b/fanficdownloader/adapters/adapter_whoficcom.py @@ -45,7 +45,7 @@ class WhoficComSiteAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+"\d+$" diff --git a/fanficdownloader/adapters/adapter_wizardtalesnet.py b/fanficdownloader/adapters/adapter_wizardtalesnet.py index 8ebf4e6..3845196 100644 --- a/fanficdownloader/adapters/adapter_wizardtalesnet.py +++ b/fanficdownloader/adapters/adapter_wizardtalesnet.py @@ -68,7 +68,7 @@ class WizardTalesNetAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_wolverineandroguecom.py b/fanficdownloader/adapters/adapter_wolverineandroguecom.py index b6c7a65..d2d88a3 100644 --- a/fanficdownloader/adapters/adapter_wolverineandroguecom.py +++ b/fanficdownloader/adapters/adapter_wolverineandroguecom.py @@ -67,7 +67,7 @@ class WolverineAndRogueComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/wrfa/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/wrfa/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/wrfa/viewstory.php?sid=")+r"\d+$" diff --git a/fanficdownloader/adapters/adapter_wraithbaitcom.py b/fanficdownloader/adapters/adapter_wraithbaitcom.py index 9ea0b67..589ec22 100644 --- a/fanficdownloader/adapters/adapter_wraithbaitcom.py +++ b/fanficdownloader/adapters/adapter_wraithbaitcom.py @@ -68,7 +68,7 @@ class WraithBaitComAdapter(BaseSiteAdapter): @classmethod def getSiteExampleURLs(cls): - return "http://"+self.getSiteDomain()+"/viewstory.php?sid=1234" + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$"