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 #2109455 [smartdevice automatic disconnect has a few disconnect problems](https://bugs.launchpad.net/calibre/+bug/2109455)

Browse Source
This commit is contained in:
Kovid Goyal 2025-04-30 11:04:25 +05:30
parent 6f79154dbc
commit bc449963f7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
SEND_NOOP_EVERY_NTH_PROBE = 5 SEND_NOOP_EVERY_NTH_PROBE = 5
DISCONNECT_AFTER_N_SECONDS = 30*60 # 30 minutes DISCONNECT_AFTER_N_SECONDS = 30*60 # 30 minutes
PURGE_CACHE_ENTRIES_DAYS = 30 PURGE_CACHE_ENTRIES_DAYS = 30
CURRENT_CC_VERSION = 128 CURRENT_CC_VERSION = 128
@ -387,6 +386,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
def __init__(self, path): def __init__(self, path):
self.sync_lock = threading.RLock() self.sync_lock = threading.RLock()
self.noop_counter = 0 self.noop_counter = 0
self.noop_time = time.monotonic()
self.debug_start_time = time.time() self.debug_start_time = time.time()
self.debug_time = time.time() self.debug_time = time.time()
self.is_connected = False self.is_connected = False
@ -631,6 +631,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
def _call_client(self, op, arg, print_debug_info=True, wait_for_response=True): def _call_client(self, op, arg, print_debug_info=True, wait_for_response=True):
if op != 'NOOP': if op != 'NOOP':
self.noop_counter = 0 self.noop_counter = 0
self.noop_time = time.monotonic()
extra_debug = self.settings().extra_customization[self.OPT_EXTRA_DEBUG] extra_debug = self.settings().extra_customization[self.OPT_EXTRA_DEBUG]
if print_debug_info or extra_debug: if print_debug_info or extra_debug:
if extra_debug: if extra_debug:
@ -960,7 +961,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
if getattr(self, 'listen_socket', None) is None: if getattr(self, 'listen_socket', None) is None:
self.is_connected = False self.is_connected = False
if self.is_connected: if self.is_connected:
self.noop_counter += 1 self.noop_counter = int(time.monotonic()) - int(self.noop_time)
if (self.noop_counter > self.SEND_NOOP_EVERY_NTH_PROBE and if (self.noop_counter > self.SEND_NOOP_EVERY_NTH_PROBE and
(self.noop_counter % self.SEND_NOOP_EVERY_NTH_PROBE) != 1): (self.noop_counter % self.SEND_NOOP_EVERY_NTH_PROBE) != 1):
try: try:
@ -975,7 +976,8 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
pass pass
if (self.settings().extra_customization[self.OPT_AUTODISCONNECT] and if (self.settings().extra_customization[self.OPT_AUTODISCONNECT] and
self.noop_counter > self.DISCONNECT_AFTER_N_SECONDS): self.noop_counter > self.DISCONNECT_AFTER_N_SECONDS):
self._close_device_socket() # eject so we also tell the device to disconnect when we close the socket
self.eject()
self._debug('timeout -- disconnected') self._debug('timeout -- disconnected')
else: else:
try: try: