xmltv 0.8.4 → 0.8.5

data/lib/xmltv/sites/rt.rb

@@ -113,7 +113,8 @@ module XMLTV
         progdata['subtitles']['type'] = 'teletext' if p['subtitles']
         progdata['star-rating']['value'] = "#{p['star_rating']}/5" if p['star_rating']
         if (cast = p['cast'])
-          progdata['credits']['actor'] = 
+          cast = cast.split("\r")[0]
+          progdata['credits']['actor'] = blob = 
             cast.index('|') ?
               cast.split('|').map {|x| x.gsub(/^.*[*]/,'') } :
               cast.split(',')

data/lib/xmltv/sites/tvgids.rb

@@ -150,10 +150,11 @@ module XMLTV
 
     def parse_times(str)
       rsl = nil
+#      STDERR.puts str
       md = /(\d+)\s(\w+)\s(\d+),\s(\d+):(\d+)/.match(str)
       if md
         rsl = md.captures.map do |x|
-            x =~ /\d/ ? x.to_i : Date::Maanden.index(x)
+            x =~ /\d/ ? x.to_i : Date::Maanden.index(x.downcase)
         end
         mdstop = /(\d+):(\d+)/.match(str[md.offset(0)[1]..-1])
         if mdstop
@@ -161,6 +162,7 @@ module XMLTV
         end
         rsl.flatten!
       end
+      raise DateError.new(str) if rsl.index(nil)
       rsl
     end
     def transform(chan_id)
@@ -209,7 +211,10 @@ module XMLTV
             progdata[Titeltrans[key]] = entry[key] if entry[key]
           end
           progdata_array << progdata
-
+        rescue DateError => exc
+          STDERR.puts exc.class, exc.message
+          PP.pp(entry, STDERR)
+          next
         rescue StandardError => exc
           STDERR.puts exc, exc.message, exc.backtrace
           PP.pp(entry, STDERR)

data/lib/xmltv/xmltv.rb

@@ -88,6 +88,7 @@ end
 
 module XMLTV
   class ValidateError < Exception; end
+  class DateError < Exception; end
   class BadChannelError < Exception; end
   class BadSiteError < Exception; end
   class Progdata < Hash
@@ -95,7 +96,7 @@ module XMLTV
       super {|h,v| h[v] = Hash.new }
     end
   end
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
   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
@@ -513,6 +514,9 @@ module XMLTV
         reject('invalid', x) if rsl
         rsl
       end
+      if pda.empty?
+        return 0
+      end
       starttimes = pda.sort do |x, y| 
         if (a = x['start']) != (b = y['start'])
           a <=> b
@@ -547,7 +551,7 @@ module XMLTV
       tries = 0
       begin
         open(url) { |h| Hpricot(h) }
-      rescue Errno::ECONNREFUSED, ::Timeout::Error
+      rescue Errno::ECONNREFUSED, ::Timeout::Error, EOFError
         tries += 1
         sleep 2
         retry if tries <= 3
@@ -707,7 +711,8 @@ module XMLTV
           report(channel, nprogs, errors)
         end
       rescue SystemExit
-        
+      rescue ValidateError => exc
+        STDERR.puts exc.class, exc.message, exc.backtrace
       rescue ::Exception => exc
         STDERR.puts exc.class, exc.message, exc.backtrace
         if XmltvOptions.mailto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xmltv
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors: 
 - Han Holl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-20 00:00:00 +01:00
+date: 2008-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.0
     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