diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini
index d5a828e8..87fefda5 100644
--- a/calibre-plugin/plugin-defaults.ini
+++ b/calibre-plugin/plugin-defaults.ini
@@ -2686,6 +2686,75 @@ slow_down_sleep_time:2
## datePublished_format
#datechapter_format:%%Y-%%m-%%d
+[starslibrary.net]
+## 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
+## defaults.ini.
+#username:youremail@yourdomain.dom
+#password:yourpassword
+
+[storiesonline.net]
+use_basic_cache:true
+slow_down_sleep_time:1
+## 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
+## defaults.ini.
+## storiesonline.net has started requiring login by email rather than
+## pen name.
+#username:youremail@yourdomain.dom
+#password:yourpassword
+
+## dateUpdated/datePublished don't usually have time, but they do on this site.
+## http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+## Note that ini format requires % to be escaped as %%.
+dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S
+datePublished_format:%%Y-%%m-%%d %%H:%%M:%%S
+
+## Clear FanFiction from defaults, site is original fiction.
+extratags:
+
+extra_valid_entries:size,universe,universeUrl,universeHTML,sitetags,notice,codes,score
+#extra_titlepage_entries:size,universeHTML,sitetags,notice,score
+include_in_codes:sitetags
+
+## adds to include_subject_tags instead of replacing it.
+#extra_subject_tags:sitetags
+
+size_label:Size
+universe_label:Universe
+universeUrl_label:Universe URL
+universeHTML_label:Universe
+sitetags_label:Site Tags
+notice_label:Notice
+score_label:Score
+
+## Assume entryUrl, apply to "%s" to
+## make entryHTML.
+make_linkhtml_entries:universe
+
+## storiesonline.net stories can be in a series and/or a universe. By
+## default, series will be populated with the universe if there is
+## universe but not series.
+universe_as_series: true
+
+## some sites include images that we don't ever want becoming the
+## cover image. This lets you exclude them.
+cover_exclusion_regexp:/css/bir.png
+
+## This site uses shortened title chapters in chapter lists. When set
+## true, this will inject the site's full length chapter title into
+## the chapter text in a smaller h4 tag.
+#inject_chapter_title:false
+
+## append_datepublished_to_storyurl literally appends
+## datePublished(-%Y-%m-%d) to storyUrl. This is an ugly kludge to
+## (hopefully) help address the site's unfortunately habit of
+## *reusing* storyId numbers. Off by default to *not* cause weirdness
+## for those not expecting it.
+#append_datepublished_to_storyurl:false
+
[superlove.sayitditto.net]
## This is a OTW-archive site. Note that ao3categories is still used,
## but labeled "superlove Categories".
@@ -2848,237 +2917,6 @@ slow_down_sleep_time:2
## datePublished_format
#datechapter_format:%%Y-%%m-%%d
-[www.cfaarchive.org]
-## This is a OTW-archive site. Note that ao3categories is still used,
-## but labeled "CFAA Categories".
-
-## 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
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## Note that if 'Hide warnings' and/or 'Hide Additional Tags' are
-## enabled in the account settings, the OTW adapter will not be able
-## to fetch them while logged-in.
-
-## In order to get bookmarktags and bookmarksummary, you need to login
-## all the time. This defaults to off to save time and network
-## traffic. Requires valid username and password when true.
-#always_login:false
-
-## Some sites also require the user to confirm they are adult for
-## adult content. In commandline version, this should go in your
-## personal.ini, not defaults.ini.
-#is_adult:true
-
-## OTW offers a page to download the entire work at once. This can
-## save a lot of network traffic if there are many chapters.
-## True by built-in default.
-#use_view_full_work:true
-
-## www.cfaarchive.org stories allow chapters to be added out of
-## order. So the newest chapter may not be the last one. FanFicFare update
-## doesn't like that. If do_update_hook is uncommented and set true,
-## the adapter will discard all existing chapters from the newest one
-## on when updating to enforce accurate chapters.
-## Starting July 2015, FFF stores chapter URLs in the chapter files.
-## Stories downloaded after that shouldn't need this setting anymore.
-#do_update_hook:false
-
-## Some adapters collect additional meta information beyond the
-## standard ones. They need to be defined in extra_valid_entries to
-## tell the rest of the FanFicFare system about them. They can be
-## used in include_subject_tags, titlepage_entries,
-## extra_titlepage_entries, logpage_entries, extra_logpage_entries,
-## and include_in_* config items. You can also add additional entries
-## here to build up composite metadata entries.
-## www.cfaarchive.org, for example, fills genre (a standard
-## entry) as the composite offreeformtags, ao3categories in
-## include_in_genre. If there's ever more than 4 series, add
-## series04,series04Url etc.
-extra_valid_entries:fandoms, freeformtags, freefromtags,
- ao3categories, comments, chapterslashtotal, chapterstotal, kudos,
- hits, bookmarks, collections, byline, bookmarked, bookmarktags,
- bookmarksummary, bookmarkprivate, bookmarkrec, subscribed,
- markedforlater, restricted, series00, series01, series02, series03,
- series00Url, series01Url, series02Url, series03Url, series00HTML,
- series01HTML, series02HTML, series03HTML
-fandoms_label:Fandoms
-freeformtags_label:Freeform Tags
-freefromtags_label:Freeform Tags
-ao3categories_label:CFAA Categories
-comments_label:Comments
-chapterslashtotal_label:Chapters/Total Chapters
-chapterstotal_label:Total Chapters
-kudos_label:Kudos
-hits_label:Hits
-collections_label:Collections
-## Count of bookmarks on story by all users
-bookmarks_label:Bookmarks
-## Tags & Summary from *your* bookmark on the story. Only collected
-## if always_login:true
-bookmarked_label:I Bookmarked Story
-bookmarktags_label:My Bookmark Tags
-bookmarksummary_label:My Bookmark Summary
-bookmarkprivate_label:My Bookmark Private
-bookmarkrec_label:My Bookmark Rec
-markedforlater_label:I Marked for Later
-subscribed_label:I Subscribed
-restricted_label:Restricted to Registered Users
-series00HTML_label:Series
-series01HTML_label:Additional Series
-series02HTML_label:Additional Series
-series03HTML_label:Additional Series
-
-## Assume entryUrl, apply to "%s" to
-## make entryHTML.
-make_linkhtml_entries:series00,series01,series02,series03
-
-## OTW doesn't have anything it calls 'genre'. The adapter used to be
-## 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
-
-## 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
-
-## freeformtags was previously typo'ed as freefromtags. This way,
-## freefromtags will still work for people who've used it.
-include_in_freefromtags:freeformtags
-
-## chapterslashtotal contains 1/3 or 1/1 or 3/? etc as reported by OTW.
-## chapterstotal is just the total chapters part after the /
-include_in_chapterstotal:chapterslashtotal.NOREPL
-add_to_replace_metadata:
- chapterstotal=>^([0-9])+/(.+)$=>\2
-
-## adds to titlepage_entries instead of replacing it.
-#extra_titlepage_entries: fandoms,freeformtags,ao3categories,comments,chapterslashtotal,chapterstotal,kudos,hits,bookmarks,bookmarked,bookmarktags,bookmarksummary,series01HTML,series02HTML,series03HTML,byline
-
-## adds to include_subject_tags instead of replacing it.
-#extra_subject_tags:fandoms,freeformtags,ao3categories
-
-## OTW chapters can include several different types of notes. We've
-## traditionally included them all in the chapter text, but this allows
-## you to customize which you include. Copy this parameter to your
-## personal.ini and list the ones you don't want.
-#exclude_notes:authorheadnotes,chaptersummary,chapterheadnotes,chapterfootnotes,authorfootnotes,inspiredlinks
-
-## OTW authorfootnotes and inspiredlinks end up in the 'last' chapter,
-## but if updated, then there's a new 'last' chapter, leaving multiple
-## copies. This option applies the 'skip_on_ffdl_update' class to
-## those tags which means they will be removed during epub reading for
-## update. This will only effect chapters added after turning the
-## setting on.
-## Result: Only the last chapter will have end notes.
-## Side-effect: An 'Update Always' that doesn't add a new last
-## chapter will also remove the end notes.
-#remove_authorfootnotes_on_update:false
-
-## OTW is blocking people more aggressively. If you download fewer
-## stories less often you can likely get by with reducing this sleep.
-slow_down_sleep_time:2
-
-## OTW allows users to archive stories they didn't write in certain
-## cases. These are indicated by showing a byline such as:
-## 'Orig Author [archived by Archivist Author]'
-## If use_archived_author is set true (and there's only one author
-## listed), author will be set to 'Orig Author' instead of 'Archivist
-## Author'. authorUrl will still point to the Archivist Author's page.
-#use_archived_author:false
-
-## OTW chapters have 'date' available for each chapter.
-## These can be used with custom output (see
-## https://github.com/JimmXinu/FanFicFare/wiki/CustomOutput ) or with
-## chapter_title_*_pattern settings.
-## Examples for html & epub:
-#[html]
-#tocpage_entry:
-# ${chapter} ${date}
-#[epub]
-#tocpage_entry:
-# ${chapter} ${date}
-
-## The 'date' value for chapters mentioned above can be formated with
-## datechapter_format. Otherwise it will default to
-## datePublished_format
-#datechapter_format:%%Y-%%m-%%d
-
-[starslibrary.net]
-## 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
-## defaults.ini.
-#username:youremail@yourdomain.dom
-#password:yourpassword
-
-[storiesonline.net]
-use_basic_cache:true
-slow_down_sleep_time:1
-## 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
-## defaults.ini.
-## storiesonline.net has started requiring login by email rather than
-## pen name.
-#username:youremail@yourdomain.dom
-#password:yourpassword
-
-## dateUpdated/datePublished don't usually have time, but they do on this site.
-## http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-## Note that ini format requires % to be escaped as %%.
-dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S
-datePublished_format:%%Y-%%m-%%d %%H:%%M:%%S
-
-## Clear FanFiction from defaults, site is original fiction.
-extratags:
-
-extra_valid_entries:size,universe,universeUrl,universeHTML,sitetags,notice,codes,score
-#extra_titlepage_entries:size,universeHTML,sitetags,notice,score
-include_in_codes:sitetags
-
-## adds to include_subject_tags instead of replacing it.
-#extra_subject_tags:sitetags
-
-size_label:Size
-universe_label:Universe
-universeUrl_label:Universe URL
-universeHTML_label:Universe
-sitetags_label:Site Tags
-notice_label:Notice
-score_label:Score
-
-## Assume entryUrl, apply to "%s" to
-## make entryHTML.
-make_linkhtml_entries:universe
-
-## storiesonline.net stories can be in a series and/or a universe. By
-## default, series will be populated with the universe if there is
-## universe but not series.
-universe_as_series: true
-
-## some sites include images that we don't ever want becoming the
-## cover image. This lets you exclude them.
-cover_exclusion_regexp:/css/bir.png
-
-## This site uses shortened title chapters in chapter lists. When set
-## true, this will inject the site's full length chapter title into
-## the chapter text in a smaller h4 tag.
-#inject_chapter_title:false
-
-## append_datepublished_to_storyurl literally appends
-## datePublished(-%Y-%m-%d) to storyUrl. This is an ugly kludge to
-## (hopefully) help address the site's unfortunately habit of
-## *reusing* storyId numbers. Off by default to *not* cause weirdness
-## for those not expecting it.
-#append_datepublished_to_storyurl:false
-
[syosetu.com]
use_basic_cache:true
@@ -3472,6 +3310,13 @@ slow_down_sleep_time:2
#username:YourName
#password:yourpassword
+[www.aneroticstory.com]
+use_basic_cache:true
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content. In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
[www.asexstories.com]
## Some sites also require the user to confirm they are adult for
## adult content. Uncomment by removing '#' in front of is_adult.
@@ -3538,6 +3383,168 @@ eroticatags_label:Erotica Tags
extra_titlepage_entries:size,comments,eroticatags
keep_style_attr: false
+[www.cfaarchive.org]
+## This is a OTW-archive site. Note that ao3categories is still used,
+## but labeled "CFAA Categories".
+
+## 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
+## defaults.ini.
+#username:YourName
+#password:yourpassword
+
+## Note that if 'Hide warnings' and/or 'Hide Additional Tags' are
+## enabled in the account settings, the OTW adapter will not be able
+## to fetch them while logged-in.
+
+## In order to get bookmarktags and bookmarksummary, you need to login
+## all the time. This defaults to off to save time and network
+## traffic. Requires valid username and password when true.
+#always_login:false
+
+## Some sites also require the user to confirm they are adult for
+## adult content. In commandline version, this should go in your
+## personal.ini, not defaults.ini.
+#is_adult:true
+
+## OTW offers a page to download the entire work at once. This can
+## save a lot of network traffic if there are many chapters.
+## True by built-in default.
+#use_view_full_work:true
+
+## www.cfaarchive.org stories allow chapters to be added out of
+## order. So the newest chapter may not be the last one. FanFicFare update
+## doesn't like that. If do_update_hook is uncommented and set true,
+## the adapter will discard all existing chapters from the newest one
+## on when updating to enforce accurate chapters.
+## Starting July 2015, FFF stores chapter URLs in the chapter files.
+## Stories downloaded after that shouldn't need this setting anymore.
+#do_update_hook:false
+
+## Some adapters collect additional meta information beyond the
+## standard ones. They need to be defined in extra_valid_entries to
+## tell the rest of the FanFicFare system about them. They can be
+## used in include_subject_tags, titlepage_entries,
+## extra_titlepage_entries, logpage_entries, extra_logpage_entries,
+## and include_in_* config items. You can also add additional entries
+## here to build up composite metadata entries.
+## www.cfaarchive.org, for example, fills genre (a standard
+## entry) as the composite offreeformtags, ao3categories in
+## include_in_genre. If there's ever more than 4 series, add
+## series04,series04Url etc.
+extra_valid_entries:fandoms, freeformtags, freefromtags,
+ ao3categories, comments, chapterslashtotal, chapterstotal, kudos,
+ hits, bookmarks, collections, byline, bookmarked, bookmarktags,
+ bookmarksummary, bookmarkprivate, bookmarkrec, subscribed,
+ markedforlater, restricted, series00, series01, series02, series03,
+ series00Url, series01Url, series02Url, series03Url, series00HTML,
+ series01HTML, series02HTML, series03HTML
+fandoms_label:Fandoms
+freeformtags_label:Freeform Tags
+freefromtags_label:Freeform Tags
+ao3categories_label:CFAA Categories
+comments_label:Comments
+chapterslashtotal_label:Chapters/Total Chapters
+chapterstotal_label:Total Chapters
+kudos_label:Kudos
+hits_label:Hits
+collections_label:Collections
+## Count of bookmarks on story by all users
+bookmarks_label:Bookmarks
+## Tags & Summary from *your* bookmark on the story. Only collected
+## if always_login:true
+bookmarked_label:I Bookmarked Story
+bookmarktags_label:My Bookmark Tags
+bookmarksummary_label:My Bookmark Summary
+bookmarkprivate_label:My Bookmark Private
+bookmarkrec_label:My Bookmark Rec
+markedforlater_label:I Marked for Later
+subscribed_label:I Subscribed
+restricted_label:Restricted to Registered Users
+series00HTML_label:Series
+series01HTML_label:Additional Series
+series02HTML_label:Additional Series
+series03HTML_label:Additional Series
+
+## Assume entryUrl, apply to "%s" to
+## make entryHTML.
+make_linkhtml_entries:series00,series01,series02,series03
+
+## OTW doesn't have anything it calls 'genre'. The adapter used to be
+## 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
+
+## 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
+
+## freeformtags was previously typo'ed as freefromtags. This way,
+## freefromtags will still work for people who've used it.
+include_in_freefromtags:freeformtags
+
+## chapterslashtotal contains 1/3 or 1/1 or 3/? etc as reported by OTW.
+## chapterstotal is just the total chapters part after the /
+include_in_chapterstotal:chapterslashtotal.NOREPL
+add_to_replace_metadata:
+ chapterstotal=>^([0-9])+/(.+)$=>\2
+
+## adds to titlepage_entries instead of replacing it.
+#extra_titlepage_entries: fandoms,freeformtags,ao3categories,comments,chapterslashtotal,chapterstotal,kudos,hits,bookmarks,bookmarked,bookmarktags,bookmarksummary,series01HTML,series02HTML,series03HTML,byline
+
+## adds to include_subject_tags instead of replacing it.
+#extra_subject_tags:fandoms,freeformtags,ao3categories
+
+## OTW chapters can include several different types of notes. We've
+## traditionally included them all in the chapter text, but this allows
+## you to customize which you include. Copy this parameter to your
+## personal.ini and list the ones you don't want.
+#exclude_notes:authorheadnotes,chaptersummary,chapterheadnotes,chapterfootnotes,authorfootnotes,inspiredlinks
+
+## OTW authorfootnotes and inspiredlinks end up in the 'last' chapter,
+## but if updated, then there's a new 'last' chapter, leaving multiple
+## copies. This option applies the 'skip_on_ffdl_update' class to
+## those tags which means they will be removed during epub reading for
+## update. This will only effect chapters added after turning the
+## setting on.
+## Result: Only the last chapter will have end notes.
+## Side-effect: An 'Update Always' that doesn't add a new last
+## chapter will also remove the end notes.
+#remove_authorfootnotes_on_update:false
+
+## OTW is blocking people more aggressively. If you download fewer
+## stories less often you can likely get by with reducing this sleep.
+slow_down_sleep_time:2
+
+## OTW allows users to archive stories they didn't write in certain
+## cases. These are indicated by showing a byline such as:
+## 'Orig Author [archived by Archivist Author]'
+## If use_archived_author is set true (and there's only one author
+## listed), author will be set to 'Orig Author' instead of 'Archivist
+## Author'. authorUrl will still point to the Archivist Author's page.
+#use_archived_author:false
+
+## OTW chapters have 'date' available for each chapter.
+## These can be used with custom output (see
+## https://github.com/JimmXinu/FanFicFare/wiki/CustomOutput ) or with
+## chapter_title_*_pattern settings.
+## Examples for html & epub:
+#[html]
+#tocpage_entry:
+# ${chapter} ${date}
+#[epub]
+#tocpage_entry:
+# ${chapter} ${date}
+
+## The 'date' value for chapters mentioned above can be formated with
+## datechapter_format. Otherwise it will default to
+## datePublished_format
+#datechapter_format:%%Y-%%m-%%d
+
[www.deviantart.com]
use_basic_cache:true
## Some sites require login (or login for some rated stories) The
@@ -4337,10 +4344,3 @@ use_basic_cache:true
## specific to wuxiaworld.xyz order and dedup chapters.
dedup_order_chapter_list:false
-[www.aneroticstory.com]
-use_basic_cache:true
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content. In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-
diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini
index 70bee1f4..cbde0deb 100644
--- a/fanficfare/defaults.ini
+++ b/fanficfare/defaults.ini
@@ -2681,6 +2681,75 @@ slow_down_sleep_time:2
## datePublished_format
#datechapter_format:%%Y-%%m-%%d
+[starslibrary.net]
+## 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
+## defaults.ini.
+#username:youremail@yourdomain.dom
+#password:yourpassword
+
+[storiesonline.net]
+use_basic_cache:true
+slow_down_sleep_time:1
+## 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
+## defaults.ini.
+## storiesonline.net has started requiring login by email rather than
+## pen name.
+#username:youremail@yourdomain.dom
+#password:yourpassword
+
+## dateUpdated/datePublished don't usually have time, but they do on this site.
+## http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+## Note that ini format requires % to be escaped as %%.
+dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S
+datePublished_format:%%Y-%%m-%%d %%H:%%M:%%S
+
+## Clear FanFiction from defaults, site is original fiction.
+extratags:
+
+extra_valid_entries:size,universe,universeUrl,universeHTML,sitetags,notice,codes,score
+#extra_titlepage_entries:size,universeHTML,sitetags,notice,score
+include_in_codes:sitetags
+
+## adds to include_subject_tags instead of replacing it.
+#extra_subject_tags:sitetags
+
+size_label:Size
+universe_label:Universe
+universeUrl_label:Universe URL
+universeHTML_label:Universe
+sitetags_label:Site Tags
+notice_label:Notice
+score_label:Score
+
+## Assume entryUrl, apply to "%s" to
+## make entryHTML.
+make_linkhtml_entries:universe
+
+## storiesonline.net stories can be in a series and/or a universe. By
+## default, series will be populated with the universe if there is
+## universe but not series.
+universe_as_series: true
+
+## some sites include images that we don't ever want becoming the
+## cover image. This lets you exclude them.
+cover_exclusion_regexp:/css/bir.png
+
+## This site uses shortened title chapters in chapter lists. When set
+## true, this will inject the site's full length chapter title into
+## the chapter text in a smaller h4 tag.
+#inject_chapter_title:false
+
+## append_datepublished_to_storyurl literally appends
+## datePublished(-%Y-%m-%d) to storyUrl. This is an ugly kludge to
+## (hopefully) help address the site's unfortunately habit of
+## *reusing* storyId numbers. Off by default to *not* cause weirdness
+## for those not expecting it.
+#append_datepublished_to_storyurl:false
+
[superlove.sayitditto.net]
## This is a OTW-archive site. Note that ao3categories is still used,
## but labeled "superlove Categories".
@@ -2843,237 +2912,6 @@ slow_down_sleep_time:2
## datePublished_format
#datechapter_format:%%Y-%%m-%%d
-[www.cfaarchive.org]
-## This is a OTW-archive site. Note that ao3categories is still used,
-## but labeled "CFAA Categories".
-
-## 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
-## defaults.ini.
-#username:YourName
-#password:yourpassword
-
-## Note that if 'Hide warnings' and/or 'Hide Additional Tags' are
-## enabled in the account settings, the OTW adapter will not be able
-## to fetch them while logged-in.
-
-## In order to get bookmarktags and bookmarksummary, you need to login
-## all the time. This defaults to off to save time and network
-## traffic. Requires valid username and password when true.
-#always_login:false
-
-## Some sites also require the user to confirm they are adult for
-## adult content. In commandline version, this should go in your
-## personal.ini, not defaults.ini.
-#is_adult:true
-
-## OTW offers a page to download the entire work at once. This can
-## save a lot of network traffic if there are many chapters.
-## True by built-in default.
-#use_view_full_work:true
-
-## www.cfaarchive.org stories allow chapters to be added out of
-## order. So the newest chapter may not be the last one. FanFicFare update
-## doesn't like that. If do_update_hook is uncommented and set true,
-## the adapter will discard all existing chapters from the newest one
-## on when updating to enforce accurate chapters.
-## Starting July 2015, FFF stores chapter URLs in the chapter files.
-## Stories downloaded after that shouldn't need this setting anymore.
-#do_update_hook:false
-
-## Some adapters collect additional meta information beyond the
-## standard ones. They need to be defined in extra_valid_entries to
-## tell the rest of the FanFicFare system about them. They can be
-## used in include_subject_tags, titlepage_entries,
-## extra_titlepage_entries, logpage_entries, extra_logpage_entries,
-## and include_in_* config items. You can also add additional entries
-## here to build up composite metadata entries.
-## www.cfaarchive.org, for example, fills genre (a standard
-## entry) as the composite offreeformtags, ao3categories in
-## include_in_genre. If there's ever more than 4 series, add
-## series04,series04Url etc.
-extra_valid_entries:fandoms, freeformtags, freefromtags,
- ao3categories, comments, chapterslashtotal, chapterstotal, kudos,
- hits, bookmarks, collections, byline, bookmarked, bookmarktags,
- bookmarksummary, bookmarkprivate, bookmarkrec, subscribed,
- markedforlater, restricted, series00, series01, series02, series03,
- series00Url, series01Url, series02Url, series03Url, series00HTML,
- series01HTML, series02HTML, series03HTML
-fandoms_label:Fandoms
-freeformtags_label:Freeform Tags
-freefromtags_label:Freeform Tags
-ao3categories_label:CFAA Categories
-comments_label:Comments
-chapterslashtotal_label:Chapters/Total Chapters
-chapterstotal_label:Total Chapters
-kudos_label:Kudos
-hits_label:Hits
-collections_label:Collections
-## Count of bookmarks on story by all users
-bookmarks_label:Bookmarks
-## Tags & Summary from *your* bookmark on the story. Only collected
-## if always_login:true
-bookmarked_label:I Bookmarked Story
-bookmarktags_label:My Bookmark Tags
-bookmarksummary_label:My Bookmark Summary
-bookmarkprivate_label:My Bookmark Private
-bookmarkrec_label:My Bookmark Rec
-markedforlater_label:I Marked for Later
-subscribed_label:I Subscribed
-restricted_label:Restricted to Registered Users
-series00HTML_label:Series
-series01HTML_label:Additional Series
-series02HTML_label:Additional Series
-series03HTML_label:Additional Series
-
-## Assume entryUrl, apply to "%s" to
-## make entryHTML.
-make_linkhtml_entries:series00,series01,series02,series03
-
-## OTW doesn't have anything it calls 'genre'. The adapter used to be
-## 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
-
-## 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
-
-## freeformtags was previously typo'ed as freefromtags. This way,
-## freefromtags will still work for people who've used it.
-include_in_freefromtags:freeformtags
-
-## chapterslashtotal contains 1/3 or 1/1 or 3/? etc as reported by OTW.
-## chapterstotal is just the total chapters part after the /
-include_in_chapterstotal:chapterslashtotal.NOREPL
-add_to_replace_metadata:
- chapterstotal=>^([0-9])+/(.+)$=>\2
-
-## adds to titlepage_entries instead of replacing it.
-#extra_titlepage_entries: fandoms,freeformtags,ao3categories,comments,chapterslashtotal,chapterstotal,kudos,hits,bookmarks,bookmarked,bookmarktags,bookmarksummary,series01HTML,series02HTML,series03HTML,byline
-
-## adds to include_subject_tags instead of replacing it.
-#extra_subject_tags:fandoms,freeformtags,ao3categories
-
-## OTW chapters can include several different types of notes. We've
-## traditionally included them all in the chapter text, but this allows
-## you to customize which you include. Copy this parameter to your
-## personal.ini and list the ones you don't want.
-#exclude_notes:authorheadnotes,chaptersummary,chapterheadnotes,chapterfootnotes,authorfootnotes,inspiredlinks
-
-## OTW authorfootnotes and inspiredlinks end up in the 'last' chapter,
-## but if updated, then there's a new 'last' chapter, leaving multiple
-## copies. This option applies the 'skip_on_ffdl_update' class to
-## those tags which means they will be removed during epub reading for
-## update. This will only effect chapters added after turning the
-## setting on.
-## Result: Only the last chapter will have end notes.
-## Side-effect: An 'Update Always' that doesn't add a new last
-## chapter will also remove the end notes.
-#remove_authorfootnotes_on_update:false
-
-## OTW is blocking people more aggressively. If you download fewer
-## stories less often you can likely get by with reducing this sleep.
-slow_down_sleep_time:2
-
-## OTW allows users to archive stories they didn't write in certain
-## cases. These are indicated by showing a byline such as:
-## 'Orig Author [archived by Archivist Author]'
-## If use_archived_author is set true (and there's only one author
-## listed), author will be set to 'Orig Author' instead of 'Archivist
-## Author'. authorUrl will still point to the Archivist Author's page.
-#use_archived_author:false
-
-## OTW chapters have 'date' available for each chapter.
-## These can be used with custom output (see
-## https://github.com/JimmXinu/FanFicFare/wiki/CustomOutput ) or with
-## chapter_title_*_pattern settings.
-## Examples for html & epub:
-#[html]
-#tocpage_entry:
-# ${chapter} ${date}
-#[epub]
-#tocpage_entry:
-# ${chapter} ${date}
-
-## The 'date' value for chapters mentioned above can be formated with
-## datechapter_format. Otherwise it will default to
-## datePublished_format
-#datechapter_format:%%Y-%%m-%%d
-
-[starslibrary.net]
-## 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
-## defaults.ini.
-#username:youremail@yourdomain.dom
-#password:yourpassword
-
-[storiesonline.net]
-use_basic_cache:true
-slow_down_sleep_time:1
-## 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
-## defaults.ini.
-## storiesonline.net has started requiring login by email rather than
-## pen name.
-#username:youremail@yourdomain.dom
-#password:yourpassword
-
-## dateUpdated/datePublished don't usually have time, but they do on this site.
-## http://docs.python.org/library/datetime.html#strftime-strptime-behavior
-## Note that ini format requires % to be escaped as %%.
-dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S
-datePublished_format:%%Y-%%m-%%d %%H:%%M:%%S
-
-## Clear FanFiction from defaults, site is original fiction.
-extratags:
-
-extra_valid_entries:size,universe,universeUrl,universeHTML,sitetags,notice,codes,score
-#extra_titlepage_entries:size,universeHTML,sitetags,notice,score
-include_in_codes:sitetags
-
-## adds to include_subject_tags instead of replacing it.
-#extra_subject_tags:sitetags
-
-size_label:Size
-universe_label:Universe
-universeUrl_label:Universe URL
-universeHTML_label:Universe
-sitetags_label:Site Tags
-notice_label:Notice
-score_label:Score
-
-## Assume entryUrl, apply to "%s" to
-## make entryHTML.
-make_linkhtml_entries:universe
-
-## storiesonline.net stories can be in a series and/or a universe. By
-## default, series will be populated with the universe if there is
-## universe but not series.
-universe_as_series: true
-
-## some sites include images that we don't ever want becoming the
-## cover image. This lets you exclude them.
-cover_exclusion_regexp:/css/bir.png
-
-## This site uses shortened title chapters in chapter lists. When set
-## true, this will inject the site's full length chapter title into
-## the chapter text in a smaller h4 tag.
-#inject_chapter_title:false
-
-## append_datepublished_to_storyurl literally appends
-## datePublished(-%Y-%m-%d) to storyUrl. This is an ugly kludge to
-## (hopefully) help address the site's unfortunately habit of
-## *reusing* storyId numbers. Off by default to *not* cause weirdness
-## for those not expecting it.
-#append_datepublished_to_storyurl:false
-
[syosetu.com]
use_basic_cache:true
@@ -3467,6 +3305,13 @@ slow_down_sleep_time:2
#username:YourName
#password:yourpassword
+[www.aneroticstory.com]
+use_basic_cache:true
+## Some sites do not require a login, but do require the user to
+## confirm they are adult for adult content. In commandline version,
+## this should go in your personal.ini, not defaults.ini.
+#is_adult:true
+
[www.asexstories.com]
## Some sites also require the user to confirm they are adult for
## adult content. Uncomment by removing '#' in front of is_adult.
@@ -3533,6 +3378,168 @@ eroticatags_label:Erotica Tags
extra_titlepage_entries:size,comments,eroticatags
keep_style_attr: false
+[www.cfaarchive.org]
+## This is a OTW-archive site. Note that ao3categories is still used,
+## but labeled "CFAA Categories".
+
+## 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
+## defaults.ini.
+#username:YourName
+#password:yourpassword
+
+## Note that if 'Hide warnings' and/or 'Hide Additional Tags' are
+## enabled in the account settings, the OTW adapter will not be able
+## to fetch them while logged-in.
+
+## In order to get bookmarktags and bookmarksummary, you need to login
+## all the time. This defaults to off to save time and network
+## traffic. Requires valid username and password when true.
+#always_login:false
+
+## Some sites also require the user to confirm they are adult for
+## adult content. In commandline version, this should go in your
+## personal.ini, not defaults.ini.
+#is_adult:true
+
+## OTW offers a page to download the entire work at once. This can
+## save a lot of network traffic if there are many chapters.
+## True by built-in default.
+#use_view_full_work:true
+
+## www.cfaarchive.org stories allow chapters to be added out of
+## order. So the newest chapter may not be the last one. FanFicFare update
+## doesn't like that. If do_update_hook is uncommented and set true,
+## the adapter will discard all existing chapters from the newest one
+## on when updating to enforce accurate chapters.
+## Starting July 2015, FFF stores chapter URLs in the chapter files.
+## Stories downloaded after that shouldn't need this setting anymore.
+#do_update_hook:false
+
+## Some adapters collect additional meta information beyond the
+## standard ones. They need to be defined in extra_valid_entries to
+## tell the rest of the FanFicFare system about them. They can be
+## used in include_subject_tags, titlepage_entries,
+## extra_titlepage_entries, logpage_entries, extra_logpage_entries,
+## and include_in_* config items. You can also add additional entries
+## here to build up composite metadata entries.
+## www.cfaarchive.org, for example, fills genre (a standard
+## entry) as the composite offreeformtags, ao3categories in
+## include_in_genre. If there's ever more than 4 series, add
+## series04,series04Url etc.
+extra_valid_entries:fandoms, freeformtags, freefromtags,
+ ao3categories, comments, chapterslashtotal, chapterstotal, kudos,
+ hits, bookmarks, collections, byline, bookmarked, bookmarktags,
+ bookmarksummary, bookmarkprivate, bookmarkrec, subscribed,
+ markedforlater, restricted, series00, series01, series02, series03,
+ series00Url, series01Url, series02Url, series03Url, series00HTML,
+ series01HTML, series02HTML, series03HTML
+fandoms_label:Fandoms
+freeformtags_label:Freeform Tags
+freefromtags_label:Freeform Tags
+ao3categories_label:CFAA Categories
+comments_label:Comments
+chapterslashtotal_label:Chapters/Total Chapters
+chapterstotal_label:Total Chapters
+kudos_label:Kudos
+hits_label:Hits
+collections_label:Collections
+## Count of bookmarks on story by all users
+bookmarks_label:Bookmarks
+## Tags & Summary from *your* bookmark on the story. Only collected
+## if always_login:true
+bookmarked_label:I Bookmarked Story
+bookmarktags_label:My Bookmark Tags
+bookmarksummary_label:My Bookmark Summary
+bookmarkprivate_label:My Bookmark Private
+bookmarkrec_label:My Bookmark Rec
+markedforlater_label:I Marked for Later
+subscribed_label:I Subscribed
+restricted_label:Restricted to Registered Users
+series00HTML_label:Series
+series01HTML_label:Additional Series
+series02HTML_label:Additional Series
+series03HTML_label:Additional Series
+
+## Assume entryUrl, apply to "%s" to
+## make entryHTML.
+make_linkhtml_entries:series00,series01,series02,series03
+
+## OTW doesn't have anything it calls 'genre'. The adapter used to be
+## 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
+
+## 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
+
+## freeformtags was previously typo'ed as freefromtags. This way,
+## freefromtags will still work for people who've used it.
+include_in_freefromtags:freeformtags
+
+## chapterslashtotal contains 1/3 or 1/1 or 3/? etc as reported by OTW.
+## chapterstotal is just the total chapters part after the /
+include_in_chapterstotal:chapterslashtotal.NOREPL
+add_to_replace_metadata:
+ chapterstotal=>^([0-9])+/(.+)$=>\2
+
+## adds to titlepage_entries instead of replacing it.
+#extra_titlepage_entries: fandoms,freeformtags,ao3categories,comments,chapterslashtotal,chapterstotal,kudos,hits,bookmarks,bookmarked,bookmarktags,bookmarksummary,series01HTML,series02HTML,series03HTML,byline
+
+## adds to include_subject_tags instead of replacing it.
+#extra_subject_tags:fandoms,freeformtags,ao3categories
+
+## OTW chapters can include several different types of notes. We've
+## traditionally included them all in the chapter text, but this allows
+## you to customize which you include. Copy this parameter to your
+## personal.ini and list the ones you don't want.
+#exclude_notes:authorheadnotes,chaptersummary,chapterheadnotes,chapterfootnotes,authorfootnotes,inspiredlinks
+
+## OTW authorfootnotes and inspiredlinks end up in the 'last' chapter,
+## but if updated, then there's a new 'last' chapter, leaving multiple
+## copies. This option applies the 'skip_on_ffdl_update' class to
+## those tags which means they will be removed during epub reading for
+## update. This will only effect chapters added after turning the
+## setting on.
+## Result: Only the last chapter will have end notes.
+## Side-effect: An 'Update Always' that doesn't add a new last
+## chapter will also remove the end notes.
+#remove_authorfootnotes_on_update:false
+
+## OTW is blocking people more aggressively. If you download fewer
+## stories less often you can likely get by with reducing this sleep.
+slow_down_sleep_time:2
+
+## OTW allows users to archive stories they didn't write in certain
+## cases. These are indicated by showing a byline such as:
+## 'Orig Author [archived by Archivist Author]'
+## If use_archived_author is set true (and there's only one author
+## listed), author will be set to 'Orig Author' instead of 'Archivist
+## Author'. authorUrl will still point to the Archivist Author's page.
+#use_archived_author:false
+
+## OTW chapters have 'date' available for each chapter.
+## These can be used with custom output (see
+## https://github.com/JimmXinu/FanFicFare/wiki/CustomOutput ) or with
+## chapter_title_*_pattern settings.
+## Examples for html & epub:
+#[html]
+#tocpage_entry:
+# ${chapter} ${date}
+#[epub]
+#tocpage_entry:
+# ${chapter} ${date}
+
+## The 'date' value for chapters mentioned above can be formated with
+## datechapter_format. Otherwise it will default to
+## datePublished_format
+#datechapter_format:%%Y-%%m-%%d
+
[www.deviantart.com]
use_basic_cache:true
## Some sites require login (or login for some rated stories) The
@@ -4312,10 +4319,3 @@ use_basic_cache:true
## specific to wuxiaworld.xyz order and dedup chapters.
dedup_order_chapter_list:false
-[www.aneroticstory.com]
-use_basic_cache:true
-## Some sites do not require a login, but do require the user to
-## confirm they are adult for adult content. In commandline version,
-## this should go in your personal.ini, not defaults.ini.
-#is_adult:true
-