epodder 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d4f519a9c0b22eded9199580b110f7ef13a660
-  data.tar.gz: e03b1b144d3b3e2a955d6155c5ba0143228c03dd
+  metadata.gz: 21e023301a7f8229e28c7d39d02a389e72091bdf
+  data.tar.gz: 6aea7f349ead1585e114be3ef6592923924198ed
 SHA512:
-  metadata.gz: 158d4961b2e61a76f6a55bc3e21ed77c0db38c7a3b5a729d0946dfb17202df49095feb46298fe0212aa63c18786912fc0a901f5d20e319c7d306d6c5e222f021
-  data.tar.gz: 07dcb752b375fc2d72a1448804b070df1788aa29586564cb57d95d89e59062bc8b891545b4921b3acb0c52e7f8965376ede7189edc120c6565dcdec9ba8ba8ef
+  metadata.gz: d01f7f2fcaeb061b369cf8d37b8ab1c447c330d2029dab4bc142030493bd9df0cf858e95ea3f9018a71cdd5e31629a57eb1ea1eb556e89cb0b441ef917a7343b
+  data.tar.gz: 91fc8461eefa3b03e0263d4eef576b08587b5860344e23cae3298185a40b5a2dffbdd2a46cc8725cb9a744f43c322c88744ec33018e544d5082fd4873f2a2224

data/lib/arguments.rb

@@ -24,7 +24,7 @@ module Epodder
             @args[:path] = "~/.epodder"
             cmd = CmdParse::CommandParser.new( true, true )
             cmd.program_name = "ePodder"
-            cmd.program_version = [0, 0, 7]
+            cmd.program_version = [0, 0, 8]
             cmd.options = CmdParse::OptionParserWrapper.new do |opt|
                 opt.separator "Global options:"
                 opt.on("-v", "--verbose", "Be verbose when outputting info") {|t| @args[:verbose] = true }

data/lib/verb/download.rb

@@ -2,9 +2,6 @@ require 'downspout'
 module Epodder
     class Download < Verb
 
-        def initialize
-        end
-
         def download args
             each_argument(args) do |podcast|
                 look_for_episodes podcast
@@ -25,10 +22,14 @@ module Epodder
         def download_episode episode
             begin
                 Downspout::Config.max_redirects = 100
+                Downspout::Config.enable_curb! if Downspout::Config.curb_available?
                 Downspout.download_url_to_path(episode.url, "download/#{episode.podcast.title.strip}/#{episode.url.to_s.match('((?!\/).)*$')}")
                 episode.mark_as_downloaded
             rescue StandardError => e
                 puts e
+                puts e.backtrace
+            ensure
+                episode.mark_as_downloaded if File.exists? "download/#{episode.podcast.title.strip}/#{episode.url.to_s.match('((?!\/).)*$')}"
             end
         end
 

data/lib/verb/update.rb

@@ -3,70 +3,70 @@ require 'feedme'
 require 'mechanize'
 #require 'progress'
 module Epodder
-    class Update < Verb
+  class Update < Verb
 
-        def initialize
-            super
-            @mechanize = Mechanize.new
-        end
-
-        def update args
-            each_argument(args) do |podcast|
-                check_for_new_episodes podcast
-            end
-        end
+    def initialize
+      super
+      @mechanize = Mechanize.new
+    end
 
-        def check_for_new_episodes podcast
-            max_pub = get_max_pubdate podcast
-            open_podcast podcast, max_pub
-        end
+    def update args
+      each_argument(args) do |podcast|
+        check_for_new_episodes podcast
+      end
+    end
 
-        def get_max_pubdate podcast
-            Episode.max(:pub_date, :conditions => { :podcast => podcast }) || Time.at(0).to_date
-        end
+    def check_for_new_episodes podcast
+        max_pub = get_max_pubdate podcast
+        open_podcast podcast, max_pub
+    end
 
-        def open_podcast podcast, max_pub
-            begin
-                @mechanize.get(podcast.uri) do |feed|
-                    @log.info "Maximum pubdate for #{podcast.title} - #{podcast.id} is #{max_pub}"
-                    parse_feed feed, podcast, max_pub
-                end
-            rescue StandardError => e
-                puts "#{podcast.title} - #{e}"
-            end
-        end
+    def get_max_pubdate podcast
+      Episode.max(:pub_date, :conditions => { :podcast => podcast }) || Time.at(0).to_date
+    end
 
-        def parse_feed feed, database_podcast, max_pub
-            podcast = FeedMe.parse feed.body
-            podcast.emulate_atom!
-            pending_episodes = podcast.items.select {|item| is_valid? item, max_pub}
-            pending_episodes.each {|pending_episode| add_eligible_episode database_podcast, pending_episode }
-            length = pending_episodes.length
-            puts "#{database_podcast.title} has #{length} new episodes" if length > 0
+    def open_podcast podcast, max_pub
+      begin
+        @mechanize.get(podcast.uri) do |feed|
+          @log.info "Maximum pubdate for #{podcast.title} - #{podcast.id} is #{max_pub}"
+          parse_feed feed, podcast, max_pub
         end
+      rescue StandardError => e
+        puts "#{podcast.title} - #{e}"
+      end
+    end
 
-        def is_valid? item, max_pub
-            item.enclosure && item.pubdate.to_date > max_pub.to_date 
-        end
+    def parse_feed feed, database_podcast, max_pub
+      podcast = FeedMe.parse feed.body
+      podcast.emulate_atom!
+      pending_episodes = podcast.items.select {|item| is_valid? item, max_pub}
+      pending_episodes.each {|pending_episode| add_eligible_episode database_podcast, pending_episode }
+      length = pending_episodes.length
+      puts "#{database_podcast.title} has #{length} new episodes" if length > 0
+    end
+    
+    def is_valid? item, max_pub
+     item.enclosure && item.pubdate.to_date > max_pub.to_date 
+    end
 
-        def add_eligible_episode podcast, item
-            begin
-                ep = Episode.first_or_create(
-                    :title => item.title,
-                    :url => item.enclosure.url,
-                    :pub_date => item.pubdate.to_date,
-                    :downloaded => false,
-                    :podcast => podcast
-                )
-                ep.errors.each do |error|
-                    @log.error error
-                end
+    def add_eligible_episode podcast, item
+        begin
+          ep = Episode.first_or_create(
+            :title => item.title,
+            :url => item.enclosure.url,
+            :pub_date => item.pubdate.to_date,
+            :downloaded => false,
+            :podcast => podcast
+          )
+          ep.errors.each do |error|
+            @log.error error
+          end
 
-            rescue Exception => e
-                @log.error e
-                raise e
-            end
+        rescue Exception => e
+          @log.error e
+          raise e
         end
-
     end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epodder
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Eric Bergstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -332,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby re-do of hpodder