Merge pull request #1652 from ims21/master

Fix crash in Movies on subdirectories with national chars in name

Author: ims21

plugin/controllers/models/movies.py

@@ -26,6 +26,7 @@
 import six
 from time import localtime, time
 from six.moves.urllib.parse import unquote
+import re
 
 from enigma import eServiceReference, iServiceInformation, eServiceCenter
 from ServiceReference import ServiceReference
@@ -111,6 +112,11 @@ def getMovieList(rargs=None, locations=None):
 	internal = None
 	bookmarklist = []
 
+	if b'dirname' in rargs:
+		decoded_str = rargs[b'dirname'][0].decode('latin-1')
+		decoded_str = re.sub(r'%u([0-9A-Fa-f]{4})', lambda m: chr(int(m.group(1), 16)), decoded_str)
+		rargs[b'dirname'][0] = decoded_str.encode('utf-8')
+
 	if rargs:
 		tag = getUrlArg2(rargs, "tag")
 		directory = getUrlArg2(rargs, "dirname")