present errors that occur
This commit is contained in:
parent
bdc93d5596
commit
01f7904b14
|
@ -44,6 +44,7 @@ func (app *application) generateRss(w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
feed := feedInfo.GenerateRSS()
|
||||
data := newTemplateData(r)
|
||||
data.Errors = feedInfo.Errors
|
||||
data.Feeds = append(data.Feeds, feed)
|
||||
app.renderElem(w, http.StatusOK, "feed-output.tmpl.html", data)
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@ type templateData struct {
|
|||
CurrentYear int
|
||||
Feeds []string
|
||||
Title string
|
||||
Errors map[string]string
|
||||
}
|
||||
|
||||
func newTemplateCache() (map[string]*template.Template, error) {
|
||||
|
|
|
@ -36,7 +36,7 @@ type FeedInfo struct {
|
|||
SiteDesc string
|
||||
PageUrls []string
|
||||
Items []*FeedItem
|
||||
errors map[string]error
|
||||
Errors map[string]string
|
||||
}
|
||||
|
||||
type FeedItem struct {
|
||||
|
@ -99,7 +99,7 @@ func getHtmlElement(doc *html.Node, tag string) (*html.Node, error) {
|
|||
}
|
||||
f(doc, tag)
|
||||
if element == nil {
|
||||
return nil, fmt.Errorf("no <%s> element found", tag)
|
||||
return nil, fmt.Errorf("no <%s> element found", tag)
|
||||
}
|
||||
return element, nil
|
||||
}
|
||||
|
@ -148,7 +148,7 @@ func NewFeedItem(url string) (*FeedItem, error) {
|
|||
item := FeedItem{
|
||||
Url: url,
|
||||
}
|
||||
item.ParseContent(rawhtml);
|
||||
err = item.ParseContent(rawhtml);
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Could not parse feed item: %w", err)
|
||||
}
|
||||
|
@ -161,11 +161,12 @@ func NewFeedInfo(name, base_url, desc, author string, page_urls...string) (*Feed
|
|||
SiteUrl: base_url,
|
||||
SiteDesc: desc,
|
||||
PageUrls: page_urls,
|
||||
Errors: make(map[string]string, 10),
|
||||
}
|
||||
for _,url := range info.PageUrls {
|
||||
item, err := NewFeedItem(url)
|
||||
if err != nil {
|
||||
info.errors[url] = err
|
||||
info.Errors[url] = err.Error()
|
||||
} else {
|
||||
info.Items = append(info.Items, item)
|
||||
}
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{{ range .Feeds }}
|
||||
<h2>Output</h2>
|
||||
{{ range $url, $error := .Errors }}
|
||||
<p class="error">
|
||||
Error parsing page at {{ $url }}: {{ $error }}
|
||||
</p>
|
||||
{{end}}
|
||||
{{ range .Feeds }}
|
||||
<button id="copy" onclick="copyToClipboard()">Copy to Clipboard</button>
|
||||
<textarea readonly="true" cols="80" rows="120" id="feed-output">
|
||||
{{ . }}
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
#output {
|
||||
white-space: pre;
|
||||
}
|
||||
|
||||
body {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
@ -19,3 +15,6 @@ input, textarea {
|
|||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.error {
|
||||
color: red;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue