forked from MapComplete/MapComplete
		
	Fix initial setup scripts
This commit is contained in:
		
							parent
							
								
									1f9b175a96
								
							
						
					
					
						commit
						55eedb4185
					
				
					 1 changed files with 32 additions and 28 deletions
				
			
		| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
import {Utils} from "../Utils";
 | 
					import {Utils} from "../Utils";
 | 
				
			||||||
import {lstatSync, readdirSync, readFileSync, writeFileSync, unlinkSync} from "fs";
 | 
					import {lstatSync, readdirSync, readFileSync, writeFileSync, unlinkSync, existsSync, mkdir, mkdirSync} from "fs";
 | 
				
			||||||
import SmallLicense from "../Models/smallLicense";
 | 
					import SmallLicense from "../Models/smallLicense";
 | 
				
			||||||
import ScriptUtils from "./ScriptUtils";
 | 
					import ScriptUtils from "./ScriptUtils";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,28 +13,29 @@ Utils.runningFromConsole = true;
 | 
				
			||||||
function generateLicenseInfos(paths: string[]): SmallLicense[] {
 | 
					function generateLicenseInfos(paths: string[]): SmallLicense[] {
 | 
				
			||||||
    const licenses = []
 | 
					    const licenses = []
 | 
				
			||||||
    for (const path of paths) {
 | 
					    for (const path of paths) {
 | 
				
			||||||
        try{
 | 
					        try {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        const parsed = JSON.parse(readFileSync(path, "UTF-8"))
 | 
					            const parsed = JSON.parse(readFileSync(path, "UTF-8"))
 | 
				
			||||||
        if (Array.isArray(parsed)) {
 | 
					            if (Array.isArray(parsed)) {
 | 
				
			||||||
            const l: SmallLicense[] = parsed
 | 
					                const l: SmallLicense[] = parsed
 | 
				
			||||||
            for (const smallLicens of l) {
 | 
					                for (const smallLicens of l) {
 | 
				
			||||||
                smallLicens.path = path.substring(0, path.length - "license_info.json".length) + smallLicens.path
 | 
					                    smallLicens.path = path.substring(0, path.length - "license_info.json".length) + smallLicens.path
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                licenses.push(...l)
 | 
				
			||||||
 | 
					            } else {
 | 
				
			||||||
 | 
					                const smallLicens: SmallLicense = parsed;
 | 
				
			||||||
 | 
					                /*if(parsed.license === "CC-BY"){
 | 
				
			||||||
 | 
					                    console.log("Rewriting ", path)
 | 
				
			||||||
 | 
					                    parsed.license === "CC-BY 4.0"
 | 
				
			||||||
 | 
					                    writeFileSync(path, JSON.stringify(smallLicens, null, "  "))
 | 
				
			||||||
 | 
					                }*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                smallLicens.path = path.substring(0, 1 + path.lastIndexOf("/")) + smallLicens.path
 | 
				
			||||||
 | 
					                licenses.push(smallLicens)
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            licenses.push(...l)
 | 
					        } catch (e) {
 | 
				
			||||||
        } else {
 | 
					            console.error("Error: ", e, "while handling", path)
 | 
				
			||||||
            const smallLicens: SmallLicense = parsed;
 | 
					 | 
				
			||||||
            /*if(parsed.license === "CC-BY"){
 | 
					 | 
				
			||||||
                console.log("Rewriting ", path)
 | 
					 | 
				
			||||||
                parsed.license === "CC-BY 4.0"
 | 
					 | 
				
			||||||
                writeFileSync(path, JSON.stringify(smallLicens, null, "  "))
 | 
					 | 
				
			||||||
            }*/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            smallLicens.path = path.substring(0, 1 + path.lastIndexOf("/")) + smallLicens.path
 | 
					 | 
				
			||||||
            licenses.push(smallLicens)
 | 
					 | 
				
			||||||
        }}catch(e){
 | 
					 | 
				
			||||||
            console.error("Error: ",e, "while handling",path)
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					@ -195,6 +196,9 @@ const contents = ScriptUtils.readDirRecSync("./assets")
 | 
				
			||||||
const licensePaths = contents.filter(entry => entry.indexOf("license_info.json") >= 0)
 | 
					const licensePaths = contents.filter(entry => entry.indexOf("license_info.json") >= 0)
 | 
				
			||||||
const licenseInfos = generateLicenseInfos(licensePaths);
 | 
					const licenseInfos = generateLicenseInfos(licensePaths);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if (!existsSync("./assets/generated")) {
 | 
				
			||||||
 | 
					    mkdirSync("./assets/generated")
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
writeFileSync("./assets/generated/license_info.json", JSON.stringify(licenseInfos, null, "  "))
 | 
					writeFileSync("./assets/generated/license_info.json", JSON.stringify(licenseInfos, null, "  "))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -203,13 +207,13 @@ const missingLicenses = missingLicenseInfos(licenseInfos, artwork)
 | 
				
			||||||
const invalidLicenses = licenseInfos.filter(l => (l.license ?? "") === "").map(l => `License for artwork ${l.path} is empty string or undefined`)
 | 
					const invalidLicenses = licenseInfos.filter(l => (l.license ?? "") === "").map(l => `License for artwork ${l.path} is empty string or undefined`)
 | 
				
			||||||
for (const licenseInfo of licenseInfos) {
 | 
					for (const licenseInfo of licenseInfos) {
 | 
				
			||||||
    for (const source of licenseInfo.sources) {
 | 
					    for (const source of licenseInfo.sources) {
 | 
				
			||||||
        if(source == ""){
 | 
					        if (source == "") {
 | 
				
			||||||
            invalidLicenses.push("Invalid license: empty string in "+JSON.stringify(licenseInfo))
 | 
					            invalidLicenses.push("Invalid license: empty string in " + JSON.stringify(licenseInfo))
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        try{
 | 
					        try {
 | 
				
			||||||
            new URL(source);
 | 
					            new URL(source);
 | 
				
			||||||
        }catch{
 | 
					        } catch {
 | 
				
			||||||
            invalidLicenses.push("Not a valid URL: "+source)
 | 
					            invalidLicenses.push("Not a valid URL: " + source)
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -218,7 +222,7 @@ if (process.argv.indexOf("--prompt") >= 0 || process.argv.indexOf("--query") >=
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
if (missingLicenses.length > 0) {
 | 
					if (missingLicenses.length > 0) {
 | 
				
			||||||
    const msg = `There are ${missingLicenses.length} licenses missing and ${invalidLicenses.length} invalid licenses.`
 | 
					    const msg = `There are ${missingLicenses.length} licenses missing and ${invalidLicenses.length} invalid licenses.`
 | 
				
			||||||
    console.log( missingLicenses.concat(invalidLicenses).join("\n"))
 | 
					    console.log(missingLicenses.concat(invalidLicenses).join("\n"))
 | 
				
			||||||
    console.error(msg)
 | 
					    console.error(msg)
 | 
				
			||||||
    if (process.argv.indexOf("--report") >= 0) {
 | 
					    if (process.argv.indexOf("--report") >= 0) {
 | 
				
			||||||
        console.log("Writing report!")
 | 
					        console.log("Writing report!")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue