Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .validators/validator_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import argparse
parser = argparse.ArgumentParser()
parser.add_argument("-o", "--output-md", help="output new copy of udl-list.md", action="store_true")
parser.add_argument("-w", "--warn-on-mismatch", help="output warning if mismatch between internal name and display-name", action="store_true")
args = parser.parse_args()

api_url = os.environ.get('APPVEYOR_API_URL')
Expand Down Expand Up @@ -366,6 +367,10 @@ def parse(filename):
for udl in udlfile["UDLs"]:
print("- " + udl["display-name"])

# check for spaces in JSON id-name:
if " " in udl["id-name"]:
post_error(f'Found space in JSON "id-name": "{udl["id-name"]}": Must use alternative to space, like underscores, hyphens, periods, or CamelCase')

# false fail from PR #317 should have been caught by a github repo that wasn't using raw URL, but didn't
# so my other checks still weren't enough
if udl["repository"] != "" and "github.com" in udl["repository"]:
Expand Down Expand Up @@ -493,7 +498,7 @@ def parse(filename):
ac_link = udl_internal_name + ".xml"

# audit internal name vs display-name name: recommend to match
if udl_internal_name.casefold() != udl["display-name"].casefold():
if args.warn_on_mismatch and udl_internal_name.casefold() != udl["display-name"].casefold():
print(f' ! WARNING: XML:<UserLang name="{udl_internal_name}"> is different than JSON:{{"display-name": "{udl["display-name"]}"}}: CONTRIBUTING.md recommends those two should match if possible')

# audit internal name vs autoCompletion text name: MUST match
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions udl-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@
"autoCompletionAuthor": "generate_ac.py"
},
{
"id-name": "eCon Studio_byMichaelSzabo",
"id-name": "eConStudio_byMichaelSzabo",
"display-name": "eConScript",
"version": "20260211",
"repository": "",
Expand Down Expand Up @@ -3032,7 +3032,7 @@
"autoCompletionAuthor": "generate_ac.py"
},
{
"id-name": "SBI Mapper",
"id-name": "SBI_Mapper_Light_Mode",
"display-name": "IBM SBI Mapper Extended Rules",
"sample": "IBM_SBI_mapper_example.txt",
"version": "20240527",
Expand All @@ -3043,7 +3043,7 @@
"autoCompletionAuthor": "generate_ac.py"
},
{
"id-name": "SBI Mapper (Dark Mode)",
"id-name": "SBI_Mapper_Dark_Mode",
"display-name": "IBM SBI Mapper Extended Rules (Dark Mode)",
"version": "20240527",
"sample": "IBM_SBI_mapper_example.txt",
Expand Down
6 changes: 3 additions & 3 deletions udl-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
| [DSTV](./UDLs/NC-DSTV_NC1_byJeffMiller.xml) | [Jeff Miller](https://github.com/jmiller-pwi) | NC-DSTV (NC1) |
| [EASI](./UDLs/Geomatica_EASI_byPhilippeCote.xml) | [Philippe Côté](mailto:philippe.cote@effigis.com) | EASI |
| [Easytrieve Plus](./UDLs/EasytrievePlus_byThomasAglassinger.xml) | [thomas.aglassinger](mailto:thomas.aglassinger@rrz.at) | Easytrieve Plus |
| [eConScript](./UDLs/eCon%20Studio_byMichaelSzabo.xml) | maurus69 | eConScript (eCon Studio) |
| [eConScript](./UDLs/eConStudio_byMichaelSzabo.xml) | maurus69 | eConScript (eCon Studio) |
| [EisenScript](./UDLs/EisenScript_bySygwindFeamir.xml) | [Sygwind Feamir](mailto:sygwind@gmail.com) | EisenScript |
| [Elf](./UDLs/Elf_byMarkkobo.xml) | [Markkobo](mailto:Markkobo@users.sourceforge.net) | Elf |
| [Email header](./UDLs/Emailheader_byPeterFisk.xml) | [PeterFisk](mailto:peter.fiskerstrand@gmail.com) | |
Expand Down Expand Up @@ -161,8 +161,8 @@
| [HSpice](./UDLs/HSpice_by-sahjakjebndmns.xml) | [sahjakjebndmns](mailto:sahjakjebndmns@users.sourceforge.net) | HSpice |
| [Htaccess](./UDLs/Htaccess_bySilasBrill.xml) | [Silas Brill](mailto:brilliand@gmail.com) | Htaccess |
| [IBM Net.Data](./UDLs/Net.Data-IBM_byMarkus.xml) | [Markus](mailto:die_scholl@yahoo.com) | IBM Net.Data |
| [IBM SBI Mapper Extended Rules](./UDLs/SBI%20Mapper.xml) | Mayot | IBM Sterling B2B Integrator Mapper for Extended Rules |
| [IBM SBI Mapper Extended Rules (Dark Mode)](./UDLs/SBI%20Mapper%20%28Dark%20Mode%29.xml) | Mayot | IBM Sterling B2B Integrator Mapper for Extended Rules (Dark Mode) |
| [IBM SBI Mapper Extended Rules](./UDLs/SBI_Mapper_Light_Mode.xml) | Mayot | IBM Sterling B2B Integrator Mapper for Extended Rules |
| [IBM SBI Mapper Extended Rules (Dark Mode)](./UDLs/SBI_Mapper_Dark_Mode.xml) | Mayot | IBM Sterling B2B Integrator Mapper for Extended Rules (Dark Mode) |
| [iCalendar](./UDLs/iCalendar_by-jfreundo.xml) | [jfreundo](mailto:jfreundo@users.sourceforge.net) | iCalendar |
| [IceBreak RPG](./UDLs/IceBreak-RPG_byNielsLiisberg.xml) | [Niels Liisberg](mailto:nli@system-method.com) | IceBreak RPG |
| [Icinga DSL](./UDLs/Icinga_DSL_by_robweber.xml) | [robweber](https://github.com/robweber) | Icinga DSL for use with Icinga2 monitoring solution |
Expand Down