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

Fix #759551 (Incorrect details when sending ebooks to device)

Browse Source
This commit is contained in:
Kovid Goyal 2011-04-14 08:35:42 -06:00
commit 079d1cb974
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/customize/profiles.py
View File

@ -344,6 +344,7 @@ class iPadOutput(OutputProfile):
border-spacing:1px; border-spacing:1px;
margin-left: 5%; margin-left: 5%;
margin-right: 5%; margin-right: 5%;
page-break-inside:avoid;
width: 90%; width: 90%;
-webkit-border-radius:4px; -webkit-border-radius:4px;
} }

19
src/calibre/devices/apple/driver.py
View File

@ -349,7 +349,7 @@ class ITUNES(DriverBase):
break break
break break
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(j+1/task_count, _('Updating device metadata listing...')) self.report_progress((j+1)/task_count, _('Updating device metadata listing...'))
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(1.0, _('Updating device metadata listing...')) self.report_progress(1.0, _('Updating device metadata listing...'))
@ -428,7 +428,7 @@ class ITUNES(DriverBase):
} }
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(i+1/book_count, _('%d of %d') % (i+1, book_count)) self.report_progress((i+1)/book_count, _('%d of %d') % (i+1, book_count))
self._purge_orphans(library_books, cached_books) self._purge_orphans(library_books, cached_books)
elif iswindows: elif iswindows:
@ -466,7 +466,7 @@ class ITUNES(DriverBase):
} }
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(i+1/book_count, self.report_progress((i+1)/book_count,
_('%d of %d') % (i+1, book_count)) _('%d of %d') % (i+1, book_count))
self._purge_orphans(library_books, cached_books) self._purge_orphans(library_books, cached_books)
@ -916,6 +916,8 @@ class ITUNES(DriverBase):
""" """
if DEBUG: if DEBUG:
self.log.info("ITUNES.reset()") self.log.info("ITUNES.reset()")
if report_progress:
self.set_progress_reporter(report_progress)
def set_progress_reporter(self, report_progress): def set_progress_reporter(self, report_progress):
''' '''
@ -924,6 +926,9 @@ class ITUNES(DriverBase):
If it is called with -1 that means that the If it is called with -1 that means that the
task does not have any progress information task does not have any progress information
''' '''
if DEBUG:
self.log.info("ITUNES.set_progress_reporter()")
self.report_progress = report_progress self.report_progress = report_progress
def set_plugboards(self, plugboards, pb_func): def set_plugboards(self, plugboards, pb_func):
@ -1041,7 +1046,7 @@ class ITUNES(DriverBase):
# Report progress # Report progress
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(i+1/file_count, _('%d of %d') % (i+1, file_count)) self.report_progress((i+1)/file_count, _('%d of %d') % (i+1, file_count))
elif iswindows: elif iswindows:
try: try:
@ -1081,7 +1086,7 @@ class ITUNES(DriverBase):
# Report progress # Report progress
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(i+1/file_count, _('%d of %d') % (i+1, file_count)) self.report_progress((i+1)/file_count, _('%d of %d') % (i+1, file_count))
finally: finally:
pythoncom.CoUninitialize() pythoncom.CoUninitialize()
@ -3065,7 +3070,7 @@ class ITUNES_ASYNC(ITUNES):
} }
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(i+1/book_count, _('%d of %d') % (i+1, book_count)) self.report_progress((i+1)/book_count, _('%d of %d') % (i+1, book_count))
elif iswindows: elif iswindows:
try: try:
@ -3104,7 +3109,7 @@ class ITUNES_ASYNC(ITUNES):
} }
if self.report_progress is not None: if self.report_progress is not None:
self.report_progress(i+1/book_count, self.report_progress((i+1)/book_count,
_('%d of %d') % (i+1, book_count)) _('%d of %d') % (i+1, book_count))
finally: finally: