From c06a4ee9ded8507180ec07cfef023e964583d5d5 Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Fri, 14 Sep 2012 12:11:41 -0500
Subject: [PATCH] Integrate merlinfic.dtwins.co.uk, bump versions.

---
 app.yaml                              |  2 +-
 calibre-plugin/__init__.py            |  2 +-
 fanficdownloader/adapters/__init__.py |  1 +
 index.html                            | 20 ++++++++++++++++----
 plugin-defaults.ini                   | 16 ++++++++++++++++
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/app.yaml b/app.yaml
index a9abd30..25ba5a2 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanfictiondownloader
 application: fanfictiondownloader
-version: 4-4-24
+version: 4-4-25
 runtime: python27
 api_version: 1
 threadsafe: true
diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py
index 9f0bcd2..7226d5b 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, 6, 8)
+    version             = (1, 6, 9)
     minimum_calibre_version = (0, 8, 57)
 
     #: 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 9cc7b87..b48d4ce 100644
--- a/fanficdownloader/adapters/__init__.py
+++ b/fanficdownloader/adapters/__init__.py
@@ -97,6 +97,7 @@ import adapter_scarvesandcoffeenet
 import adapter_thepetulantpoetesscom
 import adapter_wolverineandroguecom
 import adapter_sinfuldesireorg
+import adapter_merlinficdtwinscouk
 
 ## 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/index.html b/index.html
index d61996d..60f0666 100644
--- a/index.html
+++ b/index.html
@@ -54,10 +54,17 @@
 	      much easier. </p>
 	  </div>
 	  <!-- put announcements here, h3 is a good title size. -->
-	  <h3>New Feature</h3>
+	  <h3>New Site / Features / Fixes</h3>
 	  <p>
-	    FFDL now records 'Relationships' as metadata for those sites that provide it.
-	    
+	    New site merlinfic.dtwins.co.uk, thanks Ida.
+	  </p>
+	  <p>
+	    New feature options strip_chapter_numbers and add_chapter_numbers can be turned on to
+	    normalize numbers in front of chapter titles.
+	  </p>
+	  <p>
+	    Fixed BBCode in fimfiction.net story summaries.  Also improved handling of html
+	    in story summaries.
 	  </p>
 	  <p>
 	    Questions?  Check out our 
@@ -67,7 +74,7 @@
 	    If you have any problems with this application, please
 	    report them in
 	    the <a href="http://groups.google.com/group/fanfic-downloader">FanFictionDownLoader Google Group</a>.  The
-	    <a href="http://4-4-23.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
+	    <a href="http://4-4-24.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>
 	    {{ error_message }}
@@ -529,6 +536,11 @@
 	    Use the URL of the story's chapter list, such as
 	    <br /><a href="http://www.sinful-desire.org/archive/viewstory.php?sid=1234">http://www.sinful-desire.org/archive/viewstory.php?sid=1234</a>
 	  </dd>
+	  <dt>merlinfic.dtwins.co.uk</dt>
+	  <dd>
+	    Use the URL of the story's chapter list, such as
+	    <br /><a href="http://merlinfic.dtwins.co.uk/viewstory.php?sid=1234">http://merlinfic.dtwins.co.uk/viewstory.php?sid=1234</a>
+	  </dd>
 	</dl>
 	<p>
 	  A few additional things to know, which will make your life substantially easier:
diff --git a/plugin-defaults.ini b/plugin-defaults.ini
index 713d356..a424e19 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -538,6 +538,22 @@ extracategories:Harry Potter
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+[merlinfic.dtwins.co.uk]
+## Site dedicated to these categories/characters/ships
+extracategories:Merlin
+
+## Some sites require login (or login for some rated stories) The
+## program can prompt you, or you can save it in config.  In
+## commandline version, this should go in your personal.ini, not
+## defaults.ini.
+#username:YourName
+#password:yourpassword
+
+## Some sites also require the user to confirm they are adult for
+## adult content.  In commandline version, this should go in your
+## personal.ini, not defaults.ini.
+#is_adult:true
+
 [national-library.net]
 ## Site dedicated to these categories/characters/ships
 extracategories:West Wing