From f392c6dd776a15e1f50d601792132f508ded5008 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 13 May 2014 12:00:58 -0500 Subject: [PATCH] Fix for dark-solace.org metadata parsing. --- .../adapters/adapter_darksolaceorg.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fanficdownloader/adapters/adapter_darksolaceorg.py b/fanficdownloader/adapters/adapter_darksolaceorg.py index 394935fd..35e6d021 100644 --- a/fanficdownloader/adapters/adapter_darksolaceorg.py +++ b/fanficdownloader/adapters/adapter_darksolaceorg.py @@ -241,24 +241,24 @@ class DarkSolaceOrgAdapter(BaseSiteAdapter): self.story.setMetadata('numWords', value) if 'Categories' in label: - cats = labelspan.parent.findAll('a',href=re.compile(r'categories.php\?catid=\d+')) + cats = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=categories')) for cat in cats: self.story.addToList('category',cat.string) if 'Characters' in label: - for char in value.string.split(', '): - if not 'None' in char: - self.story.addToList('characters',char) + chars = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=characters')) + for char in chars: + self.story.addToList('characters',char.string) if 'Genre' in label: - for genre in value.string.split(', '): - if not 'None' in genre: - self.story.addToList('genre',genre) + genres = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=1')) + for genre in genres: + self.story.addToList('genre',genre.string) if 'Warnings' in label: - for warning in value.string.split(', '): - if not 'None' in warning: - self.story.addToList('warnings',warning) + warnings = labelspan.parent.findAll('a',href=re.compile(r'browse.php\?type=class&type_id=2')) + for warning in warnings: + self.story.addToList('warnings',warning.string) if 'Completed' in label: if 'Yes' in value: