From 3445ab68c31ebd14ef0ea6953dfb00111d43bb1f Mon Sep 17 00:00:00 2001 From: Christian Martinsson Date: Sun, 19 Jun 2022 14:15:10 +0200 Subject: [PATCH] Added support for a main default branch --- get_app_data.py | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/get_app_data.py b/get_app_data.py index 943b588..3960b08 100755 --- a/get_app_data.py +++ b/get_app_data.py @@ -7,12 +7,20 @@ apps = {"broadlink": "68", "zwave": "60", "huee": "62", "webapp": "59", "yeeligh headers = {"PRIVATE-TOKEN": sys.argv[1]} def get_data(id_number): - commit = requests.get('https://git.cmtec.se/api/v4/projects/' + id_number + '/repository/commits/master', headers=headers) - date = commit.json()["committed_date"] - name = commit.json()["committer_name"] - email = commit.json()["committer_email"] - readme = requests.get('https://git.cmtec.se/api/v4/projects/' + id_number + '/repository/files/README.md/raw?ref=master', headers=headers).text - changelog = requests.get('https://git.cmtec.se/api/v4/projects/' + id_number + '/repository/files/CHANGELOG.md/raw?ref=master', headers=headers).text + branch_name = "main" + commit = requests.get(f'https://git.cmtec.se/api/v4/projects/{id_number}/repository/commits/{branch_name}', headers=headers).json() + + # Backwards compatibility for old branch default name (master) + message = commit.get("message", "") + if message == "404 Commit Not Found": + branch_name = "master" + commit = requests.get(f'https://git.cmtec.se/api/v4/projects/{id_number}/repository/commits/{branch_name}', headers=headers).json() + + date = commit.get("committed_date") + name = commit.get("committer_name") + email = commit.get("committer_email") + readme = requests.get(f'https://git.cmtec.se/api/v4/projects/{id_number}/repository/files/README.md/raw?ref={branch_name}', headers=headers).text + changelog = requests.get(f'https://git.cmtec.se/api/v4/projects/{id_number}/repository/files/CHANGELOG.md/raw?ref={branch_name}', headers=headers).text return (date, name, email, readme, changelog) @@ -27,20 +35,20 @@ def create_files(path, readme, changelog): # LibHAASP date,name,email,readme,changelog = get_data("64") -meta_readme = '+++\ntitle = "libHAASP"\nhead = ""\nweight = 5\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' -meta_changelog = '+++\ntitle = "Changelog"\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' +meta_readme = f'+++\ntitle = "libHAASP"\nhead = ""\nweight = 5\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' +meta_changelog = f'+++\ntitle = "Changelog"\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' create_files("libhaasp", meta_readme + readme, meta_changelog + changelog) # Core date,name,email,readme,changelog = get_data("58") -meta_readme = '+++\ntitle = "Core"\nweight = 6\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' -meta_changelog = '+++\ntitle = "Changelog"\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' +meta_readme = f'+++\ntitle = "Core"\nweight = 6\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' +meta_changelog = f'+++\ntitle = "Changelog"\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' create_files("core", meta_readme + readme, meta_changelog + changelog) # CLI date,name,email,readme,changelog = get_data("69") -meta_readme = '+++\ntitle = "CLI"\nweight = 7\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' -meta_changelog = '+++\ntitle = "Changelog"\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' +meta_readme = f'+++\ntitle = "CLI"\nweight = 7\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' +meta_changelog = f'+++\ntitle = "Changelog"\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' create_files("cli", meta_readme + readme, meta_changelog + changelog) # Applications @@ -48,10 +56,10 @@ weight = 10 for app in sorted(apps.keys()): date,name,email,readme,changelog = get_data(apps[app]) if weight == 10: - meta_readme = '+++\nweight = "' + str(weight) + '"\nhead = ""\ntitle = "' + app[0].upper() + app[1:] + '"\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' + meta_readme = f'+++\nweight = "{str(weight)}"\nhead = ""\ntitle = "{app[0].upper()}{app[1:]}"\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' else: - meta_readme = '+++\nweight = "' + str(weight) + '"\ntitle = "' + app[0].upper() + app[1:] + '"\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' - meta_changelog = '+++\ntitle = "Changelog"\ndate = "' + date + '"\nlastmodifierdisplayname = "' + name + '"\nlastmodifieremail = "' + email + '"\n+++\n' + meta_readme = f'+++\nweight = "{str(weight)}"\ntitle = "{app[0].upper()}{app[1:]}"\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' + meta_changelog = f'+++\ntitle = "Changelog"\ndate = "{date}"\nlastmodifierdisplayname = "{name}"\nlastmodifieremail = "{email}"\n+++\n' create_files(app, meta_readme + readme, meta_changelog + changelog) weight = weight + 1