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

Fix #1159 (Feature request for calibredb's list output to have CSV option)

Browse Source
This commit is contained in:
Kovid Goyal 2008-10-11 18:46:00 -07:00
parent 3a9297e5e8
commit 0e2c028a1c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/library/cli.py
View File

@ -37,7 +37,7 @@ def get_db(dbpath, options):
print _('Using library at'), dbpath print _('Using library at'), dbpath
return LibraryDatabase2(dbpath, row_factory=True) return LibraryDatabase2(dbpath, row_factory=True)
def do_list(db, fields, sort_by, ascending, search_text, line_width): def do_list(db, fields, sort_by, ascending, search_text, line_width, separator):
db.refresh(sort_by, ascending) db.refresh(sort_by, ascending)
if search_text: if search_text:
filters, OR = text_to_tokens(search_text) filters, OR = text_to_tokens(search_text)
@ -89,9 +89,9 @@ def do_list(db, fields, sort_by, ascending, search_text, line_width):
for l in range(lines): for l in range(lines):
for i, field in enumerate(text): for i, field in enumerate(text):
ft = text[i][l] if l < len(text[i]) else '' ft = text[i][l] if l < len(text[i]) else ''
filler = '%*s'%(widths[i]-len(ft), '') filler = '%*s'%(widths[i]-len(ft)-1, '')
sys.stdout.write(ft) sys.stdout.write(ft)
sys.stdout.write(filler) sys.stdout.write(filler+separator)
print print
@ -104,7 +104,7 @@ List the books available in the calibre database.
''' '''
)) ))
parser.add_option('-f', '--fields', default='title,authors', parser.add_option('-f', '--fields', default='title,authors',
help=_('The fields to display when listing books in the database. Should be a comma separated list of fields.\nAvailable fields: %s\nDefault: %%default')%','.join(FIELDS)) help=_('The fields to display when listing books in the database. Should be a comma separated list of fields.\nAvailable fields: %s\nDefault: %%default. The special field "all" can be used to select all fields.')%','.join(FIELDS))
parser.add_option('--sort-by', default='timestamp', parser.add_option('--sort-by', default='timestamp',
help=_('The field by which to sort the results.\nAvailable fields: %s\nDefault: %%default')%','.join(FIELDS)) help=_('The field by which to sort the results.\nAvailable fields: %s\nDefault: %%default')%','.join(FIELDS))
parser.add_option('--ascending', default=False, action='store_true', parser.add_option('--ascending', default=False, action='store_true',
@ -113,8 +113,11 @@ List the books available in the calibre database.
help=_('Filter the results by the search query. For the format of the search query, please see the search related documentation in the User Manual. Default is to do no filtering.')) help=_('Filter the results by the search query. For the format of the search query, please see the search related documentation in the User Manual. Default is to do no filtering.'))
parser.add_option('-w', '--line-width', default=-1, type=int, parser.add_option('-w', '--line-width', default=-1, type=int,
help=_('The maximum width of a single line in the output. Defaults to detecting screen size.')) help=_('The maximum width of a single line in the output. Defaults to detecting screen size.'))
parser.add_option('--separator', default=' ', help=_('The string used to separate fields. Default is a space.'))
opts, args = parser.parse_args(sys.argv[:1] + args) opts, args = parser.parse_args(sys.argv[:1] + args)
fields = [str(f.strip().lower()) for f in opts.fields.split(',')] fields = [str(f.strip().lower()) for f in opts.fields.split(',')]
if 'all' in fields:
fields = sorted(list(FIELDS))
if not set(fields).issubset(FIELDS): if not set(fields).issubset(FIELDS):
parser.print_help() parser.print_help()
print print
@ -128,7 +131,7 @@ List the books available in the calibre database.
print >>sys.stderr, _('Invalid sort field. Available fields:'), ','.join(FIELDS) print >>sys.stderr, _('Invalid sort field. Available fields:'), ','.join(FIELDS)
return 1 return 1
do_list(db, fields, opts.sort_by, opts.ascending, opts.search, opts.line_width) do_list(db, fields, opts.sort_by, opts.ascending, opts.search, opts.line_width, opts.separator)
return 0 return 0