filter feed items

server/handlers.go

@@ -259,6 +259,15 @@ func FeedHandler(rw http.ResponseWriter, req *http.Request) {
 	}
 }
 
+func findItems(db *storage.Storage, filter storage.ItemFilter) []storage.Item {
+	statusFilter := db.GetSettingsValue("filter")
+	if statusFilter != nil && len(statusFilter.(string)) != 0 {
+		status := storage.StatusValues[statusFilter.(string)]
+		filter.Status = &status
+	}
+	return db.ListItems(filter)	
+}
+
 func FeedItemsHandler(rw http.ResponseWriter, req *http.Request) {
 	id, err := strconv.ParseInt(Vars(req)["id"], 10, 64)
 	if err != nil {
@@ -266,7 +275,7 @@ func FeedItemsHandler(rw http.ResponseWriter, req *http.Request) {
 		return
 	}
 	rw.WriteHeader(http.StatusOK)
-	items := db(req).ListItems(storage.ItemFilter{FeedID: &id})
+	items := findItems(db(req), storage.ItemFilter{FeedID: &id})
 	writeJSON(rw, items)
 }
 
@@ -303,7 +312,7 @@ func FolderItemsHandler(rw http.ResponseWriter, req *http.Request) {
 			rw.WriteHeader(http.StatusBadRequest)
 			return
 		}
-		items := db(req).ListItems(storage.ItemFilter{FolderID: &id})
+		items := findItems(db(req), storage.ItemFilter{FolderID: &id})
 		writeJSON(rw, items)
 	} else {
 		rw.WriteHeader(http.StatusMethodNotAllowed)
@@ -312,7 +321,7 @@ func FolderItemsHandler(rw http.ResponseWriter, req *http.Request) {
 
 func ItemListHandler(rw http.ResponseWriter, req *http.Request) {
 	if req.Method == "GET" {
-		items := db(req).ListItems(storage.ItemFilter{})
+		items := findItems(db(req), storage.ItemFilter{})
 		writeJSON(rw, items)
 	} else {
 		rw.WriteHeader(http.StatusMethodNotAllowed)

storage/settings.go

@@ -10,6 +10,21 @@ func settingsDefaults() map[string]interface{} {
 	}
 }
 
+func (s *Storage) GetSettingsValue(key string) interface{} {
+	row := s.db.QueryRow(`select val from settings where key=?`, key)
+	if row == nil {
+		return settingsDefaults()[key]
+	}
+	var val []byte
+	row.Scan(&val)
+	var valDecoded interface{}
+	if err := json.Unmarshal([]byte(val), &valDecoded); err != nil {
+		s.log.Print(err)
+		return nil
+	}
+	return valDecoded
+}
+
 func (s *Storage) GetSettings() map[string]interface{} {
 	result := settingsDefaults()		
 	rows, err := s.db.Query(`select key, val from settings;`)

template/static/javascripts/app.js

@@ -3,17 +3,16 @@
 var vm = new Vue({
   el: '#app',
   created: function() {
-    this.refresh()
     var vm = this
     api.settings.get().then(function(data) {
-      console.log(1)
       vm.filterSelected = data.filter
-      console.log(1)
+      vm.refreshItems()
     })
+    this.refreshFeeds()
   },
   data: function() {
     return {
-      'filterSelected': 'all',
+      'filterSelected': null,
       'folders': [],
       'feeds': [],
       'feedSelected': null,
@@ -48,28 +47,15 @@ var vm = new Vue({
     },
   },
   watch: {
-    'filterSelected': function(newVal) {
+    'filterSelected': function(newVal, oldVal) {
+      if (oldVal === null) return  // do nothing, initial setup
+      var vm = this
       api.settings.update({filter: newVal}).then(function() {
-        this.$emit('refresh:items')
-      }.bind(this))
+        vm.refreshItems()
+      })
     },
     'feedSelected': function(newVal, oldVal) {
-      var promise = null
-      if (newVal === null) {
-        promise = api.items.list()
-      } else {
-        var parts = newVal.split(':', 2)
-        var type = parts[0]
-        var guid = parts[1]
-        if (type === 'feed') {
-          promise = api.feeds.list_items(guid)
-        } else if (type == 'folder') {
-          promise = api.folders.list_items(guid)
-        }
-      }
-      promise.then(function(items) {
-        vm.items = items
-      })
+      this.refreshItems()
     },
     'itemSelected': function(newVal, oldVal) {
       this.itemSelectedDetails = this.itemsById[newVal]
@@ -80,7 +66,7 @@ var vm = new Vue({
     },
   },
   methods: {
-    refresh: function() {
+    refreshFeeds: function() {
       var vm = this
       Promise
         .all([api.folders.list(), api.feeds.list()])
@@ -89,6 +75,24 @@ var vm = new Vue({
           vm.feeds = values[1]
         })
     },
+    refreshItems: function() {
+      var promise = null
+      if (!this.feedSelected) {
+        promise = api.items.list()
+      } else {
+        var parts = this.feedSelected.split(':', 2)
+        var type = parts[0]
+        var guid = parts[1]
+        if (type === 'feed') {
+          promise = api.feeds.list_items(guid)
+        } else if (type == 'folder') {
+          promise = api.folders.list_items(guid)
+        }
+      }
+      promise.then(function(items) {
+        vm.items = items
+      })
+    },
     toggleFolderExpanded: function(folder) {
       folder.is_expanded = !folder.is_expanded
     },