更新评论模块
This commit is contained in:
@@ -139,22 +139,22 @@ func RecursiveReadArticles(dir string) (Articles, error) {
|
||||
}
|
||||
|
||||
func ReadArticle(path string) (Article, error) {
|
||||
article, _, err := readMarkdown(path)
|
||||
article, _, err := readMarkdown(path, "")
|
||||
if err != nil {
|
||||
return article, err
|
||||
}
|
||||
return article, nil
|
||||
}
|
||||
|
||||
func ReadArticleDetail(path string) (ArticleDetail, error) {
|
||||
_, articleDetail, err := readMarkdown(path)
|
||||
func ReadArticleDetail(path, key string) (ArticleDetail, error) {
|
||||
_, articleDetail, err := readMarkdown(path, key)
|
||||
if err != nil {
|
||||
return articleDetail, err
|
||||
}
|
||||
return articleDetail, nil
|
||||
}
|
||||
|
||||
func readMarkdown(path string) (Article, ArticleDetail, error) {
|
||||
func readMarkdown(path, key string) (Article, ArticleDetail, error) {
|
||||
var article Article
|
||||
var articleDetail ArticleDetail
|
||||
mdFile, err := os.Stat(path)
|
||||
@@ -171,7 +171,9 @@ func readMarkdown(path string) (Article, ArticleDetail, error) {
|
||||
return article, articleDetail, err
|
||||
}
|
||||
markdown = bytes.TrimSpace(markdown)
|
||||
|
||||
if key != "" {
|
||||
article.ShortUrl = key
|
||||
}
|
||||
article.Path = path
|
||||
article.Category = GetCategoryName(path)
|
||||
article.Title = strings.TrimSuffix(strings.ToUpper(mdFile.Name()), ".MD")
|
||||
|
@@ -76,12 +76,12 @@ func readHtmlTemplate(htmlFileName []string, viewDir string) ([]TemplatePointer,
|
||||
|
||||
head := viewDir + "/layouts/head.html"
|
||||
footer := viewDir + "/layouts/footer.html"
|
||||
|
||||
reviews := viewDir + "/layouts/reviews.html"
|
||||
for _, name := range htmlFileName {
|
||||
|
||||
tp, err := template.New(name+".html").
|
||||
Funcs(template.FuncMap{"SpreadDigit": SpreadDigit}).
|
||||
ParseFiles(viewDir+"/"+name+".html", head, footer)
|
||||
ParseFiles(viewDir+"/"+name+".html", head, footer, reviews)
|
||||
if err != nil {
|
||||
return htmlTemplate, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user