diff --git a/defaults.ini b/defaults.ini index 7d941082..806d33bb 100644 --- a/defaults.ini +++ b/defaults.ini @@ -469,14 +469,15 @@ extratags: FanFiction,Testing,HTML #is_adult:true ## AO3 adapter defines a few extra metadata entries. -extra_valid_entries:fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks +extra_valid_entries:fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks,collections fandoms_label:Fandoms freefromtags_label:Freeform Tags ao3categories_label:AO3 Categories comments_label:Comments kudos_label:Kudos hits_label:Hits -bookmarks:Bookmarks +collections_label:Collections +bookmarks_label:Bookmarks ## adds to titlepage_entries instead of replacing it. #extra_titlepage_entries: fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks diff --git a/fanficdownloader/adapters/adapter_archiveofourownorg.py b/fanficdownloader/adapters/adapter_archiveofourownorg.py index 27628808..d99ca90f 100644 --- a/fanficdownloader/adapters/adapter_archiveofourownorg.py +++ b/fanficdownloader/adapters/adapter_archiveofourownorg.py @@ -233,13 +233,19 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter): chars = a.findAll('a',{'class':"tag"}) for char in chars: self.story.addToList('characters',char.string) + a = metasoup.find('dd',{'class':"relationship tags"}) if a != None: ships = a.findAll('a',{'class':"tag"}) for ship in ships: self.story.addToList('ships',ship.string) - + a = metasoup.find('dd',{'class':"collections"}) + if a != None: + collections = a.findAll('a') + for collection in collections: + self.story.addToList('collections',collection.string) + stats = metasoup.find('dl',{'class':'stats'}) dt = stats.findAll('dt') dd = stats.findAll('dd') diff --git a/plugin-defaults.ini b/plugin-defaults.ini index af3babb0..a1c951be 100644 --- a/plugin-defaults.ini +++ b/plugin-defaults.ini @@ -433,14 +433,15 @@ extratags: FanFiction,Testing,HTML #is_adult:true ## AO3 adapter defines a few extra metadata entries. -extra_valid_entries:fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks +extra_valid_entries:fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks,collections fandoms_label:Fandoms freefromtags_label:Freeform Tags ao3categories_label:AO3 Categories comments_label:Comments kudos_label:Kudos hits_label:Hits -bookmarks:Bookmarks +collections_label:Collections +bookmarks_label:Bookmarks ## adds to titlepage_entries instead of replacing it. #extra_titlepage_entries: fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks