From e6128b31747849d9d2e8ef3065053f86a36ec098 Mon Sep 17 00:00:00 2001
From: Jim Miller
Date: Mon, 18 Mar 2013 11:31:31 -0500
Subject: [PATCH] Bump versions, add more test cases to test1.com adapter.
---
app.yaml | 2 +-
calibre-plugin/__init__.py | 2 +-
fanficdownloader/adapters/adapter_test1.py | 37 +++++++++++++++-------
index.html | 5 +--
4 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/app.yaml b/app.yaml
index be333da9..352c3d50 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,6 +1,6 @@
# ffd-retief-hrd fanfictiondownloader
application: fanfictiondownloader
-version: 4-4-46
+version: 4-4-47
runtime: python27
api_version: 1
threadsafe: true
diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py
index c93e027b..62a4c84b 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, 7, 13)
+ version = (1, 7, 14)
minimum_calibre_version = (0, 8, 57)
#: This field defines the GUI plugin class that contains all the code
diff --git a/fanficdownloader/adapters/adapter_test1.py b/fanficdownloader/adapters/adapter_test1.py
index 3a2468ad..72e1c7aa 100644
--- a/fanficdownloader/adapters/adapter_test1.py
+++ b/fanficdownloader/adapters/adapter_test1.py
@@ -126,21 +126,36 @@ Some more longer description. "I suck at summaries!" "Better than it sounds!"
self.story.addToList('warnings','Swearing')
self.story.addToList('warnings','Violence')
- self.story.addToList('category','Harry Potter')
- self.story.addToList('category','Furbie')
- self.story.addToList('category','Crossover')
- self.story.addToList('category',u'Puella Magi Madoka Magica/魔法少女まどか★マギカ')
- self.story.addToList('category',u'Magical Girl Lyrical Nanoha')
-
+ if self.story.getMetadata('storyId') == '80':
+ self.story.addToList('category',u'Rizzoli & Isles')
+ self.story.addToList('characters','J. Rizzoli')
+ elif self.story.getMetadata('storyId') == '81':
+ self.story.addToList('category',u'Pitch Perfect')
+ self.story.addToList('characters','Chloe B.')
+ elif self.story.getMetadata('storyId') == '83':
+ self.story.addToList('category',u'Rizzoli & Isles')
+ self.story.addToList('characters','J. Rizzoli')
+ self.story.addToList('category',u'Pitch Perfect')
+ self.story.addToList('characters','Chloe B.')
+ elif self.story.getMetadata('storyId') == '82':
+ self.story.addToList('characters','Henry (Once Upon a Time)')
+ self.story.addToList('category',u'Once Upon a Time (TV)')
+ else:
+ self.story.addToList('category','Harry Potter')
+ self.story.addToList('category','Furbie')
+ self.story.addToList('category','Crossover')
+ self.story.addToList('category',u'Puella Magi Madoka Magica/魔法少女まどか★マギカ')
+ self.story.addToList('category',u'Magical Girl Lyrical Nanoha')
+ self.story.addToList('category',u'Once Upon a Time (TV)')
+ self.story.addToList('characters','Bob Smith')
+ self.story.addToList('characters','George Johnson')
+ self.story.addToList('characters','Fred Smythe')
+
self.story.addToList('genre','Fantasy')
self.story.addToList('genre','Comedy')
self.story.addToList('genre','Sci-Fi')
self.story.addToList('genre','Noir')
-
- self.story.addToList('characters','Bob Smith')
- self.story.addToList('characters','George Johnson')
- self.story.addToList('characters','Fred Smythe')
-
+
self.story.addToList('listX','xVal1')
self.story.addToList('listX','xVal2')
self.story.addToList('listX','xVal3')
diff --git a/index.html b/index.html
index 9e508c42..a99b83d2 100644
--- a/index.html
+++ b/index.html
@@ -57,7 +57,8 @@
Changes:
- - Change how fimfiction.net story descriptions are collected.
+ - Yet more fixes for yet more fimfiction.net changes.
+ - Add "add_to_" feature to ini config. Allow higher priority sections to *add* to any ini param rather than replace it.
@@ -68,7 +69,7 @@
If you have any problems with this application, please
report them in
the FanFictionDownLoader Google Group. The
- Previous Version is also available for you to use if necessary.
+ Previous Version is also available for you to use if necessary.
{{ error_message }}