From 5d481b1d2a6e7db74bbe31441222933019db1a58 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 24 Sep 2015 15:54:43 -0500 Subject: [PATCH] Change site www.nickandgreg.net to www.nickngreg.nl while still accepting old URLs. --- fanficfare/adapters/adapter_nickandgregnet.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fanficfare/adapters/adapter_nickandgregnet.py b/fanficfare/adapters/adapter_nickandgregnet.py index 429bd76a..92ae7c1f 100644 --- a/fanficfare/adapters/adapter_nickandgregnet.py +++ b/fanficfare/adapters/adapter_nickandgregnet.py @@ -65,14 +65,18 @@ class NickAndGregNetAdapter(BaseSiteAdapter): @staticmethod # must be @staticmethod, don't remove it. def getSiteDomain(): # The site domain. Does have www here, if it uses it. - return 'www.nickandgreg.net' + return 'www.nickngreg.nl' + @classmethod + def getAcceptDomains(cls): + return ['www.nickngreg.nl','www.nickandgreg.net'] + @classmethod def getSiteExampleURLs(cls): 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+$" + return "http://("+self.getSiteDomain()+"|www.nickandgreg.net)"+re.escape("/desert_archive/viewstory.php?sid=")+r"\d+$" ## Getting the chapter list and the meta data, plus 'is adult' checking.