diff --git a/postCollection.go b/postCollection.go index 162114f..56a9375 100644 --- a/postCollection.go +++ b/postCollection.go @@ -24,26 +24,27 @@ const layout = "2006-01-02" var modTime time.Time var postsCollection []Post -func InitializeCollection() { - postsCollection = nil - filepath.Walk("./posts", newPost) - fmt.Println(len(postsCollection)) - for _, post := range postsCollection { - fmt.Println(post.Title) - } +func NewPostsCollection() { + verifyFolderModification() + initializeCollection() + go acquirePosts(100) } -func AcquirePosts(duration time.Duration) { +func initializeCollection() { + postsCollection = nil + filepath.Walk("./posts", newPost) +} + +func acquirePosts(duration time.Duration) { for { - if isFolderModified() == true { - postsCollection = nil - filepath.Walk("./posts", newPost) + if verifyFolderModification() == true { + initializeCollection() } time.Sleep(duration * time.Second) } } -func isFolderModified() bool { +func verifyFolderModification() bool { f, err := os.Open("./posts") if err != nil { fmt.Println("file-error here: \n", f) @@ -66,7 +67,7 @@ func newPost(path string, f os.FileInfo, err error) error { content, err := ioutil.ReadFile(path) if err != nil { fmt.Println(err) - //return err + return nil } title := strings.Replace(path, "posts/", "", -1) @@ -75,7 +76,6 @@ func newPost(path string, f os.FileInfo, err error) error { } s := string(content) doc, _ := html.Parse(strings.NewReader(s)) - var p = Post{ getDate(doc), title, @@ -83,25 +83,32 @@ func newPost(path string, f os.FileInfo, err error) error { template.HTML(string(content[:len(content)])), } - //insertPostAccordingToDate(p, postsCollection) postsCollection = insertPostAccordingToDate(p, postsCollection) + fmt.Println(len(postsCollection)) + for _, d := range postsCollection { + fmt.Println("dates are ", d.Date) + } return nil } func getDate(n *html.Node) time.Time { - var t time.Time + var zero, d, t time.Time if n.Type == html.ElementNode && n.Data == "time" { for _, a := range n.Attr { if a.Key == "datetime" { t, _ = time.Parse(layout, a.Val) + return t } } } for c := n.FirstChild; c != nil; c = c.NextSibling { - t = getDate(c) + d = getDate(c) + if d != zero { + return d + } } return t @@ -109,12 +116,9 @@ func getDate(n *html.Node) time.Time { func getNewestPosts(numberOfPosts int) []Post { var posts []Post - if len(postsCollection) == 0 { - return []Post{} - } - for i := numberOfPosts; i > 0; i-- { - post := postsCollection[i] - posts = append(posts, getPostByURLTitle(post.URLTitle)) + l := len(postsCollection) + for i := l - 1; i >= l-numberOfPosts; i-- { + posts = append(posts, postsCollection[i]) } return posts } @@ -129,14 +133,16 @@ func getPostByURLTitle(title string) Post { } func insertPostAccordingToDate(post Post, arr []Post) []Post { + fmt.Println(post.Title) for i, p := range arr { if p.Date.After(post.Date) { s := make([]Post, len(arr)+1, cap(arr)+1) copy(s[:], arr[:]) //make a copy of the slice copy(s[i+1:], arr[i:]) //move the upper part of the slice ahead, creating a hole s[i] = post //insert new element into hole + return s } } - arr = append(arr, post) - return arr + postsCollection = append(postsCollection, post) + return postsCollection } diff --git a/websiteTemplate b/websiteTemplate index 54d2ea4..20a6440 100755 Binary files a/websiteTemplate and b/websiteTemplate differ diff --git a/websiteTemplate.go b/websiteTemplate.go index 4f87336..ca649f7 100644 --- a/websiteTemplate.go +++ b/websiteTemplate.go @@ -22,8 +22,7 @@ var templates = template.Must(template.ParseFiles("blog.tmpl", "blog_roll.tmpl", func main() { - InitializeCollection() - go AcquirePosts(100) + NewPostsCollection() http.HandleFunc("/", blogHandler) http.HandleFunc("/post/", postHandler)