From e99adf3fa9b737870d55f68c2e414a2dbaf2dccf Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sun, 29 May 2011 10:44:46 -0500 Subject: [PATCH] Allow trailing / after /Story_Title on ff.net, fp.com urls. --- fanficdownloader/adapters/adapter_fanfictionnet.py | 2 +- fanficdownloader/adapters/adapter_fictionpresscom.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fanficdownloader/adapters/adapter_fanfictionnet.py b/fanficdownloader/adapters/adapter_fanfictionnet.py index ab687840..983a2483 100644 --- a/fanficdownloader/adapters/adapter_fanfictionnet.py +++ b/fanficdownloader/adapters/adapter_fanfictionnet.py @@ -51,7 +51,7 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter): return "http://www.fanfiction.net/s/1234/1/ http://www.fanfiction.net/s/1234/12/ http://www.fanfiction.net/s/1234/1/Story_Title" def getSiteURLPattern(self): - return r"http://(www|m)?\.fanfiction\.net/s/\d+(/\d+)?(/|/[a-zA-Z0-9_-]+)?$" + return r"http://(www|m)?\.fanfiction\.net/s/\d+(/\d+)?(/|/[a-zA-Z0-9_-]+)?/?$" def extractChapterUrlsAndMetadata(self): diff --git a/fanficdownloader/adapters/adapter_fictionpresscom.py b/fanficdownloader/adapters/adapter_fictionpresscom.py index 2750c3ee..b0c7a969 100644 --- a/fanficdownloader/adapters/adapter_fictionpresscom.py +++ b/fanficdownloader/adapters/adapter_fictionpresscom.py @@ -47,7 +47,7 @@ class FictionPressComSiteAdapter(BaseSiteAdapter): return "http://www.fictionpress.com/s/1234/1/ http://www.fictionpress.com/s/1234/12/ http://www.fictionpress.com/s/1234/1/Story_Title" def getSiteURLPattern(self): - return r"http://www\.fictionpress\.com/s/\d+(/\d+)?(/|/[a-zA-Z0-9_-]+)?$" + return r"http://www\.fictionpress\.com/s/\d+(/\d+)?(/|/[a-zA-Z0-9_-]+)?/?$" def extractChapterUrlsAndMetadata(self):