implemented copy files in directories without templating, with concurrency in all subdirectories
arnaucode idoctnef@openmailbox.org
Sat, 24 Jun 2017 12:21:47 +0200
13 files changed,
57 insertions(+),
123 deletions(-)
jump to
D
example/webInput/app.css
@@ -1,59 +0,0 @@
-.collection{ - border: 0!important; -} -.collection-item{ - background-color: rgba(0,0,0,0)!important; - border: 0px!important; -} -.collection-item:hover{ - background-color: rgba(255,255,255,0.1)!important; -} - - -/* login */ -.o_loginBackground{ - position: absolute; - - height: 100%!important; - width: 100%; - min-height: auto; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; - -o-background-size: cover; - background-position: center; - background-image: url('img/loginBackground.jpg'); - text-align: center; - /*color: white;*/ - - /* Create the parallax scrolling effect */ - background-attachment: fixed; - background-position: center; - background-repeat: no-repeat; - background-size: cover; - - color: #ffffff; - -} -@font-face { - font-family: 'Otterly Adorable'; - src: url('fonts/fourHand_TRIAL.ttf'); -} -.o_loginBackground h1{ - color: #ffffff!important; - margin: 10px; - font-family: 'Otterly Adorable' - /*font-weight: bold;*/ -} - -.o_floatRight{ - float: right; -} -.o_textRight{ - text-align: right; -} -.o_badge{ - border-radius: 8px; - margin: 5px; - padding: 2px 5px; -}
M
example/webInput/konstruiConfig.json
→
example/webInput/konstruiConfig.json
@@ -5,11 +5,14 @@ "github": "github.com/arnaucode",
"website": "arnaucode.com", "files": [ "index.html", - "projects.html", - "app.css" + "projects.html" ], "repeatPages": [{ "htmlPage": "projectPage.html", "data": "templates/projectTemplate.json" - }] -} + }], + "copyRaw": [ + "css", + "js" + ] +}
D
example/webOutput/app.css
@@ -1,59 +0,0 @@
-.collection{ - border: 0!important; -} -.collection-item{ - background-color: rgba(0,0,0,0)!important; - border: 0px!important; -} -.collection-item:hover{ - background-color: rgba(255,255,255,0.1)!important; -} - - -/* login */ -.o_loginBackground{ - position: absolute; - - height: 100%!important; - width: 100%; - min-height: auto; - -webkit-background-size: cover; - -moz-background-size: cover; - background-size: cover; - -o-background-size: cover; - background-position: center; - background-image: url('img/loginBackground.jpg'); - text-align: center; - /*color: white;*/ - - /* Create the parallax scrolling effect */ - background-attachment: fixed; - background-position: center; - background-repeat: no-repeat; - background-size: cover; - - color: #ffffff; - -} -@font-face { - font-family: 'Otterly Adorable'; - src: url('fonts/fourHand_TRIAL.ttf'); -} -.o_loginBackground h1{ - color: #ffffff!important; - margin: 10px; - font-family: 'Otterly Adorable' - /*font-weight: bold;*/ -} - -.o_floatRight{ - float: right; -} -.o_textRight{ - text-align: right; -} -.o_badge{ - border-radius: 8px; - margin: 5px; - padding: 2px 5px; -}
M
main.go
→
main.go
@@ -35,6 +35,7 @@ }
} } func startTemplating(folderPath string, newDir string) { + //do templating for each file in konstruiConfig.Files in konstruiConfig.Files for i := 0; i < len(konstruiConfig.Files); i++ { fName := konstruiConfig.Files[i] fileNameSplitted := strings.Split(fName, ".")@@ -49,6 +50,7 @@ writeFile(newDir+"/"+fName, fileContent)
} } + //do templating for the file pages in konstruiConfig.RepeatPages c.Cyan("starting to generate Pages to repeat") for i := 0; i < len(konstruiConfig.RepeatPages); i++ { pageTemplate, data := getHtmlAndDataFromRepeatPages(konstruiConfig.RepeatPages[i])@@ -59,15 +61,53 @@ fmt.Println(data[j])
writeFile(newDir+"/"+data[j]["pageName"]+"Page.html", generatedPage) } } + + //copy the konstruiConfig.CopyRaw files without modificate them + for i := 0; i < len(konstruiConfig.CopyRaw); i++ { + fName := konstruiConfig.CopyRaw[i] + c.Yellow(fName) + fileNameSplitted := strings.Split(fName, ".") + if len(fileNameSplitted) > 1 { + //is a file + copyFileRaw(folderPath, fName, newDir) + } else { + //is a directory + c.Red(folderPath + "/" + fName) + copyDirRaw(folderPath, fName, newDir) + } + } +} +func copyDirRaw(fromDir string, currentDir string, newDir string) { + filesList, _ := ioutil.ReadDir("./" + fromDir + "/" + currentDir) + fmt.Println(fromDir + "/" + currentDir) + c.Green(newDir + "/" + currentDir) + os.MkdirAll(newDir+"/"+currentDir, os.ModePerm) + for _, f := range filesList { + fileNameSplitted := strings.Split(f.Name(), ".") + if len(fileNameSplitted) > 1 { + //is a file + copyFileRaw(fromDir+"/"+currentDir, f.Name(), newDir+"/"+currentDir) + } else { + //is a directory + copyDirRaw(fromDir+"/"+currentDir, f.Name(), newDir+"/"+currentDir) + } + } +} +func copyFileRaw(fromDir string, fName string, newDir string) { + c.Yellow("copying raw " + fromDir + "//" + fName) + fileContent := readFile(fromDir + "/" + fName) + writeFile(newDir+"/"+fName, fileContent) } func main() { c.Green("getting files from /webInput") c.Green("getting conifg from file konstruiConfig.json") + //first reads the konstrui.Config.json readKonstruiConfig(rawFolderPath + "/" + konstruiConfigFile) c.Green("configuration:") fmt.Println(konstruiConfig.Files) c.Green("templating") //parseDir(rawFolderPath, newFolderPath) + startTemplating(rawFolderPath, newFolderPath) - c.Green("webpage finished, wiles at /webOutput") + c.Green("webpage finished, files at /webOutput") }
M
readKonstruiConfig.go
→
readKonstruiConfig.go
@@ -20,6 +20,7 @@ Github string `json:"github"`
Website string `json:"website"` Files []string `json:"files"` RepeatPages []RepeatPages + CopyRaw []string `json:"copyRaw"` } var konstruiConfig KonstruiConfig