Skip to content

Commit

Permalink
Update version and licenses
Browse files Browse the repository at this point in the history
  • Loading branch information
owent committed Jul 3, 2023
1 parent 4370e97 commit 3f1a021
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 8 deletions.
18 changes: 18 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
更新记录
==========

1.4.1
------

1. 优化 `print_color` 模块的查找位置
2. 更新 `print_color` 模块
3. 修订老式命令行接口的错误码
4. 优化忽略规则
5. 修订重复的自定义参数的问题

1.4.0
------

1. 增加output_type的tag和class限定
2. 修订错误信息输出问题
3. 允许目录执行
4. 修订一处exception遗漏导致的错误输出不友好的问题
5. 允许指定 `JAVA_HOME` 环境变量

1.3.2
------

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2021 xresloader
Copyright (c) 2023 xresloader

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
14 changes: 7 additions & 7 deletions xresconv_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,6 @@ def load_list_item_nodes(lis):
item_cmd_args_array = []

# merge global options
item_cmd_args_map = global_cmd_args_map.copy()
if "type" in item_output and item_output["type"]:
item_cmd_args_map["-t"] = item_output["type"]
if "rename" in item_output and item_output["rename"]:
item_cmd_args_map["-n"] = '"{0}"'.format(item_output["rename"])
if "tags" in item_output and item_output["tags"]:
check_limit = False
for tag in item_output["tags"]:
Expand All @@ -459,13 +454,18 @@ def load_list_item_nodes(lis):
if not check_limit:
continue

item_cmd_args_map = global_cmd_args_map.copy()
if "type" in item_output and item_output["type"]:
item_cmd_args_map["-t"] = item_output["type"]
if "rename" in item_output and item_output["rename"]:
item_cmd_args_map["-n"] = '"{0}"'.format(item_output["rename"])

for key in item_cmd_args_map:
item_cmd_args_array.append(key)
item_cmd_args_array.append(item_cmd_args_map[key])

# add item options
item_cmd_args_array.extend(conv_item["options"])
if len(conv_item["options"]) > 0:
if conv_item["options"]:
item_cmd_args_array.extend(conv_item["options"])

# add item scheme
Expand Down

0 comments on commit 3f1a021

Please sign in to comment.