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

Catalog housecleaning, progress reporting fixed, CSV cleanup

Browse Source
This commit is contained in:
GRiker 2010-01-29 16:21:50 -07:00
parent 1ce23c2314
commit 28d5317c8f
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/customize/__init__.py
View File

@ -288,7 +288,7 @@ class CatalogPlugin(Plugin):
fields = list(all_fields)
fields.sort()
if opts.sort_by:
if opts.sort_by and opts.sort_by in fields:
fields.insert(0,fields.pop(int(fields.index(opts.sort_by))))
return fields

27
src/calibre/library/catalog.py
View File

@ -51,18 +51,23 @@ class CSV_XML(CatalogPlugin):
self.fmt = path_to_output.rpartition('.')[2]
self.notification = notification
if False and opts.verbose:
log("%s:run" % self.name)
log(" path_to_output: %s" % path_to_output)
log(" Output format: %s" % self.fmt)
# Display opts
if opts.verbose:
opts_dict = vars(opts)
keys = opts_dict.keys()
keys.sort()
log(" opts:")
for key in keys:
log(" %s: %s" % (key, opts_dict[key]))
log("%s(): Generating %s" % (self.name,self.fmt))
if opts_dict['search_text']:
log(" --search='%s'" % opts_dict['search_text'])
if opts_dict['ids']:
log(" Book count: %d" % len(opts_dict['ids']))
if opts_dict['search_text']:
log(" (--search ignored when a subset of the database is specified)")
if opts_dict['fields']:
if opts_dict['fields'] == 'all':
log(" Fields: %s" % ', '.join(FIELDS[1:]))
else:
log(" Fields: %s" % opts_dict['fields'])
# If a list of ids are provided, don't use search_text
if opts.ids: