From bbb5b0b2d931fc457e093b0d7d4b48f89e481dea Mon Sep 17 00:00:00 2001 From: Stefan Riesenberger Date: Tue, 29 Nov 2022 13:47:25 +0100 Subject: [PATCH] [tools] add tag message and small refactor --- gen_png.py | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/gen_png.py b/gen_png.py index 585f70e..249b55c 100755 --- a/gen_png.py +++ b/gen_png.py @@ -74,15 +74,28 @@ def git_commit_raster(): print_pipe(stream.read()) # create a new tag -def create_tag(): +def create_tag(added, modified, deleted, renamed_old, renamed_new): """Creates a new git tag and names it appropriately""" # get tags stream = os.popen('git tag -l "auto-v*"') output = stream.read() tags = output.split('\n') tags.remove('') + # create tag message + added = '\n'.join([x.removeprefix('svg/').removesuffix('.svg') for x in added]) + modified = '\n'.join([x.removeprefix('svg/').removesuffix('.svg') for x in modified]) + deleted = '\n'.join([x.removeprefix('svg/').removesuffix('.svg') for x in deleted]) + + i = 0 + renamed = '' + while i < len(renamed_old): + old = renamed_old[i].removeprefix('svg/').removesuffix('.svg') + new = renamed_new[i].removeprefix('svg/').removesuffix('.svg') + renamed = f'{renamed}\n{old} -> {new}' + i+=1 + message = f'**New:**\n{added}\n\n**Updated:**\n{modified}\n\n**Renamed:**{renamed}\n\n**Removed:**\n{deleted}' # create new tag - stream = os.popen(f"git tag auto-v{len(tags)}") + stream = os.popen(f"git tag auto-v{len(tags)} -m '{message}'") print_pipe(stream.read()) # -------------------------------# @@ -135,7 +148,8 @@ def main(): additions = list() modifications = list() deleted = list() - renamed = list() + renamed_old = list() + renamed_new = list() for s in reversed(files): split_file = s.split('\t') if 'A' == split_file[0]: @@ -145,8 +159,8 @@ def main(): elif 'D' == split_file[0]: deleted.append(split_file[1].removeprefix('svg/').removesuffix('.svg')) elif re.match(r"R[0-9]+", split_file[0]): - deleted.append(split_file[1].removeprefix('svg/').removesuffix('.svg')) - modifications.append(split_file[2]) + renamed_old.append(split_file[1].removeprefix('svg/').removesuffix('.svg')) + renamed_new.append(split_file[2]) else: print(f'Unrecognized git action: {split_file}') sys.exit(1) @@ -154,8 +168,15 @@ def main(): # print('A:' + str(additions)) # print('M:' + str(modifications)) # print('D:' + str(deleted)) -# print('R[0-9]+:' + str(renamed)) +# print(renamed_old) +# print(renamed_new) + print('\nRenamed:') + delete_graphics(renamed_old) + raster_graphics(renamed_new) + git_add_raster(renamed_old) + git_add_raster(renamed_new) + print('\nDeletions:') delete_graphics(deleted) git_add_raster(deleted) print('\nAdditions:') @@ -167,7 +188,7 @@ def main(): # commit and tag git_commit_raster() - create_tag() + create_tag(additions, modifications, deleted, renamed_old, renamed_new) # if "all" parameter was specified, raster all svgs including subfolders if args.all: files = list(glob.glob('svg/**/*.svg', recursive=True))