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

More graceful report for unnamed MTP devices

Browse Source
This commit is contained in:
Kovid Goyal 2017-03-20 20:35:25 +05:30
parent 6bbcdf6bc0
commit 8fadf72388
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/calibre/devices/mtp/unix/driver.py
View File

@ -228,13 +228,14 @@ class MTP_DEVICE(MTPDeviceBase):
# the user to allow access. Apparently what happens is # the user to allow access. Apparently what happens is
# that when the user clicks allow, the device disconnects # that when the user clicks allow, the device disconnects
# and re-connects as a new device. # and re-connects as a new device.
raise OpenActionNeeded(self.dev.friendly_name, _( name = self.dev.friendly_name or connected_device.manufacturer or _('Unnamed device')
raise OpenActionNeeded(name, _(
'The device {0} is not allowing connections.' 'The device {0} is not allowing connections.'
' Unlock the screen on the {0}, tap "Allow" on any connection popup message you see,' ' Unlock the screen on the {0}, tap "Allow" on any connection popup message you see,'
' then either wait a minute or restart calibre. You might' ' then either wait a minute or restart calibre. You might'
' also have to change the mode of the USB connection on the {0}' ' also have to change the mode of the USB connection on the {0}'
' to "Media Transfer mode (MTP)" or similar.' ' to "Media Transfer mode (MTP)" or similar.'
).format(self.dev.friendly_name), (self.dev.friendly_name, self.dev.serial_number)) ).format(name), (name, self.dev.serial_number))
raise raise
storage = [x for x in storage if x.get('rw', False)] storage = [x for x in storage if x.get('rw', False)]