Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug #1919128: Template: Sometimes returns device name after eject.

Browse Source 
The bug seems limited to fetching device information during processing of device.DeviceSignals.device_connection_changed(False)
This commit is contained in:
Charles Haley 2021-03-15 12:41:01 +00:00
parent 1913e39321
commit cb15c57844
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,7 @@ class DeviceManager(Thread): # {{{
self.unmanaged_devices = [x for x in self.devices if self.unmanaged_devices = [x for x in self.devices if
x.MANAGES_DEVICE_PRESENCE] x.MANAGES_DEVICE_PRESENCE]
self.sleep_time = sleep_time self.sleep_time = sleep_time
self.connected_slot = connected_slot self.connected_slot = connected_slot # see DeviceMixin.device_connected()
self.allow_connect_slot = allow_connect_slot self.allow_connect_slot = allow_connect_slot
self.jobs = queue.Queue(0) self.jobs = queue.Queue(0)
self.job_steps = queue.Queue(0) self.job_steps = queue.Queue(0)
@ -250,8 +250,9 @@ class DeviceManager(Thread): # {{{
pass pass
if self.connected_device in self.ejected_devices: if self.connected_device in self.ejected_devices:
self.ejected_devices.remove(self.connected_device) self.ejected_devices.remove(self.connected_device)
call_connected_slot = False
else: else:
self.connected_slot(False, self.connected_device_kind) call_connected_slot = True
if self.call_shutdown_on_disconnect: if self.call_shutdown_on_disconnect:
# The current device is an instance of a plugin class instantiated # The current device is an instance of a plugin class instantiated
# to handle this connection, probably as a mounted device. We are # to handle this connection, probably as a mounted device. We are
@ -263,6 +264,8 @@ class DeviceManager(Thread): # {{{
device_prefs.set_overrides() device_prefs.set_overrides()
self.connected_device = currently_connected_device._device = None self.connected_device = currently_connected_device._device = None
self._device_information = None self._device_information = None
if call_connected_slot:
self.connected_slot(False, None)
def detect_device(self): def detect_device(self):
self.scanner.scan() self.scanner.scan()
@ -877,7 +880,9 @@ class DeviceSignals(QObject): # {{{
#: This signal is emitted once when the device is detected and once when #: This signal is emitted once when the device is detected and once when
#: it is disconnected. If the parameter is True, then it is a connection, #: it is disconnected. If the parameter is True, then it is a connection,
#: otherwise a disconnection. #: otherwise a disconnection. Device information is not available in either
# case. If you need device information when connecting then use the
# device_metadata_available signal.
device_connection_changed = pyqtSignal(object) device_connection_changed = pyqtSignal(object)
@ -1069,6 +1074,8 @@ class DeviceMixin(object): # {{{
def device_detected(self, connected, device_kind): def device_detected(self, connected, device_kind):
''' '''
Called when a device is connected to the computer. Called when a device is connected to the computer.
If connected is False then device_kind is None.
''' '''
# This can happen as this function is called in a queued connection and # This can happen as this function is called in a queued connection and
# the user could have yanked the device in the meantime # the user could have yanked the device in the meantime