use first latin character if possible
This commit is contained in:
parent
2711fbb0c1
commit
ea0277348b
1 changed files with 4 additions and 2 deletions
|
@ -528,7 +528,8 @@ class File(db.Model):
|
||||||
author = format_underscores(author)
|
author = format_underscores(author)
|
||||||
|
|
||||||
filename = '%s.%s' % (title, extension)
|
filename = '%s.%s' % (title, extension)
|
||||||
new_path = os.path.join(author[0].upper(), author, filename)
|
first = unicodedata.normalize('NFD', author[0].upper())[0].upper()
|
||||||
|
new_path = os.path.join(first, author, filename)
|
||||||
new_path = new_path.replace('\x00', '')
|
new_path = new_path.replace('\x00', '')
|
||||||
if self.path == new_path:
|
if self.path == new_path:
|
||||||
return
|
return
|
||||||
|
@ -536,7 +537,8 @@ class File(db.Model):
|
||||||
while os.path.exists(os.path.join(prefix, new_path)):
|
while os.path.exists(os.path.join(prefix, new_path)):
|
||||||
h = self.sha1[:len(h)+1]
|
h = self.sha1[:len(h)+1]
|
||||||
filename = '%s.%s.%s' % (title, h, extension)
|
filename = '%s.%s.%s' % (title, h, extension)
|
||||||
new_path = os.path.join(author[0].upper(), author, filename)
|
first = unicodedata.normalize('NFD', author[0].upper())[0].upper()
|
||||||
|
new_path = os.path.join(first, author, filename)
|
||||||
if current_path == os.path.join(prefix, new_path):
|
if current_path == os.path.join(prefix, new_path):
|
||||||
break
|
break
|
||||||
if self.path != new_path:
|
if self.path != new_path:
|
||||||
|
|
Loading…
Reference in a new issue