chatterino2
Code Issues

sort paths in Resources to eliminate merge conflicts

Browse Source
This commit is contained in:
fourtf
2019-09-02 18:53:08 +02:00
parent 661a36c2e4
commit 234cdb041b
4 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/generate_resources.py
+4 -4
View File
@@ -18,10 +18,10 @@ def isNotIgnored(file):
return file.as_posix() not in ignored_files
all_files = list(filter(isNotIgnored, \
filter(Path.is_file, Path('.').glob('**/*'))))
image_files = list(filter(isNotIgnored, \
filter(Path.is_file, Path('.').glob('**/*.png'))))
all_files = sorted(list(filter(isNotIgnored, \
filter(Path.is_file, Path('.').glob('**/*')))))
image_files = sorted(list(filter(isNotIgnored, \
filter(Path.is_file, Path('.').glob('**/*.png')))))
with open('./resources_autogenerated.qrc', 'w') as out:
out.write(resources_header)