diff --git a/calibre-plugin/plugin-defaults.ini b/calibre-plugin/plugin-defaults.ini index 7adc253e..ced03eec 100644 --- a/calibre-plugin/plugin-defaults.ini +++ b/calibre-plugin/plugin-defaults.ini @@ -85,9 +85,9 @@ authorId_label:Author ID ## show up in Calibre as tags. Also carried into mobi when converted. extratags_label:Extra Tags ## The version of fanficdownloader -version_label:FFDL Version +version_label:Downloader Version -## Date formats used by FFDL. Published and Update don't have time. +## Date formats used by FanFicFare. Published and Update don't have time. ## See http://docs.python.org/library/datetime.html#strftime-strptime-behavior ## Note that ini format requires % to be escaped as %%. dateCreated_format:%%Y-%%m-%%d %%H:%%M:%%S @@ -172,7 +172,7 @@ connect_timeout:60.0 ## Note that if metakey == conditionalkey the conditional is ignored. ## You can use \s in the replacement to add explicit spaces. (The config parser ## tends to discard trailing spaces.) -## replace_metadata _LIST options: FFDL replace_metadata lines +## replace_metadata _LIST options: FanFicFare replace_metadata lines ## operate on individual list items for list entries. But if you ## want to do a replacement on the joined string for the whole list, ## you can by using _LIST. Example, if you added @@ -232,7 +232,7 @@ connect_timeout:60.0 ## Make sure to keep at least one space at the start of each line and ## to escape % to %%, if used. ## template => regexp to match => GC Setting to use. -## To use this, make sure you go to the Generate Cover tab in FFDL +## To use this, make sure you go to the Generate Cover tab in FanFicFare ## config and check 'Allow generate_cover_settings from personal.ini ## to override' #generate_cover_settings: @@ -306,20 +306,20 @@ anthology_tags:Anthology ## ships_LIST to change the / back to something else if you want. sort_ships:false -## join_string_ options -- FFDL list entries are comma +## join_string_ options -- FanFicFare list entries are comma ## separated by default. You can use this to change that. For example, ## if you want authors separated with ' & ' instead, use ## join_string_calibre_author:\s&\s. (\s == space) #join_string_author:,\s -## keep_in_order_ options: FFDL sorts list entries by default +## keep_in_order_ options: FanFicFare sorts list entries by default ## (except for author/authorUrl/authorId). But if you want to use an ## extra entry derived from author, it ends up sorted. For example, if ## you added calibre_author: keep_in_order_calibre_author:true #keep_in_order_author:true ## User-agent -user_agent:FFDL/2.0 +user_agent:FFF/2.X ## Each output format has a section that overrides [defaults] [html] @@ -330,7 +330,7 @@ user_agent:FFDL/2.0 ## include_images is *not* available in the web service in any format. #include_images:false -## This switch prevents FFDL from doing any processing on the images. +## This switch prevents FanFicFare from doing any processing on the images. ## Usually they would be converted to jpg, resized and optionally made ## grayscale. no_image_processing: true @@ -479,6 +479,22 @@ image_max_size: 580, 725 ## space. #grayscale_images: false +## jpg or png +## -- jpg produces smaller images, and may be supported by more +## readers, but it's older and doesn't allow transparency. +## Transparency removed as if remove_transparency: true +## -- png is newer but does allow transparency, but only in CLI. +## It doesn't work in calibre PI due to limitations of the API. +convert_images_to: jpg + +## Remove transparency and fill with background_color if true. +remove_transparency: true + +## This switch prevents FanFicFare from doing any processing on the images. +## Usually they would be converted to jpg, resized and optionally made +## grayscale. +#no_image_processing: false + ## if the tag doesn't have a div or a p around it, nook gets ## confused and displays it on every page after that under the text ## for the rest of the chapter. I doubt adding a div around the img @@ -549,7 +565,7 @@ extratags: FanFiction,Testing,HTML #is_adult:true ## archiveofourown.org stories allow chapters to be added out of -## order. So the newest chapter may not be the last one. FFDL update +## order. So the newest chapter may not be the last one. FanFicFare update ## doesn't like that. If do_update_hook is uncommented and set true, ## the adapter will discard all existing chapters from the newest one ## on when updating to enforce accurate chapters. @@ -758,7 +774,7 @@ cover_exclusion_regexp:/images/.*?ribbon.gif ## Some adapters collect additional meta information beyond the ## standard ones. They need to be defined in extra_valid_entries to -## tell the rest of the FFDL system about them. They can be used in +## tell the rest of the FanFicFare system about them. They can be used in ## include_subject_tags, titlepage_entries, extra_titlepage_entries, ## logpage_entries, extra_logpage_entries, and include_in_* config ## items. You can also add additional entries here to build up @@ -1536,7 +1552,7 @@ extra_valid_entries:reviews,favs,follows ## to be romantic pairings. ships_label:Pairings -## Date formats used by FFDL. Published and Update don't usually have +## Date formats used by FanFicFare. Published and Update don't usually have ## time, but they do now on ffnet. ## See http://docs.python.org/library/datetime.html#strftime-strptime-behavior ## Note that ini format requires % to be escaped as %%. @@ -1590,7 +1606,7 @@ cover_exclusion_regexp:(/imageu/|d_60_90\.jpg) ## reducing this sleep. slow_down_sleep_time:4 -## Date formats used by FFDL. Published and Update don't usually have +## Date formats used by FanFicFare. Published and Update don't usually have ## time, but they do now on ffnet. ## See http://docs.python.org/library/datetime.html#strftime-strptime-behavior ## Note that ini format requires % to be escaped as %%. @@ -1610,7 +1626,7 @@ dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S #fail_on_password: false ## fimfiction.net stories allow chapters to be added out of order. So -## the newest chapter may not be the last one. FFDL update doesn't +## the newest chapter may not be the last one. FanFicFare update doesn't ## like that. If do_update_hook is uncommented and set true, the ## adapter will discard all existing chapters from the newest one on ## when updating to enforce accurate chapters. @@ -1743,7 +1759,7 @@ extraships:Nick Stokes/Greg Sanders ## phoenixsong.net, oddly, can have high rated chapters (login ## required) in the middle of a lower rated story. Use this to force -## FFDL to always login to phoenixsong.net so those stories download +## FanFicFare to always login to phoenixsong.net so those stories download ## correctly. If you have a login, this is recommended. #force_login:true diff --git a/fanficfare/defaults.ini b/fanficfare/defaults.ini index 1c829346..946895bb 100644 --- a/fanficfare/defaults.ini +++ b/fanficfare/defaults.ini @@ -85,9 +85,9 @@ authorId_label:Author ID ## show up in Calibre as tags. Also carried into mobi when converted. extratags_label:Extra Tags ## The version of fanficdownloader -version_label:FFDL Version +version_label:Downloader Version -## Date formats used by FFDL. Published and Update don't have time. +## Date formats used by FanFicFare. Published and Update don't have time. ## See http://docs.python.org/library/datetime.html#strftime-strptime-behavior ## Note that ini format requires % to be escaped as %%. dateCreated_format:%%Y-%%m-%%d %%H:%%M:%%S @@ -205,7 +205,7 @@ connect_timeout:60.0 ## Note that if metakey == conditionalkey the conditional is ignored. ## You can use \s in the replacement to add explicit spaces. (The config parser ## tends to discard trailing spaces.) -## replace_metadata _LIST options: FFDL replace_metadata lines +## replace_metadata _LIST options: FanFicFare replace_metadata lines ## operate on individual list items for list entries. But if you ## want to do a replacement on the joined string for the whole list, ## you can by using _LIST. Example, if you added @@ -312,20 +312,20 @@ chapter_title_add_pattern:${index}. ${title} ## ships_LIST to change the / back to something else if you want. sort_ships:false -## join_string_ options -- FFDL list entries are comma +## join_string_ options -- FanFicFare list entries are comma ## separated by default. You can use this to change that. For example, ## if you want authors separated with ' & ' instead, use ## join_string_calibre_author:\s&\s. (\s == space) #join_string_author:,\s -## keep_in_order_ options: FFDL sorts list entries by default +## keep_in_order_ options: FanFicFare sorts list entries by default ## (except for author/authorUrl/authorId). But if you want to use an ## extra entry derived from author, it ends up sorted. For example, if ## you added calibre_author: keep_in_order_calibre_author:true #keep_in_order_author:true ## User-agent -user_agent:FFDL/2.0 +user_agent:FFF/2.X ## Each output format has a section that overrides [defaults] [html] @@ -341,7 +341,7 @@ user_agent:FFDL/2.0 #output_filename: books/${author}/${title}/${title}-${siteabbrev}_${authorId}_${storyId}${formatext} #zip_output: false -## This switch prevents FFDL from doing any processing on the images. +## This switch prevents FanFicFare from doing any processing on the images. ## Usually they would be converted to jpg, resized and optionally made ## grayscale. no_image_processing: true @@ -503,6 +503,11 @@ convert_images_to: jpg ## Remove transparency and fill with background_color if true. remove_transparency: true +## This switch prevents FanFicFare from doing any processing on the images. +## Usually they would be converted to jpg, resized and optionally made +## grayscale. +#no_image_processing: false + ## if the tag doesn't have a div or a p around it, nook gets ## confused and displays it on every page after that under the text ## for the rest of the chapter. I doubt adding a div around the img @@ -573,7 +578,7 @@ extratags: FanFiction,Testing,HTML #is_adult:true ## archiveofourown.org stories allow chapters to be added out of -## order. So the newest chapter may not be the last one. FFDL update +## order. So the newest chapter may not be the last one. FanFicFare update ## doesn't like that. If do_update_hook is uncommented and set true, ## the adapter will discard all existing chapters from the newest one ## on when updating to enforce accurate chapters. @@ -782,7 +787,7 @@ cover_exclusion_regexp:/images/.*?ribbon.gif ## Some adapters collect additional meta information beyond the ## standard ones. They need to be defined in extra_valid_entries to -## tell the rest of the FFDL system about them. They can be used in +## tell the rest of the FanFicFare system about them. They can be used in ## include_subject_tags, titlepage_entries, extra_titlepage_entries, ## logpage_entries, extra_logpage_entries, and include_in_* config ## items. You can also add additional entries here to build up @@ -1533,7 +1538,7 @@ extra_valid_entries:reviews,favs,follows ## to be romantic pairings. ships_label:Pairings -## Date formats used by FFDL. Published and Update don't usually have +## Date formats used by FanFicFare. Published and Update don't usually have ## time, but they do now on ffnet. ## See http://docs.python.org/library/datetime.html#strftime-strptime-behavior ## Note that ini format requires % to be escaped as %%. @@ -1590,7 +1595,7 @@ cover_exclusion_regexp:(/imageu/|d_60_90\.jpg) ## reducing this sleep. slow_down_sleep_time:4 -## Date formats used by FFDL. Published and Update don't usually have +## Date formats used by FanFicFare. Published and Update don't usually have ## time, but they do now on ffnet. ## See http://docs.python.org/library/datetime.html#strftime-strptime-behavior ## Note that ini format requires % to be escaped as %%. @@ -1610,7 +1615,7 @@ dateUpdated_format:%%Y-%%m-%%d %%H:%%M:%%S #fail_on_password: false ## fimfiction.net stories allow chapters to be added out of order. So -## the newest chapter may not be the last one. FFDL update doesn't +## the newest chapter may not be the last one. FanFicFare update doesn't ## like that. If do_update_hook is uncommented and set true, the ## adapter will discard all existing chapters from the newest one on ## when updating to enforce accurate chapters. @@ -1743,7 +1748,7 @@ extraships:Nick Stokes/Greg Sanders ## phoenixsong.net, oddly, can have high rated chapters (login ## required) in the middle of a lower rated story. Use this to force -## FFDL to always login to phoenixsong.net so those stories download +## FanFicFare to always login to phoenixsong.net so those stories download ## correctly. If you have a login, this is recommended. #force_login:true diff --git a/fanficfare/epubutils.py b/fanficfare/epubutils.py index cad767af..0436656f 100644 --- a/fanficfare/epubutils.py +++ b/fanficfare/epubutils.py @@ -94,7 +94,7 @@ def get_update_data(inputio, if getfilecount: # spin through the manifest--only place there are item tags. for item in contentdom.getElementsByTagName("item"): - # First, count the 'chapter' files. FFDL uses file0000.xhtml, + # First, count the 'chapter' files. FFF uses file0000.xhtml, # but can also update epubs downloaded from Twisting the # Hellmouth, which uses chapter0.html. if( item.getAttribute("media-type") == "application/xhtml+xml" ): @@ -175,7 +175,7 @@ def get_story_url_from_html(inputio,_is_good_url=None): # spin through the manifest--only place there are item tags. for item in contentdom.getElementsByTagName("item"): - # First, count the 'chapter' files. FFDL uses file0000.xhtml, + # First, count the 'chapter' files. FFF uses file0000.xhtml, # but can also update epubs downloaded from Twisting the # Hellmouth, which uses chapter0.html. #print("---- item:%s"%item) diff --git a/fanficfare/writers/base_writer.py b/fanficfare/writers/base_writer.py index 3a7ec37e..f049c4c3 100644 --- a/fanficfare/writers/base_writer.py +++ b/fanficfare/writers/base_writer.py @@ -73,7 +73,7 @@ class BaseStoryWriter(Configurable): 'formatname':'File Format', 'formatext':'File Extension', 'siteabbrev':'Site Abbrev', - 'version':'FFDL Version' + 'version':'Downloader Version' } self.story.setMetadata('formatname',self.getFormatName()) self.story.setMetadata('formatext',self.getFormatExt())