xmltv 0.8.5 → 0.8.6

data/lib/xmltv/sites/tvgids.rb

@@ -162,7 +162,9 @@ module XMLTV
         end
         rsl.flatten!
       end
-      raise DateError.new(str) if rsl.index(nil)
+      if rsl
+        raise DateError.new(str) if rsl.index(nil)
+      end
       rsl
     end
     def transform(chan_id)
@@ -176,14 +178,19 @@ module XMLTV
           shift = entry['period'] == 'Nacht' ? Dag : 0
           dag, maand, jaar, startuur, startmin, stopuur, stopmin = parse_times(a)
           next if dag.nil?
-          progdata['start'] = start = Time.local(jaar, maand, dag, startuur, startmin) + shift
-          
-          if stopuur
-            stop = Time.local(jaar, maand, dag, stopuur, stopmin) + shift
-            if start > stop && start.hour >= 21 && stop.hour <= 7
-              stop += Dag
+          begin
+            progdata['start'] = start = Time.local(jaar, maand, dag, startuur, startmin) + shift
+            if stopuur
+              stop = Time.local(jaar, maand, dag, stopuur, stopmin) + shift
+              if start > stop && start.hour >= 21 && stop.hour <= 7
+                stop += Dag
+              end
+              progdata['stop'] = stop
             end
-            progdata['stop'] = stop
+          rescue ArgumentError
+            STDERR.puts 'ArgumentError'
+            STDERR.puts jaar, maand, dag, stopuur, stopmin
+            next
           end
           date_stats(chan_id, progdata['start'])
           if (b = entry['bijzonderheden'])

data/lib/xmltv/sites/tvtoday.rb

@@ -162,7 +162,10 @@ module XMLTV
               if year && year > 1900
                 progdata['date'] = year.to_s
               elsif role
-                (progdata['credits'][role] ||= Array.new) << det.gsub(/\(.*\)/,'').strip
+                content = det.gsub(/\(.*\)/,'').strip
+                unless content.empty?
+                  (progdata['credits'][role] ||= Array.new) << content
+                end
               end
             end
             progdata['audio']['stereo'] = 'stereo' if entry['Stereo']

data/lib/xmltv/sites/upc.rb

@@ -89,7 +89,7 @@ module XMLTV
           datum = Date.dutch(page.at('//div.epg_listings_bar1//span').inner_text)
         rescue NoMethodError
           save(url, page)
-          raise
+          raise BadChannelError.new
         end
         if day == 'today' && datum != Date.today
   #        @all_days = Hash.new    ## Invalidate cache

data/lib/xmltv/sites/vpro.rb

@@ -56,8 +56,13 @@ module XMLTV
         program['category'] = detail.at('//p').inner_text.strip.split("\n")[-1]
         program['desc'] = detail.at('//p.summary').inner_text.to_utf.strip rescue ''
       rescue NoMethodError => exc
-        STDERR.puts info, detail
-        raise
+        errfile = '/tmp/vpro.errors'
+        STDERR.puts "Some detail problem, see #{errfile}"
+        File.open(errfile, 'a') do |h|
+          h.puts Time.now
+          h.puts info,'===', detail, '++++++++++++'
+        end
+        
       end
       program
     end

data/lib/xmltv/xmltv.rb

@@ -96,7 +96,7 @@ module XMLTV
       super {|h,v| h[v] = Hash.new }
     end
   end
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
   Progdir = ($LOAD_PATH.find {|x| test(?f, "#{x}/xmltv/xmltv.rb")} || 'lib') + '/xmltv/sites'
   Sites = Dir["#{Progdir}/*.rb"].map{|x| x[0..-4]}.map{|x| File.basename(x)}
   class XmltvOptparser
@@ -283,7 +283,7 @@ module XMLTV
         end
       end
       file = ">#{@grabber.outputfile(chan_id)}"
-      errorfile = '/var/tmp/xmllint-errors'
+      errorfile = "/var/tmp/xmllint-errors-#{Time.now.to_i}"
       if XmltvOptions.validate
         IO.popen(" ( xmllint --valid - | tv_sort #{file} ) 2>#{errorfile}", 'w') do |h|  
           write_xml h
@@ -551,7 +551,7 @@ module XMLTV
       tries = 0
       begin
         open(url) { |h| Hpricot(h) }
-      rescue Errno::ECONNREFUSED, ::Timeout::Error, EOFError
+      rescue Errno::ECONNREFUSED, ::Timeout::Error, EOFError, Errno::ETIMEDOUT
         tries += 1
         sleep 2
         retry if tries <= 3
@@ -703,6 +703,9 @@ module XMLTV
             nprogs = grab_channel(channel)
             pda = transform(channel)
             errors = fix_times(pda)
+          rescue Timeout::Error, Errno::ECONNRESET
+            STDERR.puts "Timeout grab_channel#{channel}"
+            next
           rescue BadChannelError
             STDERR.puts "Zie #{reject_file_name}"
             next

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xmltv
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - Han Holl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-02 00:00:00 +01:00
+date: 2008-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.1
     version: 
 description: "Xmltv consists of a single base grabber and a bunch of site specific grabbers. The base grabber provides: - a driver - option parsing - start/stop time fixing - xml production - helper functions that site specific grabbers might want to use"
 email: hanholl@rubyforge.org
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: xmltv
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: fetches tv program data from various sites