Skip to content

Commit 22110ad

Browse files
committed
version: 0.6.8
1 parent 9d9ffee commit 22110ad

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
setuptools.setup(
3535
name="admin_scripts",
36-
version="0.6.7",
36+
version="0.6.8",
3737
author="Hive Solutions Lda.",
3838
author_email="development@hive.pt",
3939
description="Administration Scripts",

src/admin_scripts/base/join.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,17 @@ def join_files(file_path):
100100
# sets the default target directories
101101
target_directories = (".",)
102102

103+
# in case theres an order defined, uses the order to iterate
104+
# over the files, otherwise uses the default iteration
105+
if "$order" in files_map:
106+
order = files_map.pop("$order")
107+
files_entries = [(file_key, files_map[file_key]) for file_key in order]
108+
else:
109+
files_entries = files_map.items()
110+
103111
# iterates over all the files (composition of joined files)
104-
# from the files map
105-
for file_key, file_value in files_map.items():
112+
# from the files map, respects `$order` if defined
113+
for file_key, file_value in files_entries:
106114
# creates the string buffer for temporary
107115
# file holding, this is bytes based
108116
string_buffer = legacy.BytesIO()

0 commit comments

Comments
 (0)