From 080c41d458030b238a1caa46b15ccdbccca0a94a Mon Sep 17 00:00:00 2001 From: JiXieShi Date: Fri, 3 May 2024 22:14:21 +0800 Subject: [PATCH] UP svg --- models/articles.go | 11 ++++- models/category.go | 12 +++++- models/extra_nav.go | 3 ++ models/html_template.go | 67 +++++++++++++++++++++--------- themes/blog/public/img/loading.svg | 47 +++++++++++++++++++++ themes/blog/talk.html | 6 ++- 6 files changed, 121 insertions(+), 25 deletions(-) create mode 100644 themes/blog/public/img/loading.svg diff --git a/models/articles.go b/models/articles.go index 7af9fc5..bfcaf48 100644 --- a/models/articles.go +++ b/models/articles.go @@ -154,23 +154,28 @@ func ReadArticleDetail(path, key string) (ArticleDetail, error) { return articleDetail, nil } +// readMarkdown 读取 Markdown 文件内容 func readMarkdown(path, key string) (Article, ArticleDetail, error) { var article Article var articleDetail ArticleDetail - mdFile, err := os.Stat(path) + // 获取文件信息 + mdFile, err := os.Stat(path) if err != nil { return article, articleDetail, err } if mdFile.IsDir() { return article, articleDetail, errors.New("this path is Dir") } - markdown, err := ioutil.ReadFile(path) + // 读取 Markdown 文件内容 + markdown, err := ioutil.ReadFile(path) if err != nil { return article, articleDetail, err } markdown = bytes.TrimSpace(markdown) + + // 设置文章属性 if key != "" { article.ShortUrl = key } @@ -179,6 +184,7 @@ func readMarkdown(path, key string) (Article, ArticleDetail, error) { article.Title = strings.TrimSuffix(strings.ToUpper(mdFile.Name()), ".MD") article.Date = Time(mdFile.ModTime()) + // 处理 开头JSON 格式的文章信息 if !bytes.HasPrefix(markdown, []byte("```json")) { article.Description = cropDesc(markdown) articleDetail.Article = article @@ -191,6 +197,7 @@ func readMarkdown(path, key string) (Article, ArticleDetail, error) { article.Description = cropDesc(markdownArrInfo[1]) + // 解析 JSON 内容 if err := json.Unmarshal(bytes.TrimSpace(markdownArrInfo[0]), &article); err != nil { article.Title = "文章[" + article.Title + "]解析 JSON 出错，请检查。" article.Description = err.Error() diff --git a/models/category.go b/models/category.go index fd82888..2838b42 100644 --- a/models/category.go +++ b/models/category.go @@ -25,13 +25,14 @@ func GetCategoryName(path string) string { return categoryName } +// GroupByCategory 按类别对文章进行分组 func GroupByCategory(articles *Articles, articleQuantity int) Categories { var categories Categories categoryMap := make(map[string]Articles) + // 根据类别将文章分组 for _, article := range *articles { - _, existedCategory := categoryMap[article.Category] if existedCategory { categoryMap[article.Category] = append(categoryMap[article.Category], article) @@ -39,10 +40,13 @@ func GroupByCategory(articles *Articles, articleQuantity int) Categories { categoryMap[article.Category] = Articles{article} } } + + // 遍历类别映射，构建分类信息 for categoryName, articles := range categoryMap { articleLen := len(articles) - var articleList Articles + + // 根据指定数量截取文章列表 if articleQuantity <= 0 { articleList = articles } else { @@ -52,12 +56,16 @@ func GroupByCategory(articles *Articles, articleQuantity int) Categories { articleList = articles[0:articleQuantity] } } + + // 添加分类信息到结果集 categories = append(categories, Category{ Name: categoryName, Quantity: articleLen, Articles: articleList, }) } + + // 对分类结果集进行排序 sort.Sort(categories) return categories } diff --git a/models/extra_nav.go b/models/extra_nav.go index 6c1a2a2..a6b7bc9 100644 --- a/models/extra_nav.go +++ b/models/extra_nav.go @@ -11,17 +11,20 @@ type Nav struct { } type Navs []Nav +// initExtraNav 初始化额外导航栏 func initExtraNav(dir string) (Navs, error) { var navigation Navs var extraNav Articles + // 递归读取文章 extraNav, err := RecursiveReadArticles(dir) if err != nil { return navigation, err } sort.Sort(extraNav) + // 将文章标题格式化为大写开头的标题，并添加到导航栏中 for _, article := range extraNav { title := strings.Title(strings.ToLower(article.Title)) navigation = append(navigation, Nav{Title: title, Path: article.Path}) diff --git a/models/html_template.go b/models/html_template.go index aafa492..3bb0626 100644 --- a/models/html_template.go +++ b/models/html_template.go @@ -37,36 +37,53 @@ func (t TemplatePointer) WriteError(w io.Writer, err error) { } } +// BuildViewData 构建视图数据 +// +// Parameters: +// +// title: 页面标题 +// data: 页面数据 +// +// Returns: +// +// map[string]interface{}: 包含标题、数据、网站配置和导航栏信息的映射 func BuildViewData(title string, data interface{}) map[string]interface{} { return map[string]interface{}{ - "Title": title, - "Data": data, - "Config": config.Cfg, - "Navs": Navigation, + "Title": title, // 页面标题 + "Data": data, // 页面数据 + "Config": config.Cfg, // 网站配置 + "Navs": Navigation, // 导航栏数据 } } +// initHtmlTemplate 初始化 HTML 模板 +// +// Parameters: +// +// viewDir: 视图文件目录路径 +// +// Returns: +// +// HtmlTemplate: HTML 模板对象 +// error: 错误信息（如果有） func initHtmlTemplate(viewDir string) (HtmlTemplate, error) { - var htmlTemplate HtmlTemplate - tp, err := readHtmlTemplate( []string{"index", "extraNav", "dashboard", "categories", "article", "album", "talk"}, viewDir) if err != nil { - return htmlTemplate, err + return HtmlTemplate{}, err } - htmlTemplate.Index = tp[0] - htmlTemplate.ExtraNav = tp[1] - htmlTemplate.Dashboard = tp[2] - htmlTemplate.Categories = tp[3] - htmlTemplate.Article = tp[4] - htmlTemplate.Album = tp[5] - htmlTemplate.Talk = tp[6] - - return htmlTemplate, nil + return HtmlTemplate{ + Index: tp[0], + ExtraNav: tp[1], + Dashboard: tp[2], + Categories: tp[3], + Article: tp[4], + Album: tp[5], + Talk: tp[6], + }, nil } - func SpreadDigit(n int) []int { var r []int for i := 1; i <= n; i++ { @@ -75,21 +92,33 @@ func SpreadDigit(n int) []int { return r } +// readHtmlTemplate 读取 HTML 模板文件 +// +// Parameters: +// +// htmlFileName: HTML 文件名列表 +// viewDir: 视图文件目录路径 +// +// Returns: +// +// []TemplatePointer: HTML 模板指针列表 +// error: 错误信息（如果有） func readHtmlTemplate(htmlFileName []string, viewDir string) ([]TemplatePointer, error) { var htmlTemplate []TemplatePointer head := viewDir + "/layouts/head.html" footer := viewDir + "/layouts/footer.html" reviews := viewDir + "/layouts/reviews.html" - for _, name := range htmlFileName { + for _, name := range htmlFileName { tp, err := template.New(name+".html"). Funcs(template.FuncMap{"SpreadDigit": SpreadDigit}). ParseFiles(viewDir+"/"+name+".html", head, footer, reviews) if err != nil { - return htmlTemplate, err + return nil, err } htmlTemplate = append(htmlTemplate, TemplatePointer{tp}) } + return htmlTemplate, nil } diff --git a/themes/blog/public/img/loading.svg b/themes/blog/public/img/loading.svg new file mode 100644 index 0000000..9d839f3 --- /dev/null +++ b/themes/blog/public/img/loading.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/blog/talk.html b/themes/blog/talk.html index 999787c..2e4d341 100644 --- a/themes/blog/talk.html +++ b/themes/blog/talk.html @@ -45,6 +45,7 @@ } #talk .loading { + vertical-align: middle; display: flex; align-items: center; justify-content: center; @@ -52,7 +53,8 @@ } #talk .loading img { - width: 200px; + width: 50px; + background-color:var(--primary,#673ab7); } .talk_item { @@ -193,7 +195,7 @@
-
加载中...
+
加载中...
- 只展示最近30条说说 -