Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 02:13:47 +02:00
Code Issues Projects Releases Wiki Activity

ignore netbeans project dir. Fix error when auto converting news.

Browse source
This commit is contained in:
John Schember 2009-05-20 20:21:29 -04:00
parent d00cd60470
commit d1087fa909
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.bzrignore
View file

@ -13,6 +13,7 @@ src/calibre/manual/cli/
build
dist
docs
nbproject/
src/calibre/gui2/pictureflow/Makefile.Debug
src/calibre/gui2/pictureflow/Makefile.Release
src/calibre/gui2/pictureflow/debug/

6
src/calibre/gui2/device.py
View file

@ -640,15 +640,15 @@ def email_news(self, id):
', '.join(sent_mails), 3000)
def sync_news(self, send_ids=None, do_auto=True):
def sync_news(self, send_ids=None, do_auto_convert=True):
if self.device_connected:
ids = list(dynamic.get('news_to_be_synced', set([]))) if send_ids is None else send_ids
ids = [id for id in ids if self.library_view.model().db.has_id(id)]
files, _auto_ids = self.library_view.model().get_preferred_formats_from_ids(
ids, self.device_manager.device_class.settings().format_map,
exclude_auto=do_auto)
exclude_auto=do_auto_convert)
auto = []
if _auto_ids:
if do_auto_convert and _auto_ids:
for id in _auto_ids:
formats = [f.lower() for f in self.library_view.model().db.formats(id, index_is_id=True).split(',')]
formats = formats if formats != None else []