From d8d5c02f55a32f920359cc378001aa55eb7c79fb Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Sun, 1 Jul 2012 13:29:01 -0500
Subject: [PATCH] Integrate new adapters, ncisfic.com, national-library.net.

---
 defaults.ini                          |  4 ++++
 fanficdownloader/adapters/__init__.py |  2 ++
 index.html                            | 18 +++++++++++-------
 plugin-defaults.ini                   |  4 ++++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/defaults.ini b/defaults.ini
index 575b039c..9bfb10cd 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -400,6 +400,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+[national-library.net]
+
+[ncisfic.com]
+
 [nfacommunity.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,
diff --git a/fanficdownloader/adapters/__init__.py b/fanficdownloader/adapters/__init__.py
index e59e42c6..8ed2e6e7 100644
--- a/fanficdownloader/adapters/__init__.py
+++ b/fanficdownloader/adapters/__init__.py
@@ -79,6 +79,8 @@ import adapter_thealphagatecom
 import adapter_fanfiktionde
 import adapter_ponyfictionarchivenet
 import adapter_sg1heliopoliscom
+import adapter_ncisficcom
+import adapter_nationallibrarynet
 
 ## 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 285537fe..8c694718 100644
--- a/index.html
+++ b/index.html
@@ -54,16 +54,10 @@
 	      much easier. </p>
 	  </div>
 	  <!-- put announcements here, h3 is a good title size. -->
-	  <h3>fanfiction.net Fixed</h3>
-	  <p>
-
-	    Fixes are in place now for the latest round of fanfiction.net changes (as of Jun 28, 2012).
-	    
-	  </p>
 	  <h3>New Sites</h3>
 	  <p>
 	    
-	    New sites www.fanfiktion.de, ponyfictionarchive.net and sg1-heliopolis.com added.
+	    New sites ncisfic.com and national-library.net added.
 	    <br />Thanks, Ida!
 	    
 	  </p>
@@ -446,6 +440,16 @@
 	    <br />Or:
 	    <br /><a href="http://sg1-heliopolis.com/atlantis/viewstory.php?sid=1234">http://sg1-heliopolis.com/atlantis/viewstory.php?sid=1234</a>
 	  </dd>
+	  <dt>ncisfic.com</dt>
+	  <dd>
+	    Use the URL of the story's first chapter, such as
+	    <br /><a href="http://ncisfic.com/viewstory.php?storyid=1234">http://ncisfic.com/viewstory.php?storyid=1234</a>
+	  </dd>
+	  <dt>national-library.net</dt>
+	  <dd>
+	    Use the URL of the story's first chapter, such as
+	    <br /><a href="http://national-library.net/viewstory.php?storyid=1234">http://national-library.net/viewstory.php?storyid=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 3c4e0939..df34dd5c 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -386,6 +386,10 @@ cover_exclusion_regexp:/images/.*?ribbon.gif
 ## this should go in your personal.ini, not defaults.ini.
 #is_adult:true
 
+[national-library.net]
+
+[ncisfic.com]
+
 [nfacommunity.com]
 ## Some sites do not require a login, but do require the user to
 ## confirm they are adult for adult content.  In commandline version,