From d82b3997389f415d721e30b12fcdd18c3966c58c Mon Sep 17 00:00:00 2001
From: Jim Miller <retiefjimm@gmail.com>
Date: Mon, 5 May 2014 12:50:30 -0500
Subject: [PATCH] Bump versions.

---
 app.yaml                   |  2 +-
 calibre-plugin/__init__.py |  2 +-
 defaults.ini               | 27 ++++++++++++++++++++++++++-
 index.html                 |  7 +++++--
 plugin-defaults.ini        | 27 ++++++++++++++++++++++++++-
 5 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/app.yaml b/app.yaml
index 78c2f25..70a0810 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanfictiondownloader
 application: fanfictiondownloader
-version: 4-4-99
+version: 4-5-00
 runtime: python27
 api_version: 1
 threadsafe: true
diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py
index 22ea482..6d66d7b 100644
--- a/calibre-plugin/__init__.py
+++ b/calibre-plugin/__init__.py
@@ -42,7 +42,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
     description         = _('UI plugin to download FanFiction stories from various sites.')
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (1, 8, 18)
+    version             = (1, 8, 19)
     minimum_calibre_version = (1, 13, 0)
 
     #: This field defines the GUI plugin class that contains all the code
diff --git a/defaults.ini b/defaults.ini
index a869ae3..6277fd8 100644
--- a/defaults.ini
+++ b/defaults.ini
@@ -219,7 +219,32 @@ connect_timeout:60.0
 # .*-Centered=>
 # characters=>Sam W\.=>Sam Witwicky&&category=>Transformers
 # characters=>Sam W\.=>Sam Winchester&&category=>Supernatural
- 
+
+## Include/Exclude metadata
+##
+## You can use the include/exclude metadata features to either limit
+## the values of particular metadata lists to specific values or to
+## exclude specific values.  Further, you can conditionally apply each
+## line depending on other metadata, use exact strings or regular
+## expressions(regex) to match values, and negate matches.
+##
+## The settings are:
+## include_metadata_pre
+## exclude_metadata_pre
+## include_metadata_post
+## exclude_metadata_post
+##
+## The form of each line is:
+## metakey[,metakey]==exactvalue
+## metakey[,metakey]=~regex
+## metakey[,metakey]==exactvalue&&conditionalkey==exactcondvalue
+## metakey[,metakey]=~regex&&conditionalkey==exactcondvalue
+## metakey[,metakey]==exactvalue&&conditionalkey=~condregex
+##
+## This is fairly complicated, so it's documented on its own wiki
+## page:
+## https://code.google.com/p/fanficdownloader/wiki/InExcludeMetadataFeature
+
 ## Some readers don't show horizontal rule (<hr />) tags correctly.
 ## This replaces them all with a centered '* * *'.  (Note centering
 ## doesn't work on some devices either.)
diff --git a/index.html b/index.html
index 8051f25..635828d 100644
--- a/index.html
+++ b/index.html
@@ -64,7 +64,10 @@
 	  <h3>Changes:</h3>
 	  <p>
 	    <ul>
-              <li>Work around for a problem fimfiction.net blockquotes.</li>
+              <li>Allow https URLs for fimfiction.net.</li>
+              <li>Both allow https URLs for squidge.org/peja and change canonical URLs for squidge.org/peja to https.</li>
+              <li>Fix for some stories' summaries on onedirectionfanfiction.com.</li>
+              <li>Add include/exclude metadata feature.</li>
 	    </ul>
 	  </p>
 	  <p>
@@ -75,7 +78,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-98.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
+	    <a href="http://4-4-99.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>
 	    {{ error_message }}
diff --git a/plugin-defaults.ini b/plugin-defaults.ini
index 6a90701..352be84 100644
--- a/plugin-defaults.ini
+++ b/plugin-defaults.ini
@@ -186,7 +186,32 @@ connect_timeout:60.0
 # .*-Centered=>
 # characters=>Sam W\.=>Sam Witwicky&&category=>Transformers
 # characters=>Sam W\.=>Sam Winchester&&category=>Supernatural
- 
+
+## Include/Exclude metadata
+##
+## You can use the include/exclude metadata features to either limit
+## the values of particular metadata lists to specific values or to
+## exclude specific values.  Further, you can conditionally apply each
+## line depending on other metadata, use exact strings or regular
+## expressions(regex) to match values, and negate matches.
+##
+## The settings are:
+## include_metadata_pre
+## exclude_metadata_pre
+## include_metadata_post
+## exclude_metadata_post
+##
+## The form of each line is:
+## metakey[,metakey]==exactvalue
+## metakey[,metakey]=~regex
+## metakey[,metakey]==exactvalue&&conditionalkey==exactcondvalue
+## metakey[,metakey]=~regex&&conditionalkey==exactcondvalue
+## metakey[,metakey]==exactvalue&&conditionalkey=~condregex
+##
+## This is fairly complicated, so it's documented on its own wiki
+## page:
+## https://code.google.com/p/fanficdownloader/wiki/InExcludeMetadataFeature
+
 ## Some readers don't show horizontal rule (<hr />) tags correctly.
 ## This replaces them all with a centered '* * *'.  (Note centering
 ## doesn't work on some devices either.)