From 5f52a4dd7b828024e12449355b30aa874562177d Mon Sep 17 00:00:00 2001 From: serr Date: Sun, 13 Apr 2025 16:26:57 +0300 Subject: [PATCH] some changes --- eye.sh | 2 +- mvc/models/models_pages/post.go | 18 +++++++++--------- mvc/models/models_pages/posts.go | 6 +++--- mvc/views/blocks/footer.gohtml | 2 +- mvc/views/pages/posts.gohtml | 8 ++++++-- posts/post-upload-system.md | 4 ++-- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git a/eye.sh b/eye.sh index d2db1e4..2c0e2e5 100755 --- a/eye.sh +++ b/eye.sh @@ -3,7 +3,7 @@ stty -echoctl # Отключает вывод управляющих симво # НАСТРОЙКА СКРИПТА ТУТ ########################################################### DURATION=1 # Задержка между проверками в секундах -WATCH_DIRS=("posts" "mvc" "assets") # Массив директорий для наблюдения +WATCH_DIRS=("posts" "mvc" "assets" "tools") # Массив директорий для наблюдения BINARY_PATH="./main" # Путь до бинарного файла BUILD_CMD="go build -o $BINARY_PATH main.go" # Команда для сборки ################################################################################### diff --git a/mvc/models/models_pages/post.go b/mvc/models/models_pages/post.go index 4be95d9..1562852 100644 --- a/mvc/models/models_pages/post.go +++ b/mvc/models/models_pages/post.go @@ -14,10 +14,10 @@ const ( ) type Post struct { - Link PostLink - Preview template.HTML - Data template.HTML - ModTimestamp int64 + Link PostLink + Preview template.HTML + Data template.HTML + Timestamp int64 } func RenderPostPage(templates *template.Template, version int64, data template.HTML) ([]byte, error) { @@ -36,7 +36,7 @@ func RenderPostPage(templates *template.Template, version int64, data template.H return pageData.Bytes(), nil } -func newPost(link string, data []byte, modTimestamp int64) *Post { +func newPost(link string, data []byte, timestamp int64) *Post { previewBuf := make([]byte, 0, 503) if len(data) > 500 { @@ -47,9 +47,9 @@ func newPost(link string, data []byte, modTimestamp int64) *Post { } return &Post{ - Link: PostLink(link), - Preview: template.HTML(previewBuf), - Data: template.HTML(data), - ModTimestamp: modTimestamp, + Link: PostLink(link), + Preview: template.HTML(previewBuf), + Data: template.HTML(data), + Timestamp: timestamp, } } diff --git a/mvc/models/models_pages/posts.go b/mvc/models/models_pages/posts.go index db13b12..c4806df 100644 --- a/mvc/models/models_pages/posts.go +++ b/mvc/models/models_pages/posts.go @@ -42,8 +42,8 @@ func LoadPosts(dir string) (Posts, error) { html := tools.MdToHTML(md) link := fmt.Sprintf("/%s/", strings.TrimSuffix(filepath.Base(path), ".md")) - modTimestamp := f.ModTime().Unix() - posts[PostLink(link)] = newPost(link, html, modTimestamp) + timestamp := f.ModTime().Unix() + posts[PostLink(link)] = newPost(link, html, timestamp) } return nil }) @@ -65,7 +65,7 @@ func (p *Posts) RenderPostsPage(templates *template.Template, version int64) ([] // Сортирую по ModTimestamp (новые сначала) sort.Slice(postsSlice, func(i, j int) bool { - return postsSlice[i].ModTimestamp > postsSlice[j].ModTimestamp + return postsSlice[i].Timestamp > postsSlice[j].Timestamp }) context := map[string]any{ diff --git a/mvc/views/blocks/footer.gohtml b/mvc/views/blocks/footer.gohtml index 8a438c9..15dee7b 100644 --- a/mvc/views/blocks/footer.gohtml +++ b/mvc/views/blocks/footer.gohtml @@ -13,7 +13,7 @@ some system information: