diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 5dc046ae..121d66ee 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1644,7 +1644,7 @@ include_in_category:fandoms [fanfiction-junkies.de] website_encodings:Windows-1252,utf8 -[fanfiction.tenhawkpresents.com] +[fanfic.tenhawkpresents.ink] ## Some sites require login (or login for some rated stories) The ## program can prompt you, or you can save it in config. In ## commandline version, this should go in your personal.ini, not diff --git a/fanficfare/adapters/__init__.py b/fanficfare/adapters/__init__.py index 9d6c1e63..698bb3f9 100644 --- a/fanficfare/adapters/__init__.py +++ b/fanficfare/adapters/__init__.py @@ -41,7 +41,7 @@ from . import adapter_ficwadcom from . import adapter_fimfictionnet from . import adapter_mediaminerorg from . import adapter_potionsandsnitches -from . import adapter_tenhawkpresentscom +from . import adapter_tenhawkpresents from . import adapter_adastrafanficcom from . import adapter_tthfanficorg from . import adapter_twilightednet diff --git a/fanficfare/adapters/adapter_tenhawkpresentscom.py b/fanficfare/adapters/adapter_tenhawkpresents.py similarity index 96% rename from fanficfare/adapters/adapter_tenhawkpresentscom.py rename to fanficfare/adapters/adapter_tenhawkpresents.py index c65f23a1..861ecbc4 100644 --- a/fanficfare/adapters/adapter_tenhawkpresentscom.py +++ b/fanficfare/adapters/adapter_tenhawkpresents.py @@ -30,11 +30,11 @@ from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate -class TenhawkPresentsComSiteAdapter(BaseSiteAdapter): +class TenhawkPresentsSiteAdapter(BaseSiteAdapter): def __init__(self, config, url): BaseSiteAdapter.__init__(self, config, url) - self.story.setMetadata('siteabbrev','thpc') + self.story.setMetadata('siteabbrev','thpi') self.username = "NoneGiven" # if left empty, site doesn't return any message at all. self.password = "" self.is_adult=False @@ -50,14 +50,15 @@ class TenhawkPresentsComSiteAdapter(BaseSiteAdapter): @staticmethod def getSiteDomain(): - return 'fanfiction.tenhawkpresents.com' + return 'fanfic.tenhawkpresents.ink' @classmethod def getSiteExampleURLs(cls): return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" def getSiteURLPattern(self): - return re.escape("http://"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" + # accept https, but don't use it--site SSL is broken. + return r"https?:"+re.escape("//"+self.getSiteDomain()+"/viewstory.php?sid=")+r"\d+$" def use_pagecache(self): ''' @@ -247,5 +248,5 @@ class TenhawkPresentsComSiteAdapter(BaseSiteAdapter): return self.utf8FromSoup(url,span) def getClass(): - return TenhawkPresentsComSiteAdapter + return TenhawkPresentsSiteAdapter diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 36a7e7a9..b51c6213 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1677,7 +1677,7 @@ include_in_category:fandoms [fanfiction-junkies.de] website_encodings:Windows-1252,utf8 -[fanfiction.tenhawkpresents.com] +[fanfic.tenhawkpresents.ink] ## Some sites require login (or login for some rated stories) The ## program can prompt you, or you can save it in config. In ## commandline version, this should go in your personal.ini, not