From ff681adfe9e92f8f139347499c35783ed47160a4 Mon Sep 17 00:00:00 2001 From: HelloZeroNet Date: Fri, 18 Mar 2016 23:52:16 +0100 Subject: [PATCH] Fix file merge order on Linux --- src/Debug/DebugMedia.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Debug/DebugMedia.py b/src/Debug/DebugMedia.py index 27256d09..9440166a 100644 --- a/src/Debug/DebugMedia.py +++ b/src/Debug/DebugMedia.py @@ -10,7 +10,17 @@ from util import helper # Find files with extension in path def findfiles(path, find_ext): - for root, dirs, files in os.walk(path, topdown=False): + def sorter(f1, f2): + f1 = f1[0].replace(path, "") + f2 = f2[0].replace(path, "") + if f1 == "": + return 1 + elif f2 == "": + return -1 + else: + return cmp(f1, f2) + + for root, dirs, files in sorted(os.walk(path, topdown=False), cmp=sorter): for file in sorted(files): file_path = root + "/" + file file_ext = file.split(".")[-1]