From 9c53660299aed38f2eefd351105bb73be6fa9a85 Mon Sep 17 00:00:00 2001 From: Hazel Shanks Date: Sat, 26 Dec 2020 18:20:06 +1300 Subject: [PATCH] December 2020 fiction.live updates: removed 'key tags'/top tags --- calibre-plugin/plugin-defaults.ini | 8 +++----- fanficfare/adapters/adapter_fictionlive.py | 4 +--- fanficfare/defaults.ini | 8 +++----- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 49a3d2f4..e19ed7b8 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1832,17 +1832,15 @@ show_timestamps:false ## site has more original than fan fiction extratags: -extra_valid_entries:key_tags, tags, likes, live, reader_input -extra_titlepage_entries:key_tags, tags, likes, live, reader_input -extra_subject_tags:tags, key_tags -key_tags_label:Key Tags +extra_valid_entries:tags, likes, live, reader_input +extra_titlepage_entries:tags, likes, live, reader_input +extra_subject_tags:tags tags_label:Tags live_label:Next Live Session live_format:%%Y-%%m-%%d at %%H:%%M %%p likes_label:Likes reader_input_label:Reader Input keep_in_order_tags:true -keep_in_order_key_tags:true add_to_output_css: table.voteblock { border-collapse: collapse; } diff --git a/fanficfare/adapters/adapter_fictionlive.py b/fanficfare/adapters/adapter_fictionlive.py index f7e5e720..29817647 100644 --- a/fanficfare/adapters/adapter_fictionlive.py +++ b/fanficfare/adapters/adapter_fictionlive.py @@ -156,9 +156,7 @@ class FictionLiveAdapter(BaseSiteAdapter): show_spoiler_tags = self.getConfig('show_spoiler_tags') spoiler_tags = data['spoilerTags'] if 'spoilerTags' in data else [] - for tag in tags[:5]: - self.story.addToList('key_tags', tag) - for tag in tags[5:]: + for tag in tags: if show_spoiler_tags or not tag in spoiler_tags: self.story.addToList('tags', tag) diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 40e262de..c4c0d28c 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1854,17 +1854,15 @@ show_timestamps:false ## site has more original than fan fiction extratags: -extra_valid_entries:key_tags, tags, likes, live, reader_input -extra_titlepage_entries:key_tags, tags, likes, live, reader_input -extra_subject_tags:tags, key_tags -key_tags_label:Key Tags +extra_valid_entries:tags, likes, live, reader_input +extra_titlepage_entries:tags, likes, live, reader_input +extra_subject_tags:tags tags_label:Tags live_label:Next Live Session live_format:%%Y-%%m-%%d at %%H:%%M %%p likes_label:Likes reader_input_label:Reader Input keep_in_order_tags:true -keep_in_order_key_tags:true add_to_output_css: table.voteblock { border-collapse: collapse; }