Strip accents before simplifying string
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
from couchpotato.core.logger import CPLog
|
from couchpotato.core.logger import CPLog
|
||||||
from string import ascii_letters, digits
|
from string import ascii_letters, digits
|
||||||
import os
|
|
||||||
import re
|
import re
|
||||||
import unicodedata
|
import unicodedata
|
||||||
|
|
||||||
@@ -12,9 +11,9 @@ def toSafeString(original):
|
|||||||
cleanedFilename = unicodedata.normalize('NFKD', toUnicode(original)).encode('ASCII', 'ignore')
|
cleanedFilename = unicodedata.normalize('NFKD', toUnicode(original)).encode('ASCII', 'ignore')
|
||||||
return ''.join(c for c in cleanedFilename if c in valid_chars)
|
return ''.join(c for c in cleanedFilename if c in valid_chars)
|
||||||
|
|
||||||
|
|
||||||
def simplifyString(original):
|
def simplifyString(original):
|
||||||
string = toSafeString(' '.join(re.split('\W+', original.lower())))
|
string = stripAccents(original.lower())
|
||||||
|
string = toSafeString(' '.join(re.split('\W+', string)))
|
||||||
split = re.split('\W+', string.lower())
|
split = re.split('\W+', string.lower())
|
||||||
return toUnicode(' '.join(split))
|
return toUnicode(' '.join(split))
|
||||||
|
|
||||||
@@ -45,3 +44,6 @@ def isInt(value):
|
|||||||
return True
|
return True
|
||||||
except ValueError:
|
except ValueError:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
def stripAccents(s):
|
||||||
|
return ''.join((c for c in unicodedata.normalize('NFD', s) if unicodedata.category(c) != 'Mn'))
|
||||||
|
|||||||
Reference in New Issue
Block a user