Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

New option to override page count calculation method on book-by-book basis

Browse Source 
A new option is provided which allows the user to create a custom column which specifies which apnx calculation method to use for a particular book.  The original method option is treated as a default which is overridden in cases where a valid method is given in the specified column.  This is useful, for example, in cases where the user has a small number of books which are setup for the pagebreak method and wants to use the accurate method most of the rest of the time.

Because this option was introduced into the option list before the overwrite option, I've also included code which should shift the options around accordingly in cases where the overwrite option has been implemented and used prior to applying this change.
This commit is contained in:
Br. Samuel Springuel 2014-08-29 13:39:04 -04:00
parent 1a7dc8973d
commit f293a76543
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/calibre/devices/kindle/driver.py
View File

@ -323,6 +323,14 @@ class KINDLE2(KINDLE):
' store the page count of books, you can have calibre use that'
' information, instead of calculating a page count. Specify the'
' name of the custom column here, for example, #pages.'),
### New option to override page count calculation method on book-by-book basis
_('Custom column name to retrieve calculation method from') + ':::' + _(
'If you have a custom column in your library that you use to'
' store the preferred method for calculating the number of pages'
' for a book, you can have calibre use that method instead of the'
' default one selected above. Specify the name of the custom'
' column here, for example, #pagemethod.'),
###
### New option to indicate whether an existing apnx file on the kindle should be overwritten when sending to the device.
_('Overwrite existing apnx on device') + ':::' + _(
'Uncheck this option to allow an apnx file existing on the device'
@ -338,13 +346,15 @@ class KINDLE2(KINDLE):
True,
'fast',
'',
'',
True,
]
OPT_APNX = 0
OPT_APNX_METHOD = 1
OPT_APNX_CUST_COL = 2
### New option
OPT_APNX_OVERWRITE = 3
### New options
OPT_APNX_METHOD_COL = 3
OPT_APNX_OVERWRITE = 4
###
EXTRA_CUSTOMIZATION_CHOICES = {OPT_APNX_METHOD:{'fast', 'accurate', 'pagebreak'}}
@ -357,6 +367,10 @@ class KINDLE2(KINDLE):
if isinstance(vals[cls.OPT_APNX_METHOD], bool):
# Previously this option used to be a bool
vals[cls.OPT_APNX_METHOD] = 'accurate' if vals[cls.OPT_APNX_METHOD] else 'fast'
if isinstance(vals[cls.OPT_APNX_METHOD_COL], bool):
# The method column option was added before the overwrite option, so we need to shift the options around a bit
vals[cls.OPT_APNX_OVERWRITE] = vals[cls.OPT_APNX_METHOD_COL]
vals[cls.OPT_APNX_METHOD_COL] = ''
return vals
def formats_to_scan_for(self):
@ -477,6 +491,20 @@ class KINDLE2(KINDLE):
### This was existing code just dedented one level
try:
method = opts.extra_customization[self.OPT_APNX_METHOD]
### New code to retreive override method, if available
cust_col_name = opts.extra_customization[self.OPT_APNX_METHOD_COL]
if cust_col_name:
try:
temp = str(metadata.get(cust_col_name, 0))
if temp not in self.EXTRA_CUSTOMIZATION_CHOICES[self.OPT_APNX_METHOD]:
print "Invalid method choice for this book, reverting to default."
else:
method = temp
except:
print 'Could not retreive override method choice, reverting to default.'
pass
print 'Generating apnx with', method
###
apnx_builder.write_apnx(filepath, apnx_path, method=method, page_count=custom_page_count)
except:
print 'Failed to generate APNX'