diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index fa3ab69b..2c038721 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -4068,18 +4068,6 @@ sitetags_label:Site tags ## Attempt to fix p and br excess from HTML in great many stories fix_excess_space:false -[www.novelupdates.cc] -## Note that novelupdates.cc != novelupdates.com -use_basic_cache:true - -## There is reason to believe that novelupdates.cc may be a -## replacement for wuxiaworld.co, but currently both exist with -## different data. - -## When dedup_order_chapter_list:true, use a heuristic algorithm -## specific to novelupdates.cc order and dedup chapters. -dedup_order_chapter_list:false - [www.phoenixsong.net] ## Some sites require login (or login for some rated stories) The ## program can prompt you, or you can save it in config. In diff --git a/fanficfare/adapters/__init__.py b/fanficfare/adapters/__init__.py index 44a10dc8..7582cc2d 100644 --- a/fanficfare/adapters/__init__.py +++ b/fanficfare/adapters/__init__.py @@ -118,7 +118,6 @@ from . import adapter_wattpadcom from . import adapter_novelonlinefullcom from . import adapter_wwwnovelallcom from . import adapter_wuxiaworldxyz -from . import adapter_novelupdatescc from . import adapter_hentaifoundrycom from . import adapter_mugglenetfanfictioncom from . import adapter_swiorgru diff --git a/fanficfare/adapters/adapter_novelupdatescc.py b/fanficfare/adapters/adapter_novelupdatescc.py deleted file mode 100644 index e454a203..00000000 --- a/fanficfare/adapters/adapter_novelupdatescc.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright 2020 FanFicFare team -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -from __future__ import absolute_import -import logging -logger = logging.getLogger(__name__) - -from .adapter_wuxiaworldxyz import WuxiaWorldXyzSiteAdapter - -def getClass(): - return NovelUpdatesCcSiteAdapter - -class NovelUpdatesCcSiteAdapter(WuxiaWorldXyzSiteAdapter): - DATE_FORMAT = '%Y-%m-%d %H:%M' - - def __init__(self, config, url): - WuxiaWorldXyzSiteAdapter.__init__(self, config, url) - self.story.setMetadata('siteabbrev', 'nucc') - - @staticmethod - def getSiteDomain(): - return 'www.novelupdates.cc' - - @classmethod - def getAcceptDomains(cls): - return ['www.novelupdates.cc','m.novelupdates.cc'] - - @classmethod - def getSiteExampleURLs(cls): - return 'https://%s/story-name' % cls.getSiteDomain() - - def getSiteURLPattern(self): - return r'https?://(www|m)\.novelupdates\.cc/(?P[^/]+)(/)?' diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py index 9d616a1f..21357eb6 100644 --- a/fanficfare/configurable.py +++ b/fanficfare/configurable.py @@ -310,7 +310,7 @@ def get_valid_set_options(): 'include_chapter_banner_images':(['wattpad.com'],None,boollist), 'dateUpdated_method':(['wattpad.com'],None,['modifyDate', 'lastPublishedPart']), 'fix_excess_space': (['novelonlinefull.com', 'novelall.com'], ['epub', 'html'], boollist), - 'dedup_order_chapter_list': (['wuxiaworld.xyz', 'novelupdates.cc'], None, boollist), + 'dedup_order_chapter_list': (['wuxiaworld.xyz'], None, boollist), 'show_nsfw_cover_images': (['fiction.live'], None, boollist), 'show_timestamps': (['fiction.live'], None, boollist), 'prepend_section_titles': (['syosetu.com','kakuyomu.jp'], None, boollist+['firstepisode']), diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 5e74fc97..02a5ae10 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -4043,18 +4043,6 @@ sitetags_label:Site tags ## Attempt to fix p and br excess from HTML in great many stories fix_excess_space:false -[www.novelupdates.cc] -## Note that novelupdates.cc != novelupdates.com -use_basic_cache:true - -## There is reason to believe that novelupdates.cc may be a -## replacement for wuxiaworld.co, but currently both exist with -## different data. - -## When dedup_order_chapter_list:true, use a heuristic algorithm -## specific to novelupdates.cc order and dedup chapters. -dedup_order_chapter_list:false - [www.phoenixsong.net] ## Some sites require login (or login for some rated stories) The ## program can prompt you, or you can save it in config. In