From c53fc362bda6c9b408a80fe5a8b04e48fe232ec0 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sun, 3 May 2026 09:06:44 -0500 Subject: [PATCH] Include genre/category in defaults.ini when include_in_X for extragenres/extracategories --- calibre-plugin/plugin-defaults.ini | 30 ++++++++++++++++-------------- fanficfare/defaults.ini | 28 ++++++++++++++-------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 5f2152ed..c1434807 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1599,6 +1599,8 @@ chaptertitles:Prologue,Chapter 1\, Xenos on Cinnabar,Chapter 2\, Sinmay on Kinti [adult-fanfiction.org] +use_basic_cache:true + extra_valid_entries:eroticatags,disclaimer eroticatags_label:Erotica Tags disclaimer_label:Disclaimer @@ -1717,13 +1719,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## AO3 uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -1932,7 +1934,7 @@ make_linkhtml_entries:translators,betas ## For most sites, 'category' is the fandom, but fanfics.me has ## fandoms and a separate category. By making it configurable, users ## can change it. -include_in_category:fandoms +include_in_category:category,fandoms [fanfictalk.com] use_basic_cache:true @@ -2708,13 +2710,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -3015,13 +3017,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -3150,8 +3152,8 @@ bookmarkmemo_label:ブックマークメモ bookmarkprivate_label:非公開ブックマーク subscribed_label:更新通知 -include_in_genre: fullgenre -#include_in_genre: biggenre, smallgenre +include_in_genre: genre, fullgenre +#include_in_genre: genre, biggenre, smallgenre ## adds to titlepage_entries instead of replacing it. #extra_titlepage_entries: fullgenre,biggenre,smallgenre,imprint,freeformtags,comments,reviews,bookmarks,ratingpoints,overallpoints,bookmarked,bookmarkcategory,bookmarkmemo,bookmarkprivate,subscribed @@ -3394,13 +3396,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -3531,7 +3533,7 @@ upvotes_label:Upvotes subscribers_label:Subscribers views_label:Views -include_in_category:tags +include_in_category:category,tags #extra_titlepage_entries:upvotes,subscribers,views @@ -3667,13 +3669,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index f2684c52..8d0feac9 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1712,13 +1712,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## AO3 uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -1927,7 +1927,7 @@ make_linkhtml_entries:translators,betas ## For most sites, 'category' is the fandom, but fanfics.me has ## fandoms and a separate category. By making it configurable, users ## can change it. -include_in_category:fandoms +include_in_category:category,fandoms [fanfictalk.com] use_basic_cache:true @@ -2703,13 +2703,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -3010,13 +3010,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -3145,8 +3145,8 @@ bookmarkmemo_label:ブックマークメモ bookmarkprivate_label:非公開ブックマーク subscribed_label:更新通知 -include_in_genre: fullgenre -#include_in_genre: biggenre, smallgenre +include_in_genre: genre, fullgenre +#include_in_genre: genre, biggenre, smallgenre ## adds to titlepage_entries instead of replacing it. #extra_titlepage_entries: fullgenre,biggenre,smallgenre,imprint,freeformtags,comments,reviews,bookmarks,ratingpoints,overallpoints,bookmarked,bookmarkcategory,bookmarkmemo,bookmarkprivate,subscribed @@ -3389,13 +3389,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it. @@ -3526,7 +3526,7 @@ upvotes_label:Upvotes subscribers_label:Subscribers views_label:Views -include_in_category:tags +include_in_category:category,tags #extra_titlepage_entries:upvotes,subscribers,views @@ -3662,13 +3662,13 @@ make_linkhtml_entries:series00,series01,series02,series03,collections ## hardcoded to include the site specific metadata freeformtags & ## ao3categories in the standard metadata field genre. By making it ## configurable, users can change it. -include_in_genre: freeformtags, ao3categories +include_in_genre: genre, freeformtags, ao3categories ## OTW uses the word 'category' differently than most sites. The ## adapter used to be hardcoded to include the site specific metadata ## fandom in the standard metadata field category. By making it ## configurable, users can change it. -include_in_category:fandoms +include_in_category:category,fandoms ## freeformtags was previously typo'ed as freefromtags. This way, ## freefromtags will still work for people who've used it.