mirror of
https://github.com/JimmXinu/FanFicFare.git
synced 2025-12-31 05:03:34 +01:00
Fix extratags, document extra_subject_tags in .ini files, bump versions.
This commit is contained in:
Jim Miller
parent
e481faaf4e
commit
9e658112d3
6 changed files with 23 additions and 24 deletions
2
app.yaml
2
app.yaml
|
|
@ -1,6 +1,6 @@
|
|||
# ffd-retief-hrd fanfictiondownloader
|
||||
application: fanfictiondownloader
|
||||
version: 4-4-26
|
||||
version: 4-4-27
|
||||
runtime: python27
|
||||
api_version: 1
|
||||
threadsafe: true
|
||||
|
|
|
|||
|
|
@ -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, 10)
|
||||
version = (1, 6, 11)
|
||||
minimum_calibre_version = (0, 8, 57)
|
||||
|
||||
#: This field defines the GUI plugin class that contains all the code
|
||||
|
|
|
|||
20
defaults.ini
20
defaults.ini
|
|
@ -386,10 +386,9 @@ include_in_compositeJ:dateCreated
|
|||
include_in_compositeK:metaC,listX,compositeL,compositeJ,compositeK,listZ
|
||||
include_in_compositeL:ships,metaA,listZ,datePublished,dateUpdated,
|
||||
|
||||
include_in_ships:compositeK,genre,ships,dateUpdated
|
||||
|
||||
extra_titlepage_entries: metaA,metaB,metaC,listX,listY,listZ,compositeJ,compositeK,compositeL
|
||||
extra_logpage_entries: metaA,metaB,metaC,listX,listY,listZ,compositeJ,compositeK,compositeL
|
||||
extra_subject_tags: metaA,metaB,metaC
|
||||
|
||||
replace_metadata:
|
||||
compositeL=>Val=>VALUE
|
||||
|
|
@ -411,16 +410,6 @@ extratags: FanFiction,Testing,Text
|
|||
[test1.com:html]
|
||||
extratags: FanFiction,Testing,HTML
|
||||
|
||||
[test1.com:epub]
|
||||
extra_valid_entries:editedchars
|
||||
|
||||
include_in_editedchars:characters
|
||||
|
||||
replace_metadata:
|
||||
editedchars=>^(.+)$=>somesite:\1
|
||||
|
||||
extra_titlepage_entries: editedchars
|
||||
|
||||
[archive.skyehawke.com]
|
||||
|
||||
[archiveofourown.org]
|
||||
|
|
@ -446,8 +435,12 @@ kudos_label:Kudos
|
|||
hits_label:Hits
|
||||
bookmarks:Bookmarks
|
||||
|
||||
## adds to titlepage_entries instead of replacing it.
|
||||
#extra_titlepage_entries: fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks
|
||||
|
||||
## adds to include_subject_tags instead of replacing it.
|
||||
#extra_subject_tags:fandoms,freefromtags,ao3categories
|
||||
|
||||
[ashwinder.sycophanthex.com]
|
||||
## Site dedicated to these categories/characters/ships
|
||||
extracategories:Harry Potter
|
||||
|
|
@ -565,6 +558,9 @@ cliches_label:Character Cliches
|
|||
## the end, you will need to copy titlepage_entries.)
|
||||
#extra_titlepage_entries: themes,hermiones,dracos,timeline,cliches
|
||||
|
||||
## adds to include_subject_tags instead of replacing it.
|
||||
#extra_subject_tags: themes,timeline,cliches
|
||||
|
||||
[erosnsappho.sycophanthex.com]
|
||||
## Site dedicated to these categories/characters/ships
|
||||
extracategories:Harry Potter
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ class Configuration(ConfigParser.SafeConfigParser):
|
|||
'output_css',
|
||||
'authorHTML'
|
||||
]
|
||||
|
||||
|
||||
def addConfigSection(self,section):
|
||||
self.sectionslist.insert(0,section)
|
||||
|
||||
|
|
@ -84,10 +84,7 @@ class Configuration(ConfigParser.SafeConfigParser):
|
|||
return key in self.getValidMetaList()
|
||||
|
||||
def getValidMetaList(self):
|
||||
vl = []
|
||||
vl.extend(self.validEntries)
|
||||
vl.extend(self.getConfigList("extra_valid_entries"))
|
||||
return vl
|
||||
return self.validEntries + self.getConfigList("extra_valid_entries")
|
||||
|
||||
def hasConfig(self, key):
|
||||
for section in self.sectionslist:
|
||||
|
|
|
|||
|
|
@ -402,8 +402,8 @@ class Story(Configurable):
|
|||
|
||||
if None in subjectset:
|
||||
subjectset.remove(None)
|
||||
|
||||
return list(subjectset)
|
||||
|
||||
return list(subjectset | set(self.getConfigList("extratags")))
|
||||
|
||||
def addChapter(self, title, html):
|
||||
if self.getConfig('strip_chapter_numbers') and \
|
||||
|
|
|
|||
|
|
@ -364,13 +364,12 @@ extrawarnings:Extreme Bogosity
|
|||
extra_valid_entries:metaA,metaB,metaC,listX,listY,listZ,compositeJ,compositeK,compositeL
|
||||
|
||||
include_in_compositeJ:dateCreated
|
||||
include_in_compositeK:metaC,listX,compositeL,compositeJ,compositeK
|
||||
include_in_compositeK:metaC,listX,compositeL,compositeJ,compositeK,listZ
|
||||
include_in_compositeL:ships,metaA,listZ,datePublished,dateUpdated,
|
||||
|
||||
#include_in_ships:compositeK,genre
|
||||
|
||||
extra_titlepage_entries: metaA,metaB,metaC,listX,listY,listZ,compositeJ,compositeK,compositeL
|
||||
extra_logpage_entries: metaA,metaB,metaC,listX,listY,listZ,compositeJ,compositeK,compositeL
|
||||
extra_subject_tags: metaA,metaB,metaC
|
||||
|
||||
replace_metadata:
|
||||
compositeL=>Val=>VALUE
|
||||
|
|
@ -417,8 +416,12 @@ kudos_label:Kudos
|
|||
hits_label:Hits
|
||||
bookmarks:Bookmarks
|
||||
|
||||
## adds to titlepage_entries instead of replacing it.
|
||||
#extra_titlepage_entries: fandoms,freefromtags,ao3categories,comments,kudos,hits,bookmarks
|
||||
|
||||
## adds to include_subject_tags instead of replacing it.
|
||||
#extra_subject_tags:fandoms,freefromtags,ao3categories
|
||||
|
||||
[ashwinder.sycophanthex.com]
|
||||
## Site dedicated to these categories/characters/ships
|
||||
extracategories:Harry Potter
|
||||
|
|
@ -554,6 +557,9 @@ cliches_label:Character Cliches
|
|||
# themes=>#bcolumn,a
|
||||
# timeline=>#ccolumn,n
|
||||
|
||||
## adds to include_subject_tags instead of replacing it.
|
||||
#extra_subject_tags: themes,timeline,cliches
|
||||
|
||||
[erosnsappho.sycophanthex.com]
|
||||
## Site dedicated to these categories/characters/ships
|
||||
extracategories:Harry Potter
|
||||
|
|
|
|||
Loading…
Reference in a new issue