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

Fix auto send news to device regression

Browse Source
This commit is contained in:
Kovid Goyal 2009-05-31 14:33:15 -07:00
commit dfe2522b05
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/device.py
View File

@ -688,10 +688,10 @@ class DeviceGUI(object):
if config['upload_news_to_device'] and files: if config['upload_news_to_device'] and files:
remove = ids if \ remove = ids if \
config['delete_news_from_library_on_upload'] else [] config['delete_news_from_library_on_upload'] else []
space = { self.location_view.model().free[0] : 'main', space = { self.location_view.model().free[0] : None,
self.location_view.model().free[1] : 'carda', self.location_view.model().free[1] : 'carda',
self.location_view.model().free[2] : 'cardb' } self.location_view.model().free[2] : 'cardb' }
on_card = space.get(sorted(space.keys(), reverse=True)[0], 'main') on_card = space.get(sorted(space.keys(), reverse=True)[0], None)
self.upload_books(files, names, metadata, self.upload_books(files, names, metadata,
on_card=on_card, on_card=on_card,
memory=[[f.name for f in files], remove]) memory=[[f.name for f in files], remove])

6
src/calibre/linux.py
View File

@ -135,13 +135,14 @@ def open_file(path, mode='wb'):
return open(path, mode) return open(path, mode)
def setup_completion(fatal_errors): def setup_completion(fatal_errors):
manifest = []
try: try:
print 'Setting up bash completion...', print 'Setting up bash completion...',
sys.stdout.flush() sys.stdout.flush()
from calibre.ebooks.metadata.cli import option_parser as metaop, filetypes as meta_filetypes from calibre.ebooks.metadata.cli import option_parser as metaop, filetypes as meta_filetypes
from calibre.ebooks.lrf.lrfparser import option_parser as lrf2lrsop from calibre.ebooks.lrf.lrfparser import option_parser as lrf2lrsop
from calibre.gui2.lrf_renderer.main import option_parser as lrfviewerop from calibre.gui2.lrf_renderer.main import option_parser as lrfviewerop
from calibre.web.feeds.main import option_parser as feeds2disk from calibre.web.fetch.simple import option_parser as web2disk
from calibre.web.feeds.recipes import titles as feed_titles from calibre.web.feeds.recipes import titles as feed_titles
from calibre.ebooks.metadata.fetch import option_parser as fem_op from calibre.ebooks.metadata.fetch import option_parser as fem_op
from calibre.gui2.main import option_parser as guiop from calibre.gui2.main import option_parser as guiop
@ -151,7 +152,6 @@ def setup_completion(fatal_errors):
f = open_file('/etc/bash_completion.d/libprs500') f = open_file('/etc/bash_completion.d/libprs500')
f.close() f.close()
os.remove(f.name) os.remove(f.name)
manifest = []
f = open_file('/etc/bash_completion.d/calibre') f = open_file('/etc/bash_completion.d/calibre')
manifest.append(f.name) manifest.append(f.name)
@ -160,7 +160,7 @@ def setup_completion(fatal_errors):
f.write(opts_and_exts('lrf2lrs', lrf2lrsop, ['lrf'])) f.write(opts_and_exts('lrf2lrs', lrf2lrsop, ['lrf']))
f.write(opts_and_exts('ebook-meta', metaop, list(meta_filetypes()))) f.write(opts_and_exts('ebook-meta', metaop, list(meta_filetypes())))
f.write(opts_and_exts('lrfviewer', lrfviewerop, ['lrf'])) f.write(opts_and_exts('lrfviewer', lrfviewerop, ['lrf']))
f.write(opts_and_words('feeds2disk', feeds2disk, feed_titles)) f.write(opts_and_words('web2disk', web2disk, feed_titles))
f.write(opts_and_words('fetch-ebook-metadata', fem_op, [])) f.write(opts_and_words('fetch-ebook-metadata', fem_op, []))
f.write(opts_and_words('calibre-smtp', smtp_op, [])) f.write(opts_and_words('calibre-smtp', smtp_op, []))
f.write(''' f.write('''