From 5a34d18ed612b114c4332bebaee2c58742c5be13 Mon Sep 17 00:00:00 2001 From: serr Date: Thu, 10 Apr 2025 21:50:10 +0300 Subject: [PATCH] models_pages and controllers_pages --- main.go | 4 ++-- mvc/controllers/{pages => controllers_pages}/main.go | 4 ++-- mvc/controllers/{pages => controllers_pages}/main_ru.go | 4 ++-- mvc/controllers/{pages => controllers_pages}/post.go | 4 ++-- mvc/controllers/{pages => controllers_pages}/posts.go | 4 ++-- mvc/models/config.go | 8 ++++---- mvc/models/{pages => models_pages}/main.go | 2 +- mvc/models/{pages => models_pages}/main_ru.go | 2 +- mvc/models/{pages => models_pages}/post.go | 4 ++-- mvc/models/{pages => models_pages}/posts.go | 8 ++++---- 10 files changed, 22 insertions(+), 22 deletions(-) rename mvc/controllers/{pages => controllers_pages}/main.go (94%) rename mvc/controllers/{pages => controllers_pages}/main_ru.go (90%) rename mvc/controllers/{pages => controllers_pages}/post.go (94%) rename mvc/controllers/{pages => controllers_pages}/posts.go (93%) rename mvc/models/{pages => models_pages}/main.go (91%) rename mvc/models/{pages => models_pages}/main_ru.go (91%) rename mvc/models/{pages => models_pages}/post.go (94%) rename mvc/models/{pages => models_pages}/posts.go (88%) diff --git a/main.go b/main.go index 58721db..58ca9fd 100644 --- a/main.go +++ b/main.go @@ -4,9 +4,9 @@ import ( "fmt" "log" "main/mvc/controllers" - controllers_pages "main/mvc/controllers/pages" + "main/mvc/controllers/controllers_pages" "main/mvc/models" - models_pages "main/mvc/models/pages" + "main/mvc/models/models_pages" "main/tools" "net/http" ) diff --git a/mvc/controllers/pages/main.go b/mvc/controllers/controllers_pages/main.go similarity index 94% rename from mvc/controllers/pages/main.go rename to mvc/controllers/controllers_pages/main.go index 39f6913..a482693 100644 --- a/mvc/controllers/pages/main.go +++ b/mvc/controllers/controllers_pages/main.go @@ -1,10 +1,10 @@ -package controllers +package controllers_pages import ( "log" "main/mvc/models" - models_pages "main/mvc/models/pages" + "main/mvc/models/models_pages" "main/tools" "net/http" ) diff --git a/mvc/controllers/pages/main_ru.go b/mvc/controllers/controllers_pages/main_ru.go similarity index 90% rename from mvc/controllers/pages/main_ru.go rename to mvc/controllers/controllers_pages/main_ru.go index b2a5da1..5b74e41 100644 --- a/mvc/controllers/pages/main_ru.go +++ b/mvc/controllers/controllers_pages/main_ru.go @@ -1,8 +1,8 @@ -package controllers +package controllers_pages import ( "main/mvc/models" - models_pages "main/mvc/models/pages" + "main/mvc/models/models_pages" "net/http" ) diff --git a/mvc/controllers/pages/post.go b/mvc/controllers/controllers_pages/post.go similarity index 94% rename from mvc/controllers/pages/post.go rename to mvc/controllers/controllers_pages/post.go index 7633ffd..c99af0b 100644 --- a/mvc/controllers/pages/post.go +++ b/mvc/controllers/controllers_pages/post.go @@ -1,8 +1,8 @@ -package controllers +package controllers_pages import ( "main/mvc/models" - models_pages "main/mvc/models/pages" + "main/mvc/models/models_pages" "net/http" ) diff --git a/mvc/controllers/pages/posts.go b/mvc/controllers/controllers_pages/posts.go similarity index 93% rename from mvc/controllers/pages/posts.go rename to mvc/controllers/controllers_pages/posts.go index 90ebc64..ea06d78 100644 --- a/mvc/controllers/pages/posts.go +++ b/mvc/controllers/controllers_pages/posts.go @@ -1,8 +1,8 @@ -package controllers +package controllers_pages import ( "main/mvc/models" - models_pages "main/mvc/models/pages" + "main/mvc/models/models_pages" "net/http" ) diff --git a/mvc/models/config.go b/mvc/models/config.go index 4a26dba..83d95af 100644 --- a/mvc/models/config.go +++ b/mvc/models/config.go @@ -6,7 +6,7 @@ import ( "os" ) -type Config struct { +type config struct { PostsDir string AssetsDir string TemplatesDir string @@ -20,16 +20,16 @@ type Config struct { } var ( - Cfg = Config{} + Cfg = config{} ) func init() { - if err := Cfg.Load("config.json"); err != nil { + if err := Cfg.load("config.json"); err != nil { log.Fatalf("%v", err) } } -func (c *Config) Load(configPath string) error { +func (c *config) load(configPath string) error { configFile, err := os.ReadFile(configPath) if err != nil { return err diff --git a/mvc/models/pages/main.go b/mvc/models/models_pages/main.go similarity index 91% rename from mvc/models/pages/main.go rename to mvc/models/models_pages/main.go index f28ab1b..4f059d7 100644 --- a/mvc/models/pages/main.go +++ b/mvc/models/models_pages/main.go @@ -1,4 +1,4 @@ -package models +package models_pages import ( "bytes" diff --git a/mvc/models/pages/main_ru.go b/mvc/models/models_pages/main_ru.go similarity index 91% rename from mvc/models/pages/main_ru.go rename to mvc/models/models_pages/main_ru.go index 80866ab..05ce8f4 100644 --- a/mvc/models/pages/main_ru.go +++ b/mvc/models/models_pages/main_ru.go @@ -1,4 +1,4 @@ -package models +package models_pages import ( "bytes" diff --git a/mvc/models/pages/post.go b/mvc/models/models_pages/post.go similarity index 94% rename from mvc/models/pages/post.go rename to mvc/models/models_pages/post.go index d35f0b1..e982b94 100644 --- a/mvc/models/pages/post.go +++ b/mvc/models/models_pages/post.go @@ -1,4 +1,4 @@ -package models +package models_pages import ( "bytes" @@ -36,7 +36,7 @@ func RenderPostPage(templates *template.Template, version int64, data template.H return pageData.Bytes(), nil } -func NewPost(link string, data []byte) *Post { +func newPost(link string, data []byte) *Post { previewBuf := make([]byte, 0, 503) if len(data) > 500 { diff --git a/mvc/models/pages/posts.go b/mvc/models/models_pages/posts.go similarity index 88% rename from mvc/models/pages/posts.go rename to mvc/models/models_pages/posts.go index 5eebf85..d56650a 100644 --- a/mvc/models/pages/posts.go +++ b/mvc/models/models_pages/posts.go @@ -1,4 +1,4 @@ -package models +package models_pages import ( "bytes" @@ -26,7 +26,7 @@ var ( ) func init() { - if err := LoadPosts(models.Cfg.PostsDir); err != nil { + if err := loadPosts(models.Cfg.PostsDir); err != nil { log.Fatalf("%v", err) } } @@ -35,7 +35,7 @@ func GetPosts() Posts { return posts } -func LoadPosts(dir string) error { +func loadPosts(dir string) error { err := filepath.Walk(dir, func(path string, f os.FileInfo, err error) error { if err != nil { return err @@ -54,7 +54,7 @@ func LoadPosts(dir string) error { html := tools.MdToHTML(md) link := fmt.Sprintf("/%s/", strings.TrimSuffix(filepath.Base(path), ".md")) - posts[PostLink(link)] = NewPost(link, html) + posts[PostLink(link)] = newPost(link, html) } return nil })