- path = '/'.join([name] + file['path'])
- if charset and encoding and (charset != encoding):
- path = path.decode(encoding, 'replace').encode(charset, 'replace')
+ if 'path.utf-8' in file:
+ if name_utf8:
+ path = '/'.join([name_utf8] + file['path.utf-8'])
+ if charset and (charset != 'utf-8'):
+ path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+ else:
+ _name_utf8 = name
+ if encoding and (encoding != 'utf-8'):
+ _name_utf8 = _name_utf8.decode(encoding, 'replace').encode('utf-8', 'replace')
+ path = '/'.join([_name_utf8] + file['path.utf-8'])
+ if charset and (charset != 'utf-8'):
+ path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+ else:
+ if name_utf8:
+ path = file['path']
+ if encoding and (encoding != 'utf-8'):
+ path = path.decode(encoding, 'replace').encode('utf-8', 'replace')
+ path = '/'.join([name_utf8] + path)
+ if charset and (charset != 'utf-8'):
+ path = path.decode('utf-8', 'replace').encode(charset, 'replace')
+ else:
+ path = '/'.join([name] + file['path'])
+ if charset and encoding and (charset != encoding):
+ path = path.decode(encoding, 'replace').encode(charset, 'replace')