From 897976b4bdccb478b57e7639f7d5e19b8dc8a0aa Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Wed, 14 Oct 2015 16:28:02 -0500 Subject: [PATCH] Accept only forum.questionablequesting.com, not questionablequesting.com. --- calibre-plugin/plugin-defaults.ini | 2 +- fanficfare/adapters/__init__.py | 2 +- ....py => adapter_forumquestionablequestingcom.py} | 14 +------------- fanficfare/defaults.ini | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) rename fanficfare/adapters/{adapter_questionablequestingcom.py => adapter_forumquestionablequestingcom.py} (69%) diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index a10d2cf..9c83500 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1371,7 +1371,7 @@ extracategories:My Little Pony: Friendship is Magic ## Site dedicated to these categories/characters/ships extracategories:The Pretender -[questionablequesting.com] +[forum.questionablequesting.com] ## see [base_xenforoforum] ## Some sites require login (or login for some rated stories) The diff --git a/fanficfare/adapters/__init__.py b/fanficfare/adapters/__init__.py index 4ee6a44..bbf81a6 100644 --- a/fanficfare/adapters/__init__.py +++ b/fanficfare/adapters/__init__.py @@ -135,7 +135,7 @@ import adapter_tgstorytimecom import adapter_itcouldhappennet import adapter_forumsspacebattlescom import adapter_forumssufficientvelocitycom -import adapter_questionablequestingcom +import adapter_forumquestionablequestingcom import adapter_ninelivesarchivecom import adapter_masseffect2in import adapter_quotevcom diff --git a/fanficfare/adapters/adapter_questionablequestingcom.py b/fanficfare/adapters/adapter_forumquestionablequestingcom.py similarity index 69% rename from fanficfare/adapters/adapter_questionablequestingcom.py rename to fanficfare/adapters/adapter_forumquestionablequestingcom.py index 63355f1..20e29d5 100644 --- a/fanficfare/adapters/adapter_questionablequestingcom.py +++ b/fanficfare/adapters/adapter_forumquestionablequestingcom.py @@ -32,17 +32,5 @@ class QuestionablequestingComAdapter(BaseXenForoForumAdapter): @staticmethod # must be @staticmethod, don't remove it. def getSiteDomain(): # The site domain. Does have www here, if it uses it. - return 'questionablequesting.com' + return 'forum.questionablequesting.com' - @classmethod - def getAcceptDomains(cls): - return ["forum."+cls.getSiteDomain(),cls.getSiteDomain()] - - @classmethod - def getConfigSections(cls): - "Only needs to be overriden if has additional ini sections." - return ['base_xenforoforum','forum.'+cls.getSiteDomain(),cls.getSiteDomain()] - - def getSiteURLPattern(self): - return r'https?://(forum.)?'+re.escape(self.getSiteDomain())+r'/(?Pthreads|posts)/(.+\.)?(?P\d+)/?' - diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 8e980a8..998527d 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1359,7 +1359,7 @@ extracategories:My Little Pony: Friendship is Magic ## Site dedicated to these categories/characters/ships extracategories:The Pretender -[questionablequesting.com] +[forum.questionablequesting.com] ## see [base_xenforoforum] ## Some sites require login (or login for some rated stories) The