From 6134ba7e7976f9eb00dfe8a2e22fc824487e77ea Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Wed, 15 Feb 2012 09:20:36 -0600
Subject: [PATCH] Turn on ficbook.net and allow chapter URLs in fbn.

---
 calibre-plugin/__init__.py                    |  2 +-
 fanficdownloader/adapters/__init__.py         |  1 +
 .../adapters/adapter_ficbooknet.py            |  4 ++--
 index.html                                    | 24 +++++++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py
index 36ea376b..b4442ae1 100644
--- a/calibre-plugin/__init__.py
+++ b/calibre-plugin/__init__.py
@@ -27,7 +27,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
     description         = 'UI plugin to download FanFiction stories from various sites.'
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (1, 4, 2)
+    version             = (1, 4, 3)
     minimum_calibre_version = (0, 8, 30)
 
     #: This field defines the GUI plugin class that contains all the code
diff --git a/fanficdownloader/adapters/__init__.py b/fanficdownloader/adapters/__init__.py
index abb77ab4..6b841870 100644
--- a/fanficdownloader/adapters/__init__.py
+++ b/fanficdownloader/adapters/__init__.py
@@ -44,6 +44,7 @@ import adapter_twiwritenet
 import adapter_whoficcom
 import adapter_siyecouk
 import adapter_archiveofourownorg
+import adapter_ficbooknet
 
 ## 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/fanficdownloader/adapters/adapter_ficbooknet.py b/fanficdownloader/adapters/adapter_ficbooknet.py
index 852a8def..c9a98bc7 100644
--- a/fanficdownloader/adapters/adapter_ficbooknet.py
+++ b/fanficdownloader/adapters/adapter_ficbooknet.py
@@ -70,7 +70,7 @@ class FicBookNetAdapter(BaseSiteAdapter):
         return "http://"+self.getSiteDomain()+"/readfic/12345"
 
     def getSiteURLPattern(self):
-        return re.escape("http://"+self.getSiteDomain()+"/readfic/")+r"\d+$"
+        return re.escape("http://"+self.getSiteDomain()+"/readfic/")+r"\d+"
 
     ## Getting the chapter list and the meta data, plus 'is adult' checking.
     def extractChapterUrlsAndMetadata(self):
@@ -218,4 +218,4 @@ class FicBookNetAdapter(BaseSiteAdapter):
         if None == chapter:
             raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
     
-        return utf8FromSoup(chapter)
\ No newline at end of file
+        return utf8FromSoup(chapter)
diff --git a/index.html b/index.html
index 28a3b515..735472a3 100644
--- a/index.html
+++ b/index.html
@@ -54,11 +54,18 @@
 	      much easier. </p>
 	  </div>
 	  <!-- put announcements here, h3 is a good title size. -->
-	  <h3>Support for Custom CSS</h3>
+	  <h3>New Russian Language Site ficbook.net</h3>
+	  <p>
+	    Thanks to Ida Leter's hard work, we now support <a href="http://ficbook.net">ficbook.net</a>, a Russian language fanfiction site.
+	  </p>
+	  <h3>Support for Language, Custom CSS and Replacement of Metadata</h3>
+	  <p>
+	    There's now a 'Language' metadata field that can be filled, if the site supports different languages.  Currently, it's only used
+	    with fanfiction.net and ficbook.net.
+	  </p>
 	  <p>
 	    The CSS included in the HTML and EPUB output formats is now a customizable parameter.
 	  </p>
-	  <h3>Support for Custom Replacement of Metadata</h3>
 	  <p>
 	    There's now a customizable parameter to include a list of regular expressions to replace metadata as you see fit.
 	  </p>
@@ -240,9 +247,16 @@
 	    <br /><a href="http://archiveofourown.org/works/76366/chapters/101584">http://archiveofourown.org/works/76366/chapters/101584</a>.
 	  </dd>
 	</dl>	
-
-	
-	A few additional things to know, which will make your life substantially easier:
+	  <dt>ficbook.net(Russian)</dt>
+	  <dd>
+	    Use the URL of the story, or one of it's chapters, such as
+	    <br /><a href="http://ficbook.net/readfic/93626">http://ficbook.net/readfic/93626</a>.
+	    <br /><a href="http://ficbook.net/readfic/93626/246417#part_content">http://ficbook.net/readfic/93626/246417#part_content</a>.
+	  </dd>
+	</dl>
+	<p>
+	  A few additional things to know, which will make your life substantially easier:
+	</p>
 	<ol>
 	  <li>
 	    First thing to know: I do not use your Google login and password. In fact, all I know about it is your ID &ndash; password