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

Merge branch 'patch-2' of https://github.com/zazaho/calibre-1

Browse Source
This commit is contained in:
Kovid Goyal 2019-09-25 06:08:01 +05:30
commit ac6271d4c0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ from calibre.constants import plugins, islinux, isosx, ispy3
from calibre.ptempfile import SpooledTemporaryFile from calibre.ptempfile import SpooledTemporaryFile
from calibre.devices.errors import OpenFailed, DeviceError, BlacklistedDevice, OpenActionNeeded from calibre.devices.errors import OpenFailed, DeviceError, BlacklistedDevice, OpenActionNeeded
from calibre.devices.mtp.base import MTPDeviceBase, synchronous, debug from calibre.devices.mtp.base import MTPDeviceBase, synchronous, debug
from polyglot.builtins import unicode_type from polyglot.builtins import unicode_type, as_bytes
MTPDevice = namedtuple('MTPDevice', 'busnum devnum vendor_id product_id ' MTPDevice = namedtuple('MTPDevice', 'busnum devnum vendor_id product_id '
'bcd serial manufacturer product') 'bcd serial manufacturer product')
@ -396,10 +396,10 @@ class MTP_DEVICE(MTPDeviceBase):
raise ValueError('Cannot upload file %s, it already exists'%( raise ValueError('Cannot upload file %s, it already exists'%(
e.full_path,)) e.full_path,))
self.delete_file_or_folder(e) self.delete_file_or_folder(e)
ename = name.encode('utf-8') if isinstance(name, unicode_type) else name
sid, pid = parent.storage_id, parent.object_id sid, pid = parent.storage_id, parent.object_id
if pid == sid: if pid == sid:
pid = 0xFFFFFFFF pid = 0xFFFFFFFF
ename = name if ispy3 else as_bytes(name)
ans, errs = self.dev.put_file(sid, pid, ename, stream, size, callback) ans, errs = self.dev.put_file(sid, pid, ename, stream, size, callback)
if ans is None: if ans is None: