From d7ddcc04b51bc1eb905a88e8d6c0f663c5937eb8 Mon Sep 17 00:00:00 2001
From: Nazar Kanaev <nkanaev@live.com>
Date: Thu, 7 Jan 2021 12:06:14 +0000
Subject: [PATCH] show feed errors

---
 assets/graphicarts/alert-circle.svg |  1 +
 assets/index.html                   |  5 +++++
 assets/javascripts/api.js           |  3 +++
 assets/javascripts/app.js           |  7 +++++++
 server/handlers.go                  |  6 ++++++
 storage/feed.go                     | 20 ++++++++++++++++++++
 6 files changed, 42 insertions(+)
 create mode 100644 assets/graphicarts/alert-circle.svg

diff --git a/assets/graphicarts/alert-circle.svg b/assets/graphicarts/alert-circle.svg
new file mode 100644
index 0000000..8d02b7d
--- /dev/null
+++ b/assets/graphicarts/alert-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="12"></line><line x1="12" y1="16" x2="12.01" y2="16"></line></svg>
\ No newline at end of file
diff --git a/assets/index.html b/assets/index.html
index 338f803..bf5bdee 100644
--- a/assets/index.html
+++ b/assets/index.html
@@ -337,6 +337,11 @@
                             <span class="icon mr-2" v-else><img v-lazy="'/api/feeds/'+feed.id+'/icon'" alt=""></span>
                             {{ feed.title }}
                         </div>
+                        <span class="icon flex-shrink-0 mx-2"
+                              v-b-tooltip.hover.top="feed_errors[feed.id]"
+                              v-if="feed_errors[feed.id]">
+                            {% inline "alert-circle.svg" %}
+                        </span>
                         <div class="flex-shrink-0">
                             <b-dropdown right no-caret lazy variant="link" class="settings-dropdown" toggle-class="text-decoration-none">
                                 <template v-slot:button-content>
diff --git a/assets/javascripts/api.js b/assets/javascripts/api.js
index 55006a6..f7f1280 100644
--- a/assets/javascripts/api.js
+++ b/assets/javascripts/api.js
@@ -43,6 +43,9 @@
       refresh: function() {
         return api('post', '/api/feeds/refresh')
       },
+      list_errors: function() {
+        return api('get', '/api/feeds/errors').then(json)
+      },
     },
     folders: {
       list: function() {
diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index a6d4626..5651278 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -177,6 +177,7 @@ var vm = new Vue({
       },
       'refreshRate': undefined,
       'authenticated': authenticated(),
+      'feed_errors': {},
     }
   },
   computed: {
@@ -529,6 +530,12 @@ var vm = new Vue({
     showSettings: function(settings) {
       this.settings = settings
       this.$bvModal.show('settings-modal')
+
+      if (settings === 'manage') {
+        api.feeds.list_errors().then(function(errors) {
+          vm.feed_errors = errors
+        })
+      }
     },
     resizeFeedList: function(width) {
       this.feedListWidth = Math.min(Math.max(200, width), 700)
diff --git a/server/handlers.go b/server/handlers.go
index 2b18178..af19929 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -31,6 +31,7 @@ var routes []Route = []Route{
 	p("/api/feeds", FeedListHandler),
 	p("/api/feeds/find", FeedHandler),
 	p("/api/feeds/refresh", FeedRefreshHandler),
+	p("/api/feeds/errors", FeedErrorsHandler),
 	p("/api/feeds/:id/icon", FeedIconHandler),
 	p("/api/feeds/:id", FeedHandler),
 	p("/api/items", ItemListHandler),
@@ -229,6 +230,11 @@ func FeedRefreshHandler(rw http.ResponseWriter, req *http.Request) {
 	}
 }
 
+func FeedErrorsHandler(rw http.ResponseWriter, req *http.Request) {
+	errors := db(req).GetFeedErrors()
+	writeJSON(rw, errors)
+}
+
 func FeedIconHandler(rw http.ResponseWriter, req *http.Request) {
 	id, err := strconv.ParseInt(Vars(req)["id"], 10, 64)
 	if err != nil {
diff --git a/storage/feed.go b/storage/feed.go
index 691791c..9ac6e8a 100644
--- a/storage/feed.go
+++ b/storage/feed.go
@@ -150,3 +150,23 @@ func (s *Storage) SetFeedError(feedID int64, lastError error) {
 		s.log.Print(err)
 	}
 }
+
+func (s *Storage) GetFeedErrors() map[int64]string {
+	errors := make(map[int64]string)
+
+	rows, err := s.db.Query(`select feed_id, error from feed_errors`)
+	if err != nil {
+		s.log.Print(err)
+		return errors
+	}
+
+	for rows.Next() {
+		var id int64
+		var error string
+		if err = rows.Scan(&id, &error); err != nil {
+			s.log.Print(err)
+		}
+		errors[id] = error
+	}
+	return errors
+}