diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index bd4adb96..b25e5739 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -1174,7 +1174,7 @@ website_encodings:Windows-1252,utf8 ## 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,kudos,hits,bookmarks,collections,byline,bookmarked,bookmarktags,bookmarksummary,bookmarkprivate,bookmarkrec,series00,series01,series02,series03,series00Url,series01Url,series02Url,series03Url,series00HTML,series01HTML,series02HTML,series03HTML +extra_valid_entries:fandoms,freeformtags,freefromtags,ao3categories,comments,kudos,hits,bookmarks,collections,byline,bookmarked,bookmarktags,bookmarksummary,bookmarkprivate,bookmarkrec,restricted,series00,series01,series02,series03,series00Url,series01Url,series02Url,series03Url,series00HTML,series01HTML,series02HTML,series03HTML fandoms_label:Fandoms freeformtags_label:Freeform Tags freefromtags_label:Freeform Tags @@ -1192,6 +1192,7 @@ bookmarktags_label:My Bookmark Tags bookmarksummary_label:My Bookmark Summary bookmarkprivate_label:My Bookmark Private bookmarkrec_label:My Bookmark Rec +restricted_label:Restricted to Registered Users series00HTML_label:Series series01HTML_label:Additional Series series02HTML_label:Additional Series diff --git a/fanficfare/adapters/adapter_archiveofourownorg.py b/fanficfare/adapters/adapter_archiveofourownorg.py index bab6b40b..ba328ede 100644 --- a/fanficfare/adapters/adapter_archiveofourownorg.py +++ b/fanficfare/adapters/adapter_archiveofourownorg.py @@ -204,6 +204,9 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter): self.story.setMetadata('bookmarksummary', stripHTML(metasoup.find('textarea',id='bookmark_notes'))) + if metasoup.find('img',alt='(Restricted)'): + self.story.setMetadata('restricted','Restricted') + # Find authorid and URL from... author url. alist = soup.findAll('a', href=re.compile(r"/users/\w+/pseuds/\w+")) if len(alist) < 1: # ao3 allows for author 'Anonymous' with no author link. diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 4abb988a..d034e3a7 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -1210,7 +1210,7 @@ website_encodings:Windows-1252,utf8 ## 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,kudos,hits,bookmarks,collections,byline,bookmarked,bookmarktags,bookmarksummary,bookmarkprivate,bookmarkrec,series00,series01,series02,series03,series00Url,series01Url,series02Url,series03Url,series00HTML,series01HTML,series02HTML,series03HTML +extra_valid_entries:fandoms,freeformtags,freefromtags,ao3categories,comments,kudos,hits,bookmarks,collections,byline,bookmarked,bookmarktags,bookmarksummary,bookmarkprivate,bookmarkrec,restricted,series00,series01,series02,series03,series00Url,series01Url,series02Url,series03Url,series00HTML,series01HTML,series02HTML,series03HTML fandoms_label:Fandoms freeformtags_label:Freeform Tags freefromtags_label:Freeform Tags @@ -1228,6 +1228,7 @@ bookmarktags_label:My Bookmark Tags bookmarksummary_label:My Bookmark Summary bookmarkprivate_label:My Bookmark Private bookmarkrec_label:My Bookmark Rec +restricted_label:Restricted to Registered Users series00HTML_label:Series series01HTML_label:Additional Series series02HTML_label:Additional Series