Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-01-04 23:27:44 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Kovid Goyal 2014-12-23 08:50:49 +05:30
commit fb178cbdd1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/calibre/devices/smart_device_app/driver.py
View file

@ -422,8 +422,9 @@ def _create_upload_path(self, mdata, fname, create_dirs=True):
except:
pass
dotless_ext = ext[1:] if len(ext) > 0 else ext
maxlen = (self.MAX_PATH_LEN - (self.PATH_FUDGE_FACTOR +
self.exts_path_lengths.get(ext, self.PATH_FUDGE_FACTOR)))
self.exts_path_lengths.get(dotless_ext, self.PATH_FUDGE_FACTOR)))
special_tag = None
if mdata.tags:
@ -491,6 +492,9 @@ def remove_trailing_periods(x):
extra_components = list(map(remove_trailing_periods, extra_components))
components = shorten_components_to(maxlen, extra_components)
filepath = posixpath.join(*components)
self._debug('lengths', dotless_ext, maxlen,
self.exts_path_lengths.get(dotless_ext, self.PATH_FUDGE_FACTOR),
len(filepath))
return filepath
def _strip_prefix(self, path):