diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini
index 2e38c875..bdad0b80 100644
--- a/calibre-plugin/plugin-defaults.ini
+++ b/calibre-plugin/plugin-defaults.ini
@@ -1588,6 +1588,18 @@ extra_valid_entries:translator
translator_label: Translator
extra_titlepage_entries: translator
+[harrypotterfanfiction.com]
+extra_valid_entries:reviews,era
+
+## Site dedicated to these categories/characters/ships
+extracategories:Harry Potter
+
+## dateUpdated/datePublished don't usually have time, but it do 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
+
[hlfiction.net]
## Site dedicated to these categories/characters/ships
extracategories:Highlander
@@ -3018,4 +3030,3 @@ website_encodings:Windows-1252,utf8
continue_on_chapter_error:true
extra_valid_entries:tags
-[www.wuxiaworld.co]
diff --git a/fanficfare/adapters/__init__.py b/fanficfare/adapters/__init__.py
index eeb08d53..78e47c09 100644
--- a/fanficfare/adapters/__init__.py
+++ b/fanficfare/adapters/__init__.py
@@ -176,6 +176,7 @@ import adapter_wattpadcom
import adapter_lightnovelgatecom
import adapter_wwwnovelallcom
import adapter_wuxiaworldco
+import adapter_harrypotterfanfictioncom
## This bit of complexity allows adapters to be added by just adding
## importing. It eliminates the long if/else clauses we used to need
diff --git a/fanficfare/adapters/adapter_harrypotterfanfictioncom.py b/fanficfare/adapters/adapter_harrypotterfanfictioncom.py
new file mode 100644
index 00000000..5baac2a8
--- /dev/null
+++ b/fanficfare/adapters/adapter_harrypotterfanfictioncom.py
@@ -0,0 +1,183 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2011 Fanficdownloader team, 2017 FanFicFare team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import logging
+logger = logging.getLogger(__name__)
+import re
+import urllib2
+
+
+from ..htmlcleanup import stripHTML
+from .. import exceptions as exceptions
+
+from base_adapter import BaseSiteAdapter, makeDate
+
+class HarryPotterFanFictionComSiteAdapter(BaseSiteAdapter):
+
+ def __init__(self, config, url):
+ BaseSiteAdapter.__init__(self, config, url)
+ self.story.setMetadata('siteabbrev','hp')
+ self.is_adult=False
+
+ # get storyId from url--url validation guarantees query is only psid=1234
+ self.story.setMetadata('storyId',self.parsedUrl.query.split('=',)[1])
+
+ # The date format will vary from site to site.
+ # http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+ self.dateformat = "%Y-%m-%d %H:%M:%S"
+
+ # normalized story URL.
+ self._setURL('https://' + self.getSiteDomain() + '/viewstory.php?psid='+self.story.getMetadata('storyId'))
+
+
+ @staticmethod
+ def getSiteDomain():
+ return 'harrypotterfanfiction.com'
+
+ @classmethod
+ def getSiteExampleURLs(cls):
+ return "https://harrypotterfanfiction.com/viewstory.php?psid=1234"
+
+ def getSiteURLPattern(self):
+ return r"https?"+re.escape("://")+r"(www\.)?"+re.escape("harrypotterfanfiction.com/viewstory.php?psid=")+r"\d+$"
+
+ def use_pagecache(self):
+ '''
+ adapters that will work with the page cache need to implement
+ this and change it to True.
+ '''
+ return True
+
+ def extractChapterUrlsAndMetadata(self):
+
+ url = self.url
+ logger.debug("URL: "+url)
+
+ try:
+ data = self._fetchUrl(url)
+ except urllib2.HTTPError, e:
+ if e.code == 404:
+ raise exceptions.StoryDoesNotExist(self.url)
+ else:
+ raise e
+
+ ## Don't know if these still apply
+ # if "Access denied. This story has not been validated by the adminstrators of this site." in data:
+ # raise exceptions.AccessDenied(self.getSiteDomain() +" says: Access denied. This story has not been validated by the adminstrators of this site.")
+ # elif "ERROR locating story meta for psid" in data:
+ # raise exceptions.StoryDoesNotExist(self.url)
+
+ # use BeautifulSoup HTML parser to make everything easier to find.
+ soup = self.make_soup(data)
+
+ ## Title
+ h2 = soup.find('h2')
+ h2.find('i').extract() # remove author
+ self.story.setMetadata('title',stripHTML(h2))
+ ## Don't know if these still apply
+ ## javascript:if (confirm('Please note. This story may contain adult themes. By clicking here you are stating that you are over 17. Click cancel if you do not meet this requirement.')) location = '?psid=290995'
+ # if "This story may contain adult themes." in a['href'] and not (self.is_adult or self.getConfig("is_adult")):
+ # raise exceptions.AdultCheckRequired(self.url)
+
+
+ # Find authorid and URL from... author url.
+ a = soup.find('a', href=re.compile(r"viewuser.php\?uid=\d+"))
+ self.story.setMetadata('authorId',a['href'].split('=')[1])
+ self.story.setMetadata('authorUrl','https://'+self.host+'/'+a['href'])
+ self.story.setMetadata('author',a.string[3:]) # remove 'by '
+
+ ## hpcom doesn't always give us total words--but it does give
+ ## us words/chapter. I'd rather add than fetch and parse
+ ## another page.
+ chapter_words=0
+ for tr in soup.find('table',{'class':'table-chapters'}).find('tbody').findAll('tr'):
+ tdstr = tr.findAll('td')[2].string
+ if tdstr and tdstr.isdigit():
+ chapter_words+=int(tdstr)
+ chapter = tr.find('a')
+ chpt=re.sub(r'^.*?(\?chapterid=\d+).*?',r'\1',chapter['href'])
+ self.chapterUrls.append((stripHTML(chapter),'https://'+self.host+'/viewstory.php'+chpt))
+ #self.story.setMetadata('numWords',unicode(words))
+ self.story.setMetadata('numChapters',len(self.chapterUrls))
+
+ ## Finding the metadata is a bit of a pain. Desc is the only thing this color.
+ desctable= soup.find('table',{'bgcolor':'#f0e8e8'})
+ #self.setDescription(url,desctable)
+ #self.story.setMetadata('description',stripHTML(desctable))
+
+ #
+ #
Rating
+ #
Mature
+ #