Skip to content

Commit

Permalink
Working on Gallery
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kimau
Kimau committed Jul 20, 2021
1 parent 61e1b45 commit 0b49f66
Show file tree
Hide file tree
Showing 9 changed files with 158 additions and 209 deletions.
54 changes: 18 additions & 36 deletions buildTemplate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ type TwitterCard struct {
}

type GenerateData struct { // Loaded from files and Generated
Gallery GalleryList
Micro MicroList
Feed BlogList
Hobby HobbyList
Expand All @@ -52,50 +53,35 @@ var (

func loadJSONBlob(filename string, jObj interface{}) {
log.Println("Loading ", filename)
jsonBlob, err := ioutil.ReadFile(filename)
if err != nil {
log.Fatalln(err)
return
}
jsonBlob, err := os.ReadFile(filename)
CheckErr(err)

err = json.Unmarshal(jsonBlob, jObj)
if err != nil {
log.Fatalln("Error in JSON ", filename, " - ", err)
}
CheckErrContext(err, "Error in JSON ", filename, " - ")
}

func saveJSONBlob(filename string, jObj interface{}) {
log.Println("Saving ", filename)
b, err := json.MarshalIndent(jObj, "", " ")
if err != nil {
log.Fatalln("Error in JSON ", filename, " - ", err)
}
CheckErrContext(err, "Error in JSON ", filename, " - ")

os.Remove(filename)
err = ioutil.WriteFile(filename, b, 0777)
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)
}

////////////////////////////////////////////////////////////////////////////////
// Generate About
func GenerateAbout() {
os.RemoveAll(publicHtmlRoot + "index.html")
aboutIndexTemp, err := template.ParseFiles("Templates/about.html")
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

// Run Template

var outBuffer bytes.Buffer
err = aboutIndexTemp.Execute(&outBuffer, genData)
if err != nil {
log.Fatalln("Error in Template ", err)
}
CheckErrContext(err, "Error in Template ")

// Write out Frame
frameData := &SubPage{
Expand All @@ -105,15 +91,10 @@ func GenerateAbout() {
}

f, fileErr := os.Create(publicHtmlRoot + "index.html")
if fileErr != nil {
log.Fatalln("Error in File ", fileErr)
}
CheckErrContext(fileErr, "Error in File ")

err = RootTemp.Execute(f, frameData)
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

f.Close()
}
Expand All @@ -125,13 +106,14 @@ func generateDataOnly() {
Job: JobList{},
}

log.Println("Do Jobs...");
log.Println("Do Jobs...")
genData.Job.LoadFromFile()
log.Println("Do Feed...");
log.Println("Do Feed...")
genData.Feed.LoadFromFile()
log.Println("Do Hobby...");
log.Println("Do Hobby...")
genData.Hobby.LoadFromFile()
LoadFromMicroListFolder()
LoadFromGalleryListFolder()

// Build Short Feed
genData.ShortFeed = genData.Feed[1:4]
Expand All @@ -157,17 +139,17 @@ func generateDataOnly() {
func setupRoot() {
var err error
RootTemp, err = template.ParseFiles("Templates/root.html")
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)
}

func genWebsite() {
generateDataOnly()

setupRoot()

log.Println("Generating Gallery")
GenerateGallery()

log.Println("Generating Micro")
GenerateMicro()

Expand Down
86 changes: 23 additions & 63 deletions build_blog.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ var (
regUrlChar *regexp.Regexp
regUrlSpace *regexp.Regexp
regStripMarkup *regexp.Regexp
regCatchImage *regexp.Regexp
)

const longformPubStr = "Mon, 02 Jan 2006 15:04:05 -0700"
Expand All @@ -56,19 +55,12 @@ func init() {
regUrlChar = regexp.MustCompile("[^A-Za-z]")
regUrlSpace = regexp.MustCompile(" ")
regStripMarkup = regexp.MustCompile("<[^<>]*>")
regCatchImage = regexp.MustCompile("<img[^>]*\"(/images/Blog[^\"]*)\"[^>]*>")

blogIndexTemp, err = template.ParseFiles("Templates/blogindex.html")
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

blogTemp, err = template.ParseFiles("Templates/blogpost.html")
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -109,9 +101,7 @@ func (bl *BlogList) SaveToFile() {
func (bl *BlogList) GeneratePage() {
var outBuffer bytes.Buffer
err := blogIndexTemp.Execute(&outBuffer, bl)
if err != nil {
log.Fatalln("Error in Template ", err)
}
CheckErrContext(err, "Error in Template ")

// Write out Frame
frameData := &SubPage{
Expand All @@ -121,15 +111,10 @@ func (bl *BlogList) GeneratePage() {
}

f, fileErr := os.Create(publicHtmlRoot + "blog/index.html")
if fileErr != nil {
log.Fatalln("Error in File ", fileErr)
}
CheckErrContext(fileErr, "Error in File ")

err = RootTemp.Execute(f, frameData)
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

f.Close()
}
Expand All @@ -138,18 +123,16 @@ func (bl *BlogList) GeneratePage() {
// Blog Post
func (bp *BlogPost) LoadBodyFromFile() error {
srcFile := fmt.Sprintf("blogdata/post/%d/%s.html", bp.Date.Year(), bp.Key)
bodyBytes, err := ioutil.ReadFile(srcFile)
if err != nil {
return err
}
bodyBytes, err := os.ReadFile(srcFile)
CheckErr(err)

bp.Body = template.HTML(bodyBytes)
return nil
}

func (bp *BlogPost) SaveBodyToFile() error {
if len(bp.Body) < 8 {
return errors.New("Body is null or less than 8 characters")
return errors.New("body is null or less than 8 characters")
}

// Make Folder
Expand All @@ -164,7 +147,7 @@ func (bp *BlogPost) SaveBodyToFile() error {
os.Remove(srcFile)
err = ioutil.WriteFile(srcFile, []byte(bp.Body), 0777)
if err != nil {
log.Fatalln(err)
CheckErr(err)
}

return nil
Expand All @@ -175,7 +158,7 @@ func (bp *BlogPost) FixupDateFromPubStr() {

bp.Date, err = time.Parse(longformPubStr, bp.Pubdate)
if err != nil {
log.Fatalln(err)
CheckErr(err)
}

bp.DateStr = fmt.Sprintf("%d %v %d", bp.Date.Day(), bp.Date.Month(), bp.Date.Year())
Expand All @@ -195,9 +178,7 @@ func (bp *BlogPost) GeneratePage() {
log.Println(bp.Link)

err = os.MkdirAll(publicHtmlRoot+bp.Link, 0777)
if err != nil {
log.Fatalln("Error in Mkdir ", err)
}
CheckErrContext(err, "Error in Mkdir ")

// Get Banner Image Size (if I have one)
if len(bp.BannerImage) > 3 {
Expand All @@ -217,17 +198,11 @@ func (bp *BlogPost) GeneratePage() {
bp.ImageWidth, bp.ImageHeight = "120", "120"
}

blogBody := bp.Body
{
var outBuffer bytes.Buffer
err = blogTemp.Execute(&outBuffer, bp)
if err != nil {
log.Fatalln(err)
return
}
var outBuffer bytes.Buffer
err = blogTemp.Execute(&outBuffer, bp)
CheckErr(err)

blogBody = template.HTML(outBuffer.String())
}
blogBody := template.HTML(outBuffer.String())

// Twitter Card
if len(bp.ShortDesc) < 4 {
Expand Down Expand Up @@ -271,10 +246,7 @@ func (bp *BlogPost) GeneratePage() {

// Note: Don't like the fact we reference RootTemp here
err = RootTemp.Execute(f, frameData)
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

f.Close()
}
Expand All @@ -287,13 +259,10 @@ func GenerateBlog() {

os.RemoveAll(publicHtmlRoot + "blog/")
err = os.MkdirAll(publicHtmlRoot+"blog/", 0777)
if err != nil {
log.Fatalln("Unable to make folder", err)
}
CheckErrContext(err, "Unable to make folder")

// Gather Catergories and filter out single use catergories
var catMap map[BlogCat]BlogList
catMap = make(map[BlogCat]BlogList)
catMap := make(map[BlogCat]BlogList)
for _, v := range genData.Feed {
for _, c := range v.RawCategory {
catMap[c] = append(catMap[c], v)
Expand All @@ -316,7 +285,7 @@ func GenerateBlog() {
if len(v.Body) < 1 {
err := v.LoadBodyFromFile()
if err != nil {
log.Fatalln(err)
CheckErr(err)
return
}
}
Expand All @@ -340,9 +309,7 @@ func GenerateBlogCatergoryPage(cat BlogCat, blist *BlogList) {
var outBuffer bytes.Buffer

err = blogIndexTemp.Execute(&outBuffer, blist)
if err != nil {
log.Fatalln("Error in Template ", err)
}
CheckErrContext(err, "Error in Template ")

// Write out Frame
frameData := &SubPage{
Expand All @@ -352,20 +319,13 @@ func GenerateBlogCatergoryPage(cat BlogCat, blist *BlogList) {
}

err = os.MkdirAll(publicHtmlRoot+"blog/cat/"+cat.UrlVer(), 0777)
if err != nil {
log.Fatalln("Error in Mkdir ", err)
}
CheckErrContext(err, "Error in Mkdir ")

f, fileErr := os.Create(publicHtmlRoot + "blog/cat/" + cat.UrlVer() + "/index.html")
if fileErr != nil {
log.Fatalln("Error in File ", fileErr)
}
CheckErrContext(fileErr, "Error in File ")

err = RootTemp.Execute(f, frameData)
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

f.Close()
}
15 changes: 3 additions & 12 deletions build_hobby.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ func init() {
var err error

hobbyIndexTemp, err = template.ParseFiles("Templates/projects.html")
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -57,10 +54,7 @@ func (hl *HobbyList) GeneratePage() {
var outBuffer bytes.Buffer

err = hobbyIndexTemp.Execute(&outBuffer, hl)
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

// Write out Frame
frameData := &SubPage{
Expand All @@ -77,10 +71,7 @@ func (hl *HobbyList) GeneratePage() {
}

err = RootTemp.Execute(f, frameData)
if err != nil {
log.Fatalln(err)
return
}
CheckErr(err)

f.Close()
}
Expand Down
Loading

0 comments on commit 0b49f66

Please sign in to comment.