From 34990ff0442c4fcd5ee936a246ea00f2fdaa974e Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Sat, 1 Nov 2014 22:55:07 -0500
Subject: [PATCH] Fix for ficwad login, change [www.thewriterscoffeeshop.com]
 to [www.twcslibrary.net] in config.

---
 defaults.ini                                   | 4 ++--
 fanficdownloader/adapters/adapter_ficwadcom.py | 6 ++++++
 plugin-defaults.ini                            | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/defaults.ini b/defaults.ini
index 0127e014..87b3f208 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -1833,7 +1833,7 @@ extracategories:Lord of the Rings
 #username:YourName
 #password:yourpassword
 
-[www.thewriterscoffeeshop.com]
+[www.twcslibrary.net]
 ## 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
@@ -1846,7 +1846,7 @@ extracategories:Lord of the Rings
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-## thewriterscoffeeshop.com (ab)uses series as personal reading lists.
+## twcslibrary.net (ab)uses series as personal reading lists.
 collect_series: false
 
 [www.tthfanfic.org]
diff --git a/fanficdownloader/adapters/adapter_ficwadcom.py b/fanficdownloader/adapters/adapter_ficwadcom.py
index 2e30b875..6b5b87ee 100644
--- a/fanficdownloader/adapters/adapter_ficwadcom.py
+++ b/fanficdownloader/adapters/adapter_ficwadcom.py
@@ -103,6 +103,12 @@ class FicwadComSiteAdapter(BaseSiteAdapter):
             else:
                 raise e
             
+        # if blocked, attempt login.
+        if soup.find("div",{"class":"blocked"}):
+            if self.performLogin(url): # performLogin raises
+                                       # FailedToLogin if it fails.
+                soup = bs.BeautifulSoup(self._fetchUrl(url,usecache=False))
+
         divstory = soup.find('div',id='story')
         storya = divstory.find('a',href=re.compile("^/story/\d+$"))
         if storya : # if there's a story link in the divstory header, this is a chapter page.
diff --git a/plugin-defaults.ini b/plugin-defaults.ini
index 049ea0b7..6576961e 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -1833,7 +1833,7 @@ extracategories:Lord of the Rings
 #username:YourName
 #password:yourpassword
 
-[www.thewriterscoffeeshop.com]
+[www.twcslibrary.net]
 ## 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
@@ -1846,7 +1846,7 @@ extracategories:Lord of the Rings
 ## personal.ini, not defaults.ini.
 #is_adult:true
 
-## thewriterscoffeeshop.com (ab)uses series as personal reading lists.
+## twcslibrary.net (ab)uses series as personal reading lists.
 collect_series: false
 
 [www.tthfanfic.org]