Skip to content
This repository was archived by the owner on Sep 22, 2022. It is now read-only.

Commit 748a384

Browse files
committed
Increase readability a bit
1 parent cfc4cd3 commit 748a384

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

main.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,13 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
8181

8282
if err != nil {
8383
errorHandler(w, r, status)
84+
8485
return
8586
}
8687

87-
if err := postTemplate.ExecuteTemplate(w, "layout", post); err != nil {
88+
err := postTemplate.ExecuteTemplate(w, "layout", post)
89+
90+
if err != nil {
8891
log.Println(err.Error())
8992
errorHandler(w, r, 500)
9093
}
@@ -93,9 +96,13 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
9396
func errorHandler(w http.ResponseWriter, r *http.Request, status int) {
9497
log.Printf("error %d %s %s\n", status, r.RemoteAddr, r.URL.Path)
9598
w.WriteHeader(status)
96-
if err := errorTemplate.ExecuteTemplate(w, "layout", map[string]interface{}{"Error": http.StatusText(status), "Status": status}); err != nil {
99+
100+
err := errorTemplate.ExecuteTemplate(w, "layout", map[string]interface{}{"Error": http.StatusText(status), "Status": status})
101+
102+
if err != nil {
97103
log.Println(err.Error())
98104
http.Error(w, http.StatusText(500), 500)
105+
99106
return
100107
}
101108
}
@@ -108,8 +115,10 @@ func noDirListing(h http.Handler) http.HandlerFunc {
108115
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
109116
if strings.HasSuffix(r.URL.Path, "/") || r.URL.Path == "" {
110117
http.NotFound(w, r)
118+
111119
return
112120
}
121+
113122
h.ServeHTTP(w, r)
114123
})
115124
}
@@ -146,6 +155,7 @@ type postArray struct {
146155
func newPostArray() *postArray {
147156
p := postArray{}
148157
p.Items = make(map[string]post)
158+
149159
return &p
150160
}
151161

@@ -154,18 +164,23 @@ func newPostArray() *postArray {
154164
// Если путь не существует или является каталогом, то возвращаем ошибку
155165
func (p *postArray) Get(md string) (post, int, error) {
156166
info, err := os.Stat(md)
167+
157168
if err != nil {
158169
if os.IsNotExist(err) {
159170
// файл не существует
160171
return post{}, 404, err
161172
}
173+
162174
return post{}, 500, err
163175
}
176+
164177
if info.IsDir() {
165178
// не файл, а папка
166179
return post{}, 404, fmt.Errorf("dir")
167180
}
181+
168182
val, ok := p.Items[md]
183+
169184
if !ok || (ok && val.ModTime != info.ModTime().UnixNano()) {
170185
p.RLock()
171186
defer p.RUnlock()
@@ -176,6 +191,8 @@ func (p *postArray) Get(md string) (post, int, error) {
176191
body = string(blackfriday.MarkdownCommon([]byte(body)))
177192
p.Items[md] = post{title, template.HTML(body), info.ModTime().UnixNano()}
178193
}
194+
179195
post := p.Items[md]
196+
180197
return post, 200, nil
181198
}

0 commit comments

Comments
 (0)