GwR changes via CHaley

This commit is contained in:
GRiker 2010-09-07 04:23:10 -07:00
parent d823d4244a
commit 3404b367b9
2 changed files with 8 additions and 4 deletions

View File

@ -26,14 +26,19 @@ class GenerateCatalogAction(InterfaceAction):
rows = xrange(self.gui.library_view.model().rowCount(QModelIndex())) rows = xrange(self.gui.library_view.model().rowCount(QModelIndex()))
ids = map(self.gui.library_view.model().id, rows) ids = map(self.gui.library_view.model().id, rows)
dbspec = None
if not ids: if not ids:
return error_dialog(self.gui, _('No books selected'), return error_dialog(self.gui, _('No books selected'),
_('No books selected to generate catalog for'), _('No books selected to generate catalog for'),
show=True) show=True)
db = self.gui.library_view.model().db
dbspec = {}
for id in ids:
dbspec[id] = {'ondevice':db.ondevice(id, index_is_id=True)}
db.catalog_plugin_on_device_temp_mapping = dbspec
# Calling gui2.tools:generate_catalog() # Calling gui2.tools:generate_catalog()
ret = generate_catalog(self.gui, dbspec, ids, self.gui.device_manager) ret = generate_catalog(self.gui, db, ids, self.gui.device_manager)
if ret is None: if ret is None:
return return

View File

@ -104,8 +104,7 @@ class CSV_XML(CatalogPlugin):
# Output the entry fields # Output the entry fields
for entry in data: for entry in data:
print "%s [%s]" % (entry['title'],entry['id']) print "%s [%s] ondevice: %s" % (entry['title'],entry['id'], repr(db.catalog_plugin_on_device_temp_mapping[entry['id']]))
print "ondevice: %s" % db.ondevice(entry['id'], index_is_id=True)
outstr = [] outstr = []
for field in fields: for field in fields:
item = entry[field] item = entry[field]