ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

More checks

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-02-19 17:39:16 +01:00
parent dcfac434e2
commit 55f9ee605f
2 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Models/ThemeConfig/Conversion/FixImages.ts
View file

@ -19,7 +19,7 @@ export class ExtractImages extends Conversion<LayoutConfigJson, string[]> {
} }
convert(json: LayoutConfigJson, context: string): { result: string[], errors: string[], warnings: string[] } { convert(json: LayoutConfigJson, context: string): { result: string[], errors: string[], warnings: string[] } {
const allFoundImages = [] const allFoundImages : string[] = []
const errors = [] const errors = []
const warnings = [] const warnings = []
for (const metapath of ExtractImages.layoutMetaPaths) { for (const metapath of ExtractImages.layoutMetaPaths) {
@ -33,7 +33,7 @@ export class ExtractImages extends Conversion<LayoutConfigJson, string[]> {
if (typeof foundImage === "string") { if (typeof foundImage === "string") {
if(foundImage == ""){ if(foundImage == ""){
errors.push(context+"."+path.join(".")+" Found an empty image") warnings.push(context+"."+path.join(".")+" Found an empty image")
} }
if(this._sharedTagRenderings?.has(foundImage)){ if(this._sharedTagRenderings?.has(foundImage)){
@ -54,7 +54,7 @@ export class ExtractImages extends Conversion<LayoutConfigJson, string[]> {
allFoundImages.push(...fromPath.map(i => i.leaf).filter(i => typeof i=== "string")) allFoundImages.push(...fromPath.map(i => i.leaf).filter(i => typeof i=== "string"))
for (const pathAndImg of fromPath) { for (const pathAndImg of fromPath) {
if(pathAndImg.leaf === "" || pathAndImg.leaf["path"] == ""){ if(pathAndImg.leaf === "" || pathAndImg.leaf["path"] == ""){
errors.push(context+[...path,...pathAndImg.path].join(".")+": Found an empty image at ") warnings.push(context+[...path,...pathAndImg.path].join(".")+": Found an empty image at ")
} }
} }
} }
@ -62,7 +62,14 @@ export class ExtractImages extends Conversion<LayoutConfigJson, string[]> {
} }
} }
} else { } else {
allFoundImages.push(...found.map(i => i.leaf)) for (const foundElement of found) {
if(foundElement.leaf === ""){
warnings.push(context+"."+foundElement.path.join(".")+" Found an empty image")
continue
}
allFoundImages.push(foundElement.leaf)
}
} }
} }
@ -70,6 +77,7 @@ export class ExtractImages extends Conversion<LayoutConfigJson, string[]> {
.map(img => img["path"] ?? img) .map(img => img["path"] ?? img)
.map(img => img.split(";"))) .map(img => img.split(";")))
.map(img => img.split(":")[0]) .map(img => img.split(":")[0])
.filter(img => img !== "")
return {result: Utils.Dedup(splitParts), errors, warnings}; return {result: Utils.Dedup(splitParts), errors, warnings};
} }

20
Models/ThemeConfig/Conversion/Validation.ts
View file

@ -208,11 +208,29 @@ class OverrideShadowingCheck extends DesugaringStep<LayoutConfigJson> {
} }
class MiscThemeChecks extends DesugaringStep<LayoutConfigJson>{
constructor() {
super("Miscelleanous checks on the theme", [],"MiscThemesChecks");
}
convert(json: LayoutConfigJson, context: string): { result: LayoutConfigJson; errors?: string[]; warnings?: string[]; information?: string[] } {
const warnings = []
if(json.socialImage === ""){
warnings.push("Social image for theme "+json.id+" is the emtpy string")
}
return {
result :json,
warnings
};
}
}
export class PrevalidateTheme extends Fuse<LayoutConfigJson> { export class PrevalidateTheme extends Fuse<LayoutConfigJson> {
constructor() { constructor() {
super("Various consistency checks on the raw JSON", super("Various consistency checks on the raw JSON",
new OverrideShadowingCheck() new OverrideShadowingCheck(),
new MiscThemeChecks()
); );
} }