Add an ability to disable adding a favicon with a config.txt line or an argument

This commit is contained in:
KZacharski 2023-08-31 22:59:47 +02:00
parent 5b55424b7f
commit a17a27d74d
2 changed files with 43 additions and 12 deletions

View File

@ -2,4 +2,7 @@
quick-mode = false quick-mode = false
// Debug mode - prints all variables at the end of a run. // Debug mode - prints all variables at the end of a run.
debug = false debug = false
// Should a favicon be added by default
favicon = true

50
diji.go
View File

@ -43,16 +43,18 @@ func copy(src, dst string) (int64, error) {
} }
func main() { func main() {
var ver string = "1.2" var ver string = "1.3"
var version int = 3 var version int = 4
argsar := os.Args[1:] argsar := os.Args[1:]
var debugelement string = "-d" var debugelement string = "-d"
var quickelement string = "-q" var quickelement string = "-q"
var buildelement string = "--buildversion" var buildelement string = "--buildversion"
var addfavelement string = "-f"
var debugargument bool = false var debugargument bool = false
var quickargument bool = false var quickargument bool = false
var buildargument bool = false var buildargument bool = false
var addfavargument bool = false
for i := 0; i < len(argsar); i++ { for i := 0; i < len(argsar); i++ {
// checking if the array contains the given value // checking if the array contains the given value
@ -81,6 +83,15 @@ func main() {
} }
} }
for i := 0; i < len(argsar); i++ {
// checking if the array contains the given value
if argsar[i] == addfavelement {
// changing the boolean variable
addfavargument = true
break
}
}
if buildargument == true { if buildargument == true {
fmt.Print(ver) fmt.Print(ver)
os.Exit(0) os.Exit(0)
@ -122,6 +133,7 @@ func main() {
configtext := string(configbytes) configtext := string(configbytes)
var quickmode bool = strings.Contains(configtext, "quick-mode = true") var quickmode bool = strings.Contains(configtext, "quick-mode = true")
var debug bool = strings.Contains(configtext, "debug = true") var debug bool = strings.Contains(configtext, "debug = true")
var addfav bool = strings.Contains(configtext, "favicon = true")
if debugargument == true { if debugargument == true {
if debug == true { if debug == true {
@ -139,6 +151,14 @@ func main() {
} }
} }
if addfavargument == true {
if addfav == true {
addfav = false
} else if addfav == false {
addfav = true
}
}
var cssstr string var cssstr string
var jsstr string var jsstr string
var samplestr string var samplestr string
@ -197,13 +217,17 @@ func main() {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
var assetspath string = projname + "/assets"
if err := os.Mkdir(assetspath, os.ModePerm); err != nil { if addfav == true {
log.Fatal(err) var assetspath string = projname + "/assets"
if err := os.Mkdir(assetspath, os.ModePerm); err != nil {
log.Fatal(err)
}
var favpath string = assetspath + "/favicon.png"
copy(configlocation+"/defaultfav.png", favpath)
fmt.Println(favpath + " created.")
} }
var favpath string = assetspath + "/favicon.png"
copy(configlocation+"/defaultfav.png", favpath)
fmt.Println(favpath + " created.")
var indexcontent1 string = `<!DOCTYPE html> var indexcontent1 string = `<!DOCTYPE html>
<html lang="` + langstr + `"> <html lang="` + langstr + `">
<head> <head>
@ -211,7 +235,6 @@ func main() {
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>` + projname + `</title> <title>` + projname + `</title>
<link rel="icon" type="image" href="./assets/favicon.png">
` `
var csstag string = `<link rel="stylesheet" type="text/css" href="style.css"> var csstag string = `<link rel="stylesheet" type="text/css" href="style.css">
` `
@ -230,6 +253,11 @@ func main() {
` + samplecontent + ` ` + samplecontent + `
</body>` </body>`
} }
var favtag string = `<link rel="icon" type="image" href="./assets/favicon.png">
`
if addfav == true {
indexcontent1 = indexcontent1 + favtag
}
if createcss == true { if createcss == true {
indexcontent1 = indexcontent1 + csstag indexcontent1 = indexcontent1 + csstag
} }
@ -324,8 +352,8 @@ font-family: sans-serif;
fmt.Println("cssstr(string): " + cssstr) fmt.Println("cssstr(string): " + cssstr)
fmt.Println("jsstr(string): " + jsstr) fmt.Println("jsstr(string): " + jsstr)
fmt.Println("indname(string): " + indname) fmt.Println("indname(string): " + indname)
fmt.Println("assetspath(string): " + assetspath) //fmt.Println("assetspath(string): " + assetspath)
fmt.Println("favpath(string): " + favpath) // fmt.Println("favpath(string): " + favpath)
fmt.Println("indexcontent1(string): " + indexcontent1) fmt.Println("indexcontent1(string): " + indexcontent1)
fmt.Println("csstag(string): " + csstag) fmt.Println("csstag(string): " + csstag)
fmt.Println("jstag(string): " + jstag) fmt.Println("jstag(string): " + jstag)