From 9b468da5986a7d55ac29457749d851bdc2e4ebf6 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Fri, 10 Jul 2015 12:19:27 -0500 Subject: [PATCH] Make mediaminer.org URLs more flexible. --- fanficfare/adapters/adapter_mediaminerorg.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fanficfare/adapters/adapter_mediaminerorg.py b/fanficfare/adapters/adapter_mediaminerorg.py index 7f8ad3a..8bca6f2 100644 --- a/fanficfare/adapters/adapter_mediaminerorg.py +++ b/fanficfare/adapters/adapter_mediaminerorg.py @@ -45,6 +45,8 @@ class MediaMinerOrgSiteAdapter(BaseSiteAdapter): self.story.setMetadata('storyId',m.group('id')) elif m.group('id2'): self.story.setMetadata('storyId',m.group('id2')) + elif m.group('id3'): + self.story.setMetadata('storyId',m.group('id2')) # normalized story URL. self._setURL('http://' + self.getSiteDomain() + '/fanfic/view_st.php/'+self.story.getMetadata('storyId')) @@ -65,9 +67,10 @@ class MediaMinerOrgSiteAdapter(BaseSiteAdapter): ## http://www.mediaminer.org/fanfic/view_st.php/76882 ## http://www.mediaminer.org/fanfic/view_ch.php/167618/594087#fic_c ## http://www.mediaminer.org/fanfic/view_ch.php?submit=View+Chapter&id=105816&cid=357151 + ## http://www.mediaminer.org/fanfic/view_ch.php?cid=612153&submit=View+Chapter&id=171668 return re.escape("http://"+self.getSiteDomain())+\ r"(/fanfic/view_(st|ch)\.php/(?P\d+)(/\d+(#fic_c)?)?/?|"+\ - r"/fanfic/view_ch\.php\?(submit=View(\+| )Chapter&)?id=(?P\d+)(&cid=\d+)?)$" + r"/fanfic/view_ch\.php\?((submit=View(\+| )Chapter|id=(?P\d+)|cid=\d+)&?)+)" # Override stripURLParameters so the id parameter won't get stripped @classmethod