diff --git a/defaults.ini b/defaults.ini
index 3f9d489..eae7928 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -430,6 +430,12 @@ extratags:
## this should go in your personal.ini, not defaults.ini.
#is_adult:true
+[www.libraryofmoria.com]
+## Some sites do not require a login, but do 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
+
[www.mediaminer.org]
[www.midnightwhispers.ca]
@@ -446,6 +452,17 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png
[www.siye.co.uk]
+[www.squidge.org/peja]
+# www.squidge.org/peja calls it Fandom
+category_label:Fandom
+# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
+
+[www.squidge.org/peja:txt]
+## Add URLs since there aren't links.
+# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description
+
[www.thewriterscoffeeshop.com]
## Some sites require login (or login for some rated stories) The
## program can prompt you, or you can save it in config. In
@@ -499,16 +516,11 @@ collect_series: false
[www.whofic.com]
-[www.squidge.org/peja]
-# www.squidge.org/peja calls it Fandom
-category_label:Fandom
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
-titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
-
-[www.squidge.org/peja:txt]
-## Add URLs since there aren't links.
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
-titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description
+[www.wraithbait.com]
+## Some sites do not require a login, but do 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
[overrides]
## It may sometimes be useful to override all of the specific format,
diff --git a/fanficdownloader/adapters/__init__.py b/fanficdownloader/adapters/__init__.py
index 6713959..741e3be 100644
--- a/fanficdownloader/adapters/__init__.py
+++ b/fanficdownloader/adapters/__init__.py
@@ -53,6 +53,8 @@ import adapter_midnightwhispersca
import adapter_ksarchivecom
import adapter_archiveskyehawkecom
import adapter_squidgeorgpeja
+import adapter_libraryofmoriacom
+import adapter_wraithbaitcom
## 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 678cf53..e58ee91 100644
--- a/index.html
+++ b/index.html
@@ -54,13 +54,18 @@
much easier.
- New Site
+ New Sites
- Support for the Wonderful World of MakeBelieve(WWOMB) archive at
-http://www.squidge.org/peja/cgi-bin/index.php
-has been added. This does not support other sections of
-www.squidge.org, or the other files under www.squidge.org/peja that
-aren't in the eFiction instance.
+ We now support www.wraithbait.com and
+ www.libraryofmoria.com, thanks to Ida for adding these!
+
+
+ Support for the Wonderful World of MakeBelieve(WWOMB)
+ archive at
+ http://www.squidge.org/peja/cgi-bin/index.php
+ has also been added. This does not support other sections of
+ www.squidge.org, or the other files under www.squidge.org/peja that
+ aren't in the eFiction instance.
Questions? Check out our
@@ -295,10 +300,21 @@ aren't in the eFiction instance.
Use the URL of the story's summary, such as
http://archive.skyehawke.com/story.php?no=17466.
+
www.libraryofmoria.com
+
+ Use the URL of the story's summary, such as
+
http://www.libraryofmoria.com/a/viewstory.php?sid=434.
+
+ www.wraithbait.com
+
+ Use the URL of the story's summary, such as
+
http://www.wraithbait.com/viewstory.php?sid=14305.
+
www.squidge.org/peja (WWOMB)
Use the URL of the story's summary, such as
-
http://www.squidge.org/peja/cgi-bin/viewstory.php?sid=1234.
+
http://www.squidge.org/peja/cgi-bin/viewstory.php?sid=1234.
+ This is only for squidge.org/peja, not other parts of squidge.org.
diff --git a/plugin-defaults.ini b/plugin-defaults.ini
index 05961ee..69ae1cf 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -413,6 +413,12 @@ extratags:
## this should go in your personal.ini, not defaults.ini.
#is_adult:true
+[www.libraryofmoria.com]
+## Some sites do not require a login, but do 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
+
[www.mediaminer.org]
[www.midnightwhispers.ca]
@@ -429,6 +435,17 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png
[www.siye.co.uk]
+[www.squidge.org/peja]
+# www.squidge.org/peja calls it Fandom
+category_label:Fandom
+# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
+
+[www.squidge.org/peja:txt]
+## Add URLs since there aren't links.
+# Remove numWords -- www.squidge.org/peja word counts are inaccurate
+titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description
+
[www.thewriterscoffeeshop.com]
## Some sites require login (or login for some rated stories) The
## program can prompt you, or you can save it in config. In
@@ -482,16 +499,11 @@ collect_series: false
[www.whofic.com]
-[www.squidge.org/peja]
-# www.squidge.org/peja calls it Fandom
-category_label:Fandom
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
-titlepage_entries: series,category,genre,language,characters,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,description
-
-[www.squidge.org/peja:txt]
-## Add URLs since there aren't links.
-# Remove numWords -- www.squidge.org/peja word counts are inaccurate
-titlepage_entries: series,category,genre,language,status,datePublished,dateUpdated,dateCreated,rating,warnings,numChapters,site,storyUrl, authorUrl, description
+[www.wraithbait.com]
+## Some sites do not require a login, but do 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
[overrides]
## It may sometimes be useful to override all of the specific format,