Skip to content

Commit 616a102

Browse files
committed
Fixes
1 parent a7b790f commit 616a102

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.map
22
venv
33
*.pyc
4+
*_patch.py

patch_gen.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"""
1111

1212
import sys
13+
import os
1314
import numpy
1415
import re
1516
import twmap
@@ -66,11 +67,18 @@ def gen_py_patch(base_map_file, diff_map_file):
6667
"""
6768
base_map = twmap.Map(base_map_file)
6869
diff_map = twmap.Map(diff_map_file)
69-
# os.path.splitext(os.path.basename('foo/bar/baz.txt'))[0]
70+
mapname = os.path.splitext(os.path.basename(base_map_file))[0]
71+
mapname = re.sub(r'[^a-zA-Z_]', '', mapname)
72+
diffname = os.path.splitext(os.path.basename(diff_map_file))[0]
73+
diffname = re.sub(r'[^a-zA-Z_]', '', diffname)
74+
if diffname.startswith(f"{mapname}_"):
75+
diffname = diffname[(len(mapname) + 1):]
76+
elif diffname.startswith(mapname):
77+
diffname = diffname[len(mapname):]
7078
patches = []
71-
patches.append('#/usr/bin/env python3')
79+
patches.append('#!/usr/bin/env python3')
7280
patches.append('import twmap')
73-
patches.append("in_map = twmap.Map('in.map')")
81+
patches.append(f"in_map = twmap.Map('{mapname}.map')")
7482

7583
group_index = -1
7684
for group in base_map.groups:
@@ -91,9 +99,9 @@ def gen_py_patch(base_map_file, diff_map_file):
9199
f"groups[{group_index}].layers[{layer_index}]",
92100
f"{group.name}_{layer.name}")
93101

94-
patches.append("in_map.save('out.map')")
102+
patches.append(f"in_map.save('{mapname}.map')")
95103

96-
with open('patch.py', 'w') as patch:
104+
with open(f"{mapname}_{diffname}_patch.py", 'w') as patch:
97105
patch.write("\n".join(patches) + "\n")
98106

99107
if len(sys.argv) != 3:
@@ -103,4 +111,3 @@ def gen_py_patch(base_map_file, diff_map_file):
103111
base_map_file = sys.argv[1]
104112
diff_map_file = sys.argv[2]
105113
gen_py_patch(base_map_file, diff_map_file)
106-

0 commit comments

Comments
 (0)