vnews 0.4.1 → 0.4.2

data/lib/vnews/config.rb

@@ -1,6 +1,5 @@
 require 'vnews/sql'
 require 'yaml'
-require 'thread_pool'
 require 'vnews/constants'
 require 'timeout'
 
@@ -87,29 +86,19 @@ class Vnews
 
       puts "Adding feeds: #{(new_feeds - old_feeds).inspect}"
       puts "Adding folder-feed associations: #{(ff - old_ff).inspect}"
-      feeds2 = []
-      pool = ThreadPool.new Vnews::POOLSIZE
-      puts "Using thread pool size of 10"
-      # TODO sometimes feeds are downloaded twice;
       ff.each do |feed_url, folder|
-        pool.process do 
-          begin
-            Timeout::timeout(Vnews::TIMEOUT) do
-              feeds2 << Vnews::Feed.fetch_feed(feed_url, folder)
+        begin
+          Timeout::timeout(Vnews::TIMEOUT) do
+            feed_url, f, folder = *Vnews::Feed.fetch_feed(feed_url, folder)
+            folder ||= "Misc"
+            if f.nil?
+              $stderr.print "\nNo feed found for #{feed_url}\n"
+            else
+              Vnews::Feed.save_feed(feed_url, f, folder)
             end
-          rescue Timeout::Error
-            puts "TIMEOUT ERROR: #{feed_url}"
           end
-        end
-      end
-      pool.join
-      feeds2.each do |x|
-        feed_url, f, folder = *x
-        folder ||= "Misc"
-        if f.nil?
-          $stderr.print "\nNo feed found for #{feed_url}\n"
-        else
-          Vnews::Feed.save_feed(feed_url, f, folder)
+        rescue Timeout::Error
+          puts "TIMEOUT ERROR: #{feed_url}"
         end
       end
       $stderr.puts "\nDone."

data/lib/vnews/feed.rb

@@ -48,6 +48,7 @@ class Vnews
         Vnews.sql_client.insert_item item.merge(:feed => feed_url, :feed_title => f[:meta][:title])
         $stderr.print "."
       end
+      print "\n"
     rescue
       puts "ERROR: dump: #{feed_url.inspect}, #{folder.inspect}: #{f.inspect} "
       raise

data/lib/vnews/folder.rb

@@ -1,5 +1,4 @@
 require 'vnews/feed'
-require 'thread_pool'
 require 'vnews/constants'
 
 class Vnews
@@ -12,25 +11,16 @@ class Vnews
         require 'vnews/display'
         folder = Vnews::Display.strip_item_count(folder)
         puts "Updating folder: #{folder.inspect}"
-        feeds = []
-        pool = ThreadPool.new Vnews::POOLSIZE
-        puts "Using thread pool size of #{Vnews::POOLSIZE}"
         Vnews.sql_client.feeds_in_folder(folder.strip).each do |feed|
-          pool.process do 
-            begin
-              Timeout::timeout(Vnews::TIMEOUT) do 
-                feeds << Vnews::Feed.fetch_feed(feed, folder)
-              end
-            rescue Timeout::Error
-              puts "TIMEOUT ERROR: #{feed_url}"
+          begin
+            Timeout::timeout(Vnews::TIMEOUT) do 
+              feed_url, f, folder = *Vnews::Feed.fetch_feed(feed, folder)
+              Vnews::Feed.save_feed feed_url, f, folder
             end
+          rescue Timeout::Error
+            puts "TIMEOUT ERROR: #{feed_url}"
           end
         end
-        pool.join
-        puts "Saving data to database"
-        feeds.select {|x| x[1]}.compact.each do |feed_url, f, folder|
-          Vnews::Feed.save_feed feed_url, f, folder
-        end
         puts "\nDone"
       end
     end

data/lib/vnews/version.rb

@@ -1,4 +1,4 @@
 class Vnews
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end
 

metadata

@@ -2,7 +2,7 @@
 name: vnews
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Daniel Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency