diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 9326db4..7d374b0 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1268,7 +1268,7 @@ extracategories:NCIS extracategories:Buffy: The Vampire Slayer extracharacters:Willow -[ninelives.dark-solace.org] +[ninelivesarchive.com] ## Site dedicated to these categories/characters/ships extracategories:The Walking Dead extracharacters:Carol,Daryl diff --git a/fanficfare/adapters/__init__.py b/fanficfare/adapters/__init__.py index 8dffa61..7f944fc 100644 --- a/fanficfare/adapters/__init__.py +++ b/fanficfare/adapters/__init__.py @@ -137,7 +137,7 @@ import adapter_itcouldhappennet import adapter_forumsspacebattlescom import adapter_forumssufficientvelocitycom import adapter_questionablequestingcom -import adapter_ninelivesdarksolaceorg +import adapter_ninelivesarchivecom import adapter_masseffect2in import adapter_quotevcom diff --git a/fanficfare/adapters/adapter_ninelivesdarksolaceorg.py b/fanficfare/adapters/adapter_ninelivesarchivecom.py similarity index 54% rename from fanficfare/adapters/adapter_ninelivesdarksolaceorg.py rename to fanficfare/adapters/adapter_ninelivesarchivecom.py index 22f9e78..a96a38a 100644 --- a/fanficfare/adapters/adapter_ninelivesdarksolaceorg.py +++ b/fanficfare/adapters/adapter_ninelivesarchivecom.py @@ -19,12 +19,29 @@ import re from base_efiction_adapter import BaseEfictionAdapter -class NineLivesDarkSolaceAdapter(BaseEfictionAdapter): +class NineLivesAdapter(BaseEfictionAdapter): @staticmethod def getSiteDomain(): - return 'ninelives.dark-solace.org' + return 'ninelivesarchive.com' + @classmethod + def getAcceptDomains(cls): + return ['ninelivesarchive.com','ninelives.dark-solace.org'] + + @classmethod + def getSiteExampleURLs(cls): + return "http://"+cls.getSiteDomain()+"/viewstory.php?sid=1234" + + @classmethod + def getSiteURLPattern(self): + return "http://("+self.getSiteDomain()+"|ninelives.dark-solace.org)"+re.escape("/viewstory.php?sid=")+r"(?P\d+)$" + + @classmethod + def getConfigSections(cls): + "Only needs to be overriden if has additional ini sections." + return ['base_efiction','ninelives.dark-solace.org',cls.getSiteDomain()] + @classmethod def getSiteAbbrev(self): return '9lvs' @@ -32,7 +49,7 @@ class NineLivesDarkSolaceAdapter(BaseEfictionAdapter): @classmethod def getDateFormat(self): return "%B %d, %Y" - + def getClass(): - return NineLivesDarkSolaceAdapter + return NineLivesAdapter diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index ce5cc96..eeeba75 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1256,7 +1256,7 @@ extracategories:NCIS extracategories:Buffy: The Vampire Slayer extracharacters:Willow -[ninelives.dark-solace.org] +[ninelivesarchive.com] ## Site dedicated to these categories/characters/ships extracategories:The Walking Dead extracharacters:Carol,Daryl