OMGeeky/andors-trail-utils
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail-utils.git synced 2025-12-27 06:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve regex replace

Browse Source
This commit is contained in:
OMGeeky
2024-09-12 22:21:28 +02:00
parent ced28ef9ea
commit ba8f938bd6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
at_remove_duplicate_tilesets/remove_duplicate_tileset_usages.py
View File

@@ -34,7 +34,7 @@ def remove_tileset_with_regex(content, tileset_name, tileset_first_gid):
first_gid = tileset_first_gid
name = tileset_name
modified = re.sub(
f' <[^<]*firstgid="{first_gid}"[^<]*({name})[\\S\\s]*?</tileset>\\r?\\n',
f'<[^<]*firstgid="{first_gid}"[^<]*({name})[\\S\\s]*?</tileset>\\s*',
"",
content,
1,

5
at_remove_duplicate_tilesets/test_remove_duplicate_tileset_usages.py
View File

@@ -437,7 +437,7 @@ expected_output = """
<tileset firstgid="8069" name="map_brightport" tilewidth="32" tileheight="32" tilecount="112" columns="16">
<image source="../drawable/map_brightport.png" width="512" height="224"/>
</tileset>
<tileset firstgid="8309" name="map_tree_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
<tileset firstgid="8309" name="map_tree_3" tilewidth="32" tileheight="32" tilecount="544" columns="32">
<image source="../drawable/map_tree_3.png" width="1024" height="544"/>
</tileset>
<tileset firstgid="8853" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
@@ -485,6 +485,9 @@ class Test(TestCase):
<image source="../drawable/map_tree_1.png" width="512" height="256"/>
</tileset>"""
response = remove_tileset_with_regex(sample_input, "map_tree_1", 8181)
if response != expected_output:
print(response)
self.assertEqual(
response, expected_output, "removed stuff was not what we expected"
)