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

Two fixes:

Browse Source 
1) The CC modified date is UTC not local time.
2) Thread switching can trigger 10ms accept timeout. Make it longer.
This commit is contained in:
Charles Haley 2015-04-26 20:58:20 +02:00
parent 124d946cfb
commit a4ea59b83b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/devices/smart_device_app/driver.py
View File

@ -125,12 +125,12 @@ class ConnectionListener(Thread):
getattr(self.driver, 'listen_socket', None) is not None: getattr(self.driver, 'listen_socket', None) is not None:
ans = select.select((self.driver.listen_socket,), (), (), 0) ans = select.select((self.driver.listen_socket,), (), (), 0)
if len(ans[0]) > 0: if len(ans[0]) > 0:
# timeout in 10 ms to detect rare case where the socket goes # timeout in 100 ms to detect rare case where the socket goes
# away between the select and the accept # away between the select and the accept
try: try:
self.driver._debug('attempt to open device socket') self.driver._debug('attempt to open device socket')
device_socket = None device_socket = None
self.driver.listen_socket.settimeout(0.010) self.driver.listen_socket.settimeout(0.100)
device_socket, ign = eintr_retry_call( device_socket, ign = eintr_retry_call(
self.driver.listen_socket.accept) self.driver.listen_socket.accept)
set_socket_inherit(device_socket, False) set_socket_inherit(device_socket, False)
@ -1595,7 +1595,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
'for details')) 'for details'))
return (None, True) return (None, True)
cc_mtime = parse_date(book.get('_format_mtime_'), as_utc=False) cc_mtime = parse_date(book.get('_format_mtime_'), as_utc=True)
self._debug(book.title, 'cal_mtime', calibre_mtime, 'cc_mtime', cc_mtime) self._debug(book.title, 'cal_mtime', calibre_mtime, 'cc_mtime', cc_mtime)
if cc_mtime < calibre_mtime: if cc_mtime < calibre_mtime:
book.set('_format_mtime_', isoformat(self.now)) book.set('_format_mtime_', isoformat(self.now))