From 5e7c28d2dc8b7090bada01c5939f7ea1b807c583 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sat, 25 Aug 2012 21:49:36 -0500 Subject: [PATCH] Integrate new site, add adobe-text-layout to epub CSS for no nook hyphenation. --- calibre-plugin/__init__.py | 2 +- defaults.ini | 10 +++++++++- fanficdownloader/adapters/__init__.py | 1 + index.html | 9 +++++++-- plugin-defaults.ini | 12 ++++++++++-- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index 71eac38..fe3459b 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, 6, 5) + version = (1, 6, 6) minimum_calibre_version = (0, 8, 57) #: This field defines the GUI plugin class that contains all the code diff --git a/defaults.ini b/defaults.ini index 00a7602..035de4f 100644 --- a/defaults.ini +++ b/defaults.ini @@ -229,10 +229,12 @@ background_color: ffffff ## Allow customization of CSS. Make sure to keep at least one space ## at the start of each line and to escape % to %%. Also need ## background_color to be in the same section, if included in CSS. +## 'adobe-text-layout: optimizeSpeed;' prevents hyphenation on newer Nooks output_css: body { background-color: #%(background_color)s; text-align: justify; - margin: 2%%; } + margin: 2%%; + adobe-text-layout: optimizeSpeed; } pre { font-size: x-small; } sml { font-size: small; } h1 { text-align: center; } @@ -704,6 +706,12 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png ## this should go in your personal.ini, not defaults.ini. #is_adult:true +[www.sinful-desire.org] +## 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.siye.co.uk] [www.squidge.org/peja] diff --git a/fanficdownloader/adapters/__init__.py b/fanficdownloader/adapters/__init__.py index 849b87f..5de96bc 100644 --- a/fanficdownloader/adapters/__init__.py +++ b/fanficdownloader/adapters/__init__.py @@ -96,6 +96,7 @@ import adapter_dracoandginnycom import adapter_scarvesandcoffeenet import adapter_thepetulantpoetesscom import adapter_wolverineandroguecom +import adapter_sinfuldesireorg ## 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 c8b36ea..97da247 100644 --- a/index.html +++ b/index.html @@ -57,8 +57,8 @@

New Sites

Now supporing www.dracoandginny.com, - www.scarvesandcoffee.net, www.thepetulantpoetess.com and - www.wolverineandrogue.com. Thanks, Ida! + www.scarvesandcoffee.net, www.thepetulantpoetess.com, + www.wolverineandrogue.com and www.sinful-desire.com. Thanks, Ida!

FFDL now supports over 70 different fanfiction sites. @@ -528,6 +528,11 @@ Use the URL of the story's chapter list, such as
http://www.wolverineandrogue.com/wrfa/viewstory.php?sid=1234 +

www.sinful-desire.org
+
+ Use the URL of the story's chapter list, such as +
http://www.sinful-desire.org/archive/viewstory.php?sid=1234 +

A few additional things to know, which will make your life substantially easier: diff --git a/plugin-defaults.ini b/plugin-defaults.ini index 948e640..352f9d7 100644 --- a/plugin-defaults.ini +++ b/plugin-defaults.ini @@ -19,7 +19,7 @@ ## overridden at several levels ## Some sites also require the user to confirm they are adult for -## adult content. +## adult content. Uncomment by removing '#' in front of is_adult. #is_adult:true ## All available titlepage_entries and the label used for them: @@ -214,10 +214,12 @@ background_color: ffffff ## Allow customization of CSS. Make sure to keep at least one space ## at the start of each line and to escape % to %%. Also need ## background_color to be in the same section, if included in CSS. +## 'adobe-text-layout: optimizeSpeed;' prevents hyphenation on newer Nooks output_css: body { background-color: #%(background_color)s; text-align: justify; - margin: 2%%; } + margin: 2%%; + adobe-text-layout: optimizeSpeed; } pre { font-size: x-small; } sml { font-size: small; } h1 { text-align: center; } @@ -686,6 +688,12 @@ cover_exclusion_regexp:/stories/999/images/.*?_trophy.png ## this should go in your personal.ini, not defaults.ini. #is_adult:true +[www.sinful-desire.org] +## 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.siye.co.uk] [www.squidge.org/peja]