vnews 0.0.6 → 0.0.7

data/lib/vnews/display.rb

@@ -132,8 +132,10 @@ class Vnews
       @sqliteclient.star_item guid, false
     end
 
-    def delete_item(guid)
-      @sqliteclient.delete_item guid
+    def delete_items(*guids)
+      guids.each do |guid|
+        @sqliteclient.delete_item guid
+      end
     end
 
     def search_items(window_width, term)

data/lib/vnews/feed.rb

@@ -41,10 +41,10 @@ class Vnews
         Vnews.sql_client.insert_feed(f[:meta][:title], feed_url, f[:meta][:link], folder)
       end
       f[:items].each do |item|
+        item[:pub_date] ||= Time.now
         if item[:guid].nil? || item[:guid].strip == ''
-          item[:guid] = [f[:meta][:link], item[:link]].join("+")
+          item[:guid] = [ f[:meta][:link], item[:link], item[:pub_date] ].join("+")
         end
-        item[:pub_date] ||= Time.now
         Vnews.sql_client.insert_item item.merge(:feed => feed_url, :feed_title => f[:meta][:title])
         $stderr.print "."
       end

data/lib/vnews/sql.rb

@@ -97,8 +97,8 @@ class Vnews
     def feeds(order)
       if order == 0 
         # "feeds.title asc" 
-        @client.query("SELECT feeds.*, count(*) as item_count from feeds 
-                      inner join items i on i.feed = feeds.feed_url
+        @client.query("SELECT feeds.*, count(i.unread) as item_count from feeds 
+                      left outer join items i on i.feed = feeds.feed_url
                       where i.unread = true
                       group by feeds.feed_url
                       order by feeds.title asc") 
@@ -148,7 +148,7 @@ class Vnews
 
                 "SELECT items.title, items.guid, items.feed, 
                 items.feed_title, items.pub_date, items.word_count, items.starred, items.unread from items 
-                      inner join feeds_folders ff on  ff.feed = items.feed
+                      left join feeds_folders ff on  ff.feed = items.feed
                       where ff.folder = '#{e folder}' order by items.pub_date asc"
               end
       @client.query query
@@ -160,7 +160,7 @@ class Vnews
 
       if inc_read_count
         # increment the read count for the feed 
-        @client.query "UPDATE feeds set num_items_read = num_items_read + 1 where feed_url = (select feed from items where items.guid = '#{e guid}')"
+        @client.query "UPDATE feeds set num_items_read = num_items_read + 1 where feed_url = (select feed from items where items.guid = '#{e guid}' limit 1)"
       end
 
       query = "SELECT items.* from items where guid = '#{e guid}'"

data/lib/vnews/version.rb

@@ -1,4 +1,4 @@
 class Vnews
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end
 

data/lib/vnews.vim

@@ -19,7 +19,7 @@ let s:list_feed_items_command = s:client_script . 'feed_items '
 let s:show_item_command = s:client_script . 'show_item '
 let s:star_item_command = s:client_script . 'star_item ' " + guid star(bool)
 let s:unstar_item_command = s:client_script . 'unstar_item ' " + guid star(bool)
-let s:delete_item_command = s:client_script . 'delete_item ' " + guid
+let s:delete_items_command = s:client_script . 'delete_items ' " + guids
 let s:search_items_command = s:client_script . 'search_items '
 let s:cat_items_command = s:client_script . 'cat_items '
 
@@ -378,20 +378,21 @@ endfunction
 "------------------------------------------------------------------------
 " DELETE ITEMS
 
-func! s:delete_item() 
+func! s:delete_item()  range
   call s:focus_window(s:listbufnr)
-  let uid = s:get_guid(line('.'))
-  let command = s:delete_item_command . shellescape(uid)
-  let res = system(command)
+  let lnum = a:firstline
+  let items = []
+  while lnum <= a:lastline
+    let guid = s:get_guid(lnum)
+    call add(items, shellescape(guid))
+    let lnum += 1
+  endwhile
+  let command = s:delete_items_command . join(items, ' ')
+  call system(command)
   setlocal modifiable
-  exec "silent " . line('.') . "delete"
+  exec "silent " . a:firstline . "," . a:lastline . "delete"
   setlocal nomodifiable
-  if winnr("$") > 1
-    wincmd p 
-    close
-  end
   redraw
-  echom "Item ".uid." deleted"
 endfunc
 
 "------------------------------------------------------------------------

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Daniel Choi