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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2014-12-04 18:28:57 +05:30
commit 7523c6b99b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,11 +86,12 @@ class ConnectionListener(Thread):
if not self.driver.connection_queue.empty(): if not self.driver.connection_queue.empty():
d = currently_connected_device.device d = currently_connected_device.device
if d is not None: if d is not None:
self.driver._debug('queue not serviced', d.__class__.__name__) self.driver._debug('queue not serviced', d.get_gui_name())
try: try:
sock = self.driver.connection_queue.get_nowait() sock = self.driver.connection_queue.get_nowait()
s = self.driver._json_encode( s = self.driver._json_encode(
self.driver.opcodes['CALIBRE_BUSY'], {}) self.driver.opcodes['CALIBRE_BUSY'],
{'otherDevice': d.get_gui_name()})
self.driver._send_byte_string(device_socket, (b'%d' % len(s)) + s) self.driver._send_byte_string(device_socket, (b'%d' % len(s)) + s)
sock.close() sock.close()
except Queue.Empty: except Queue.Empty:
@ -221,7 +222,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
PURGE_CACHE_ENTRIES_DAYS = 30 PURGE_CACHE_ENTRIES_DAYS = 30
CURRENT_CC_VERSION = 77 CURRENT_CC_VERSION = 128
ZEROCONF_CLIENT_STRING = b'calibre wireless device client' ZEROCONF_CLIENT_STRING = b'calibre wireless device client'