xmltv2html 0.6.1 → 0.7.0

data/bin/xmltv2html.rb

@@ -1,9 +1,10 @@
+#!/usr/bin/ruby -w
+# With Ruby 1.8.3, yaml gives a lot of warnings... :-(( Fixed with 1.8.4
 #!/usr/bin/env ruby
-#!/usr/bin/ruby -w   # With Ruby 1.8.3, yaml gives a lot of warnings... :-((
 #
 #   xmltv2html.rb - A Ruby script to transform the XMLTV output into HTML.
 #
-#   Version  : 0.6.1
+#   Version  : 0.7.0
 #   Author   : Kurt V. Hindenburg <public@kurt.hindenburg.name>
 #
 #   Copyright (C) 2003, 2004, 2005 Kurt V. Hindenburg
@@ -38,8 +39,6 @@ file and a CSS file.
 = OPTIONS
 : -c, --configfile=FILE
   Configuration file to use.
-: --noconfigfile
-  Do not use any configuration file.
 : --urlprev=URL
   URL for previous link.
 : --urlnext=URL
@@ -63,7 +62,6 @@ Written by Kurt V. Hindenburg <public@kurt.hindenburg.name>
 = SEE ALSO
 * ((<"xmltv2html.rb home page - http://xmltv2html.rubyforge.org/"|URL:http://xmltv2html.rubyforge.org/>))
 * ((<"xmltv home page - http://sourceforge.net/projects/xmltv"|URL:http://sourceforge.net/projects/xmltv>))
-* ((<"REXML home page - http://www.germane-software.com/software/rexml"|URL:http://www.germane-software.com/software/rexml>))
 = BUGS
 * Please process the xmltv.xml file through tv_sort ((*before*)) using xmltv2html.rb
  
@@ -75,10 +73,10 @@ require 'rexml/document'
 require 'singleton' 
 require 'time'
 require 'set'
+require 'ostruct'
 
-
-XMLTV2HTML_VERSION="0.6.1"
-XMLTV2HTML_DATE="Dec 21, 2005"
+XMLTV2HTML_VERSION="0.7.0"
+XMLTV2HTML_DATE="Feb 13, 2006"
 
 class Time
    class << self
@@ -95,9 +93,8 @@ class Time
    end
 
    ### object.<method>
-
    def round_to_interval
-      self - (self.min % @@options['time_divisor']) * 60
+      self - (self.min % @@options[:time_divisor]) * 60
    end
 
 end
@@ -113,79 +110,55 @@ module XMLTV2HTML
       exit(1)
    end
 
-   def test
-#      info "The West Wing=", @@options['favorites'].include?('The West Wing')
-#      info "EXTRA=", @@options['favorites'].include?('EXTRA')
-#      info "Lay & Order=", @@options['favorites'].include?("Law & Order")
-#      info "Categories=",  @@options['categories'].class
-#      info "Categories=",  @@options['categories']
-#      info "start_time=",@@options['start_time']
-#      info "stop_time=",@@options['stop_time']
-   end
-
    class ConfReader
       def initialize
          @@options = self      # set Module variable
          @cmd_line_options = nil
          clear
          set_defaults
-#         info "default config_file=",@@options['config_file']
          parse_command_line_options_for_config_file
-#         info "cmd_line config_file=",@@options['config_file']
-#      info "cmd_line start_time=",@@options['start_time']
-#      info "cmd_line stop_time=",@@options['stop_time']
-
 
-         read_conf if @@options['use_config_file']
-#      info "start_time=",@@options['start_time']
-#      info "stop_time=",@@options['stop_time']
+         read_conf if @@options[:use_config_file]
          parse_command_line_options
-#      info "start_time=",@@options['start_time']
-#      info "stop_time=",@@options['stop_time']
-#         info "config_file=",@@options['config_file']
 
          # convert favorites_list to Set for faster lookup
-         @@options['favorites'] = Set.new @@options['favorites_list' ]
-
-         test
+         @@options[:favorites] = Set.new @@options[:favorites_list]
       end
 
       # Don't edit these, use an external xmltv2htmlrc file.
       def set_defaults 
          @tree = { 
-            'verbose' => false,
-            'times_interval' => 4,
-            'channels_interval' => 4,
-            'time_format_12' => true,
-            'use_favorites' => false,
-            'output_favorites' => false,
-            'favorites_list' => [],
-            'css_filename' => 'xmltv2html.css',
-            'categories' => {},
-            'output_date_in_time' => false,
-            'date_format' => '%a %d',
-            'use_programme_popup' => true,
-            'programme_popup_method' => "DHTML",
-            'popup_title_format' => "%T",
-            'popup_body_format' => "%S %P<br />%D<br />Rating: %R",
-            'popup_title_color' => "#FFFFFF",
-            'popup_title_font' => "",
-            'popup_title_font_size' => "2",
-            'popup_title_background_color' => "#000099",
-            'popup_body_color' => "#000000",
-            'popup_body_font' => "",
-            'popup_body_font_size' => "1",
-            'popup_body_background_color' => "#E8E8FF",
-            'popup_body_width' => "200",
-            'output_links' => false,
-            'start_time' => "",
-            'stop_time' => "",
-            'start_date' => "",
-            'stop_date' => "",
-            'time_divisor' => 10, # Divide programmes' times in X minute slots
-            'total_hours' => 0,
-            'config_file' => "",
-            'use_config_file' => true,
+            :verbose => false,
+            :times_interval => 4,
+            :channels_interval => 4,
+            :time_format_12 => true,
+            :use_favorites => false,
+            :output_favorites => false,
+            :favorites_list => [],
+            :css_filename => 'xmltv2html.css',
+            :categories => {},
+            :output_date_in_time => false,
+            :date_format => '%a %d',
+            :use_programme_popup => true,
+            :programme_popup_method => "DHTML",
+            :popup_title_format => "%T",
+            :popup_body_format => "%S %P<br />%D<br />Rating: %R",
+            :popup_title_color => "#FFFFFF",
+            :popup_title_font => "",
+            :popup_title_font_size => "2",
+            :popup_title_background_color => "#000099",
+            :popup_body_color => "#000000",
+            :popup_body_font => "",
+            :popup_body_font_size => "1",
+            :popup_body_background_color => "#E8E8FF",
+            :popup_body_width => "200",
+            :output_links => false,
+            :start_time => "",
+            :stop_time => "",
+            :time_divisor => 10, # Divide programmes' times in X minute slots
+            :total_hours => 0,
+            :config_file => "",
+            :use_config_file => true,
          }
       end
 
@@ -202,8 +175,8 @@ module XMLTV2HTML
       end
 
       def read_conf
-         return if @@options['config_file'].empty?
-         f=File.expand_path(@@options['config_file'])
+         return if @@options[:config_file].empty?
+         f=File.expand_path(@@options[:config_file])
          if not File.exists?(f) or not File.stat(f).readable_real?
             info "* Unable to read #{f}\n"
             return 
@@ -211,12 +184,12 @@ module XMLTV2HTML
          new_xmltv2htmlrc_format = false
          File.open(f, "r") do |aFile|
             first_line = aFile.gets
-            new_xmltv2htmlrc_format = true if first_line =~ /^#config_version: 1/
+            new_xmltv2htmlrc_format = true if first_line =~ /^#config_version: 2/
          end
          if new_xmltv2htmlrc_format == false
-            info "\nWhoa!  You are using an old xmltv2htmlrc format file (v0.5.x)."
+            info "\nWhoa!  You are using an old xmltv2htmlrc format file (< v0.7.x)."
             info "Please update your xmltv2htmlrc using the sample file provided"
-            info "with xmltv2html-0.6.0+."
+            info "with xmltv2html-0.7.0+."
             die "\n"
          end
          info "^ Reading #{f}\n"
@@ -229,12 +202,11 @@ module XMLTV2HTML
          ARGV.each do
             |opts|
             if opts =~ /--configfile=/
-               @@options['config_file'] = opts.split(/=/)[1]
+               @@options[:config_file] = opts.split(/=/)[1]
             end
          end
       end
 
-      # TODO: This has to be a better way to do this...
       def parse_command_line_options
          ARGV.options do
             |opts|
@@ -245,17 +217,17 @@ module XMLTV2HTML
             opts.on_tail("common options:")
 
             opts.on("--configfile=FILE", String, "config file to use") {
-               |@@options['config_file']|}
+               |@@options[:config_file]|}
 
             opts.on("--starttime=YYYYMMDDHHMM", String, "Start time") {
-               |@@options['start_time']|}
+               |@@options[:start_time]|}
             opts.on("--stoptime=YYYYMMDDHHMM", String, "Stop time") {
-               |@@options['stop_time']|}
+               |@@options[:stop_time]|}
 
             opts.on("--urlprev=URL", String, "URL for previous link") {
-               |@@options['url_prev']|}
+               |@@options[:url_prev]|}
             opts.on("--urlnext=URL", String, "URL for next link") {
-               |@@options['url_next']|}
+               |@@options[:url_next]|}
 
             # no argument, shows at tail
             opts.on_tail("-h", "--help", "show this message") {puts opts; exit}
@@ -282,86 +254,103 @@ EOF
 
    end
 
-class ProgrammeTime
-   attr_reader(:fullStartTime, :fullStopTime)
-
-   def initialize(start, stop)
-      @fullStartTime = Time.parse_xmltv_time(start)
-      @fullStopTime  = Time.parse_xmltv_time(stop)
-
-      #$stderr.print "#{@fullStartTime}; "
-      @fullStartTime = @fullStartTime.round_to_interval
-      #$stderr.print "after #{@fullStartTime} \n"
-      @fullStopTime = @fullStopTime.round_to_interval
-
-      @start_date = nil
-      @stop_date = nil
-   end
-
-   def returnParsedTime(t)
-      begin
-         pt = Time.parse(t)
-      rescue ArgumentError
-         die "Unable to parse #{t}\n\n"
-      end
-      pt
-   end
-
-   def calculateStartSlot
-      return if @@options['start_date'] == nil     # 1st pass
-      @start_date = returnParsedTime(@@options['start_date']) if not @start_date
-
-      start_diff_min = ((@fullStartTime - @start_date) / 60).to_i
-#      $stderr.print ", diff #{start_diff_min}"
-      start_slot = start_diff_min / @@options['time_divisor']
-#      $stderr.print "starting slot  #{start_slot}\n"
-      start_slot
-   end
-   def calculateStopSlot
-      return if @@options['stop_date'] == nil     # 1st pass
-
-      @start_date = returnParsedTime(@@options['start_date']) if not @start_date
-      stop_diff_min = ((@fullStopTime - @start_date) / 60).to_i
-      stop_slot = stop_diff_min / @@options['time_divisor']
-#      $stderr.print " stoping slot  #{stop_slot}\n"
-
-#      (@fullStopTime.hour *  60 / $timeDivisor) + (@fullStopTime.min / $timeDivisor)
-      stop_slot
-   end
-
-end
-
 class Programme
    attr_reader :title, :subtitle, :span, :times, :desc, :rating, :category
    attr_reader :previouslyShown, :spanSlots, :startSlot
-   attr_accessor :popupIndex
+   attr_accessor :startTimeStr, :stopTimeStr
+   attr_accessor :startTime, :stopTime, :popupIndex
 
    def initialize(title, subtitle, channel, start, stop, desc, rating, cats, rerun)
       @title = title
       @subtitle = subtitle
       @channelid = channel
+      @startTimeStr = start
+      @stopTimeStr = stop
       @desc = desc
       @rating = rating
       @category = cats
       @previouslyShown = rerun
       @popupIndex = -1
+      @startTime = nil
+      @stopTime = nil
+      @startSlot = 0
+      @stopSlot = -1
+
+      @title.gsub!(/[\"\'\`]/,'')     # Remove "'`
+      @title = @title.unpack("U*").pack("C*")
+
+      @subtitle = "" if not @subtitle
+      @subtitle.gsub!(/[\"\'\`]/,'')     # Remove "'`
+
+      @desc = "" if not @desc
+      @desc.gsub!(/[\"\'\`]/,'')     # Remove "'`
+      @desc = @desc.unpack("U*").pack("C*")
 
-      @times = ProgrammeTime.new(start, stop)
+      @rating = "" if not @rating
+      @rating.gsub!(/[\"\'\`]/,'')     # Remove "'`
+
+#      @times = ProgrammeTime.new(start, stop)
+      setStartTime(start) if start
+      setStopTime(stop) if stop
    end
 
-   # Slot interval = 12  (60 minutes / 5 minutes)
-   def calculateSlots
-      @startSlot = @times.calculateStartSlot
-      @stopSlot = @times.calculateStopSlot
+   # Change start time
+   def setStartTime(start)
+#$stderr.print "setStartTime=#{start}\n"
+      case start
+      when String
+         begin
+            @startTimeStr = start
+            @startTime  = Time.parse_xmltv_time(@startTimeStr)
+         end
+      when Time
+         begin
+            @startTime = start
+            @startTimeStr = start.strftime("%Y%m%d%H%M%S")
+         end
+      end
+   end
 
-      return if not @startSlot
-      return if not @stopSlot
+   # Change stop time
+   def setStopTime(stop)
+      case stop
+      when String
+         begin
+            @stopTimeStr = stop
+            @stopTime  = Time.parse_xmltv_time(@stopTimeStr)
+         end
+      when Time
+         begin
+            @stopTime = stop
+            @stopTimeStr = stop.strftime("%Y%m%d%H%M%S")
+         end
+      end
+   end
+
+   def calculateProgrammeSlots
+
+      listing_start_time = Time.parse_xmltv_time(@@options[:start_time])
+
+      start_diff_min = ((@startTime - listing_start_time) / 60).to_i
+      @startSlot = start_diff_min / @@options[:time_divisor]
+
+      stop_diff_min = ((@stopTime - listing_start_time) / 60).to_i
+      @stopSlot = stop_diff_min / @@options[:time_divisor]
 
       @spanSlots = @stopSlot - @startSlot
+
+#$stderr.print "startSlot=#{@startSlot}, stopSlot=#{@stopSlot}, spanSlots=#{@spanSlots}\n"
+
    end
 
-   def to_s
-      @title
+   def calculateTimeData
+
+      @startTime = Time.parse_xmltv_time(@startTimeStr)
+      @stopTime  = Time.parse_xmltv_time(@stopTimeStr)
+
+      setStartTime @startTime.round_to_interval
+      setStopTime @stopTime.round_to_interval
+
    end
 
 end
@@ -395,7 +384,8 @@ end
 
 class Channel
    attr_reader(:name, :id, :fullname)
-   attr_reader(:programmes)
+   attr_accessor(:programmes)
+#   attr_reader(:programmes)
    attr_accessor(:totalSpan)
 
    def initialize(id, fn)
@@ -417,39 +407,69 @@ class Channel
    end
 
    def number_of_programmes
-      @programmes[@id].size
+      return @programmes[@id].size if @programmes[@id]
+      0
    end
 
    def programme_at(i)
-      @programmes[@id][i]
+      @programmes[@id][i] if @programmes[@id]
+   end
+
+   def addDummyProgramme(index, start, stop)
+      info  "\n * Adding dummy programme: #{start}, #{stop}\n" +
+            "   This could indicate a problem with your xmltv grabber.\n\n"
+
+      @programmes[@id][index,0] = Programme.new("No Data", "", @id,
+                                             start, stop, "", "", 
+                                             "", false)
+      @programmes[@id][index].calculateTimeData
+      @programmes[@id][index].calculateProgrammeSlots
    end
 
    # Verify that each show's STOP date is the next show's START date
-   # Should not be needed if tv_sort was used.
-   # TODO: remove this once we can verify tv_sort was used on input data
+   # tv_sort doesn't fix all the start/stop issues...
    def verifyStopDate
-#      @programmeList.each_index { |si|
-#         s = @programmeList[si]
-#         next_show = @programmeList[si.succ]
-#         next if next_show == nil
-#         next if s.times.fullStopTime == next_show.times.fullStartTime
-#
-#         die "\n * A programme's stop time does not match the next \n" +
-#             " * programme's start time. \n" +
-#             " * Use tv_sort from the xmltv distribution to correct!\n" +
-#             " * Exiting...\n\n" if !stop
-#      }
-   end
+      dummy_record = OpenStruct.new
+      dummy_progs = []
+
+      @programmes[@id].each_index { |si|
+         s = @programmes[@id][si]
+         next_show = @programmes[@id][si.succ]
+         next if next_show == nil
+         next if s.stopTime == next_show.startTime
+
+         if s.stopTime > next_show.startTime
+            die "\n * Whoa...this is bad!\n" +
+             " *  Previous programme's stop time #{s.stopTime}, next\n" +
+             " *  programme's start time #{next_show.startTime}\n\n"
+         end
 
-   def calc_programme_slots
+         dummy_record.index = si + 1
+         dummy_record.start = s.stopTime
+         dummy_record.stop = next_show.startTime
+         dummy_progs << dummy_record
 
-      @programmes[@id].each { |p|
-         p.calculateSlots
+            addDummyProgramme(si + 1, s.stopTime, next_show.startTime)
+
+#             info " * Using tv_sort from the xmltv may correct this!\n" +
+#             " * Currently xmltv2html is unable to continue...\n\n" +
+#             " *  Previous programme's stop time #{s.stopTime}, next\n" +
+#             " *  programme's start time #{next_show.startTime}\n\n" +
+#             " *  Previous programme's stop time #{s.stopTimeStr}, next\n" +
+#             " *  programme's start time #{next_show.startTimeStr}\n\n"
       }
    end
 
+
+   def calc_programme_slots
+#         $stderr.print "\n# programmes=#{number_of_programmes}\n\n"
+#      @programmes[@id].each { |p|
+#         p.calculateSlots
+#      }
+   end
+
    def calculateSlots(slist)
-      tinterval = @@options['channels_interval'] * 60 / @@options['time_divisor']
+      tinterval = @@options[:channels_interval] * 60 / @@options[:time_divisor]
       left = []
       right = slist.dup
       index = 0
@@ -503,8 +523,8 @@ class Channel
       times_counter = 1
       sindex = 0
       total = 0
-      if @@options['channels_interval'] > 0
-         tinterval = @@options['channels_interval'] * 60 / @@options['time_divisor']
+      if @@options[:channels_interval] > 0
+         tinterval = @@options[:channels_interval] * 60 / @@options[:time_divisor]
       else
          tinterval = 9999
       end
@@ -512,19 +532,40 @@ class Channel
 
       slist = Array.new
 
-
       s = @programmes[@id].first    # 1st programme for this channel
+#      $stderr.print "### programmes=#{@programmes[@id].size}\n"
 
-      if s.startSlot() > 0                  # Missing programme at start
-         dummy_span = s.startSlot() - span_counter
+#      $stderr.print "#{s.class}, startSlot=#{s.startSlot}\n"
+#      $stderr.print "startSlot=#{s.startTime},#{s.startTimeStr}\n"
+      if s.startSlot > 0                  # Missing programme at start
+         dummy_span = s.startSlot - span_counter
          slist.push "D"+dummy_span.to_s
       end
 
       @programmes[@id].each { |s|
-         slist.push "P"+s.spanSlots.to_s
+#         if s.title == "No Data"    # Where we had to add dummy in middle
+#            slist.push "D"+s.spanSlots.to_s 
+#            $stderr.print "push dummy...slots=#{s.spanSlots.to_s}\n"
+#         else
+            slist.push "P"+s.spanSlots.to_s  # if s.spanSlots
+#         end
       }
 
-      if @@options['channels_interval'] > 0
+      slist.each { |entry| 
+         span = entry.slice(1..-1).to_i
+         total += span
+      }
+
+      dinterval = @@options[:total_hours] * 60 / @@options[:time_divisor]
+#$stderr.print "totalhours=#{@@options[:total_hours]}\n"
+#$stderr.print "total=#{total}, dinterval=#{dinterval}\n"
+      if total < dinterval       # Not enough programmes' data at end
+         slist.push("D"+(dinterval - total).to_s)
+      end
+#$stderr.print slist,"\n"
+
+      total = 0
+      if @@options[:channels_interval] > 0
          sl = calculateSlots(slist)
          while sl != slist
             slist = sl.dup
@@ -536,23 +577,11 @@ class Channel
          span = entry.slice(1..-1).to_i
          l.push entry
          total += span
-         l.push("C0") if (total % tinterval) == 0 and @@options['channels_interval'] > 0
+         l.push("C0") if (total % tinterval) == 0 and @@options[:channels_interval] > 0
       }
 
       slist = l.unshift("C0")    # Add left-most channel
-      # Add left-most channel if not already there
-#      slist = l
-#      slist = l.unshift("C0") if l[0] != "C0"   
-#      slist = l.unshift("C0") if l[0, 1] != "C0"   
-#      $stderr.print slist[0, 3],"\n"
-#      $stderr.print l[0, 3],"\n"
-
-      dinterval = @@options['total_hours'] * 60 / @@options['time_divisor']
-      if total < dinterval       # Not enough programmes' data at end
-         slist.push("D"+(dinterval - total).to_s)
-         slist.push("C0") if dinterval % tinterval == 0
-      end
-
+#$stderr.print slist,"\n"
       slist
    end
 
@@ -572,7 +601,6 @@ class Channels < Hash
    end
 
    def calc_programmes_slots
-
       each { |id, c|
          c.calc_programme_slots
       }
@@ -608,8 +636,9 @@ class XmlTV
       @top_title = ""
       @HTML_title = ""
       @top_title += @srcInfoName + " :: " if @srcInfoName
-      t1 = Time.parse(@firstShowStartDate)
-      t2 = Time.parse(@lastShowStopDate)
+      t1 = Time.parse(@@options[:start_time])
+      t2 = Time.parse(@@options[:stop_time])
+#      t2 = Time.parse(@lastShowStopDate)
 
       @time_first = t1.strftime("%a %b %d %I:%M %p")
       @time_last = t2.strftime("%a %b %d %I:%M %p %Z")
@@ -642,6 +671,9 @@ class XmlTV
          }
          channels[id] = Channel.new(id, fn)
       }
+      if channels.size < 1
+         die "No channels in the input file!"
+      end
    end
 
    def parseProgrammes
@@ -653,60 +685,13 @@ class XmlTV
          rating=""
          cats = nil
          rerun = false
-         ndesc = ""
          start = element.attributes["start"]
          stop = element.attributes["stop"]
-         die "\n * No stop attribute in this programme...\n" +
-             " * Use tv_sort from the xmltv distribution to correct!\n" +
-             " * Exiting...\n\n" if !stop
+         dstart = ""
+         dstop= ""
 
          dstart = start[0..13]
-         dstop = stop[0..13]
-         ext = start[14..-1]
-
-#         info "start_time=",@@options['start_time']
-#         info "stop_time=",@@options['stop_time']
-#         info "empty?" ,@@options['start_time'].empty?
-         if not @@options['start_time'].empty?
-            nstart = @@options['start_time'].clone
-            nstart[10..11] = @@options['time_divisor'].to_s
-
-            # If programme ends before the desired start time...
-            # Adjust for the time_divisor (round_to_interval)
-            if dstop < nstart
-#               info "Delete programme - Desired start  : #{@@options['start_time']}, "
-#            $stderr.print "Delete programme - Desired start  : #{$params.start_time}, "
-#            $stderr.print "programme stop : #{dstop}\n"
-#            $stderr.print "Old start time = #{$params.start_time}, new=#{nstart}\n"
-               next
-            end
-         end
-         # If programme starts after the desired stop time...
-         if (not @@options['stop_time'].empty?) and (dstart >= @@options['stop_time'])
-#            $stderr.print "Delete programme - Desired stop  : #{$params.stop_time}, "
-#            $stderr.print "programme start : #{dstart}\n"
-#            info "programme start : #{dstart}\n"
-            next
-         end
-
-         # If programme starts before the desired start time, change start
-         if (not @@options['start_time'].empty?) and (dstart < @@options['start_time'])
-#            info "Change Start - new start  : "
-#            $stderr.print "Change Start - new start  : #{$params.start_time}, "
-#            $stderr.print "old start: #{dstart}\n"
-#            ndesc = "(" + start[8..9] +  ":" + start[10..11] + ") "
-
-            start = @@options['start_time'] + ext
-            dstart = start[0..13]
-         end
-
-
-         # If programme ends after the desired stop time, change stop
-         if (not @@options['stop_time'].empty?) and (dstop > @@options['stop_time'])
-            stop = @@options['stop_time'] + ext
-#            info "Change Stop - new stopt  : "
-            dstop = stop[0..13]
-         end
+         dstop = stop[0..13] if stop
 
          @firstShowStartDate = dstart if @firstShowStartDate > dstart
          @lastShowStartDate = dstart if @lastShowStartDate < dstart
@@ -726,34 +711,126 @@ class XmlTV
             # Check to see if user want to use special CSS class for category
             # FIXME: What happens when more than 1 category is triggered?
             if e.name == "category"
-               if @@options['categories'].has_key?(e.text())
-                  cats = @@options['categories'][e.text()];
+               if @@options[:categories].has_key?(e.text())
+                  cats = @@options[:categories][e.text()];
                end
             end
          }
-
-         title.gsub!(/[\"\'\`]/,'')     # Remove "'`
-         title = title.unpack("U*").pack("C*")
          
-         subtitle = "" if not subtitle
-         subtitle.gsub!(/[\"\'\`]/,'')     # Remove "'`
-
-         desc = "" if not desc
-         desc.gsub!(/[\"\'\`]/,'')     # Remove "'`
-         desc = desc.unpack("U*").pack("C*")
-         desc = ndesc + desc if ndesc
-
-         rating = "" if not rating
-         rating.gsub!(/[\"\'\`]/,'')     # Remove "'`
-#$stderr.print "title=#{title}, desc=#{desc}, rating=#{rating}\n"
-
-         p = Programme.new(
-            title, subtitle, channel, start, stop, desc, rating, cats, rerun)
-#         plist[channel] = p
-         channels[channel] << p
+         channels[channel] <<  Programme.new(title, subtitle, channel,
+                                             start, stop, desc, rating, 
+                                             cats, rerun)
+      }
+
+      channels.each { |id, c|
+         if c.number_of_programmes < 1
+            die "No programmes for channel #{id} in the input file!"
+         end
       }
    end
 
+   # Set :start_time and :stop_time if needed.
+   # Adjust start/stop_time to round to next hour
+   # Add stop time, should be very last programme stop time.
+   # Correct start, stop times due to --starttime, --stoptime
+   # Remove programmes that are too short
+   # Remove programmes which stop before --starttime
+   # Remove programmes which start after --stoptime
+   def filterProgrammes
+#      $stderr.print "@firstShowStartDate=#{@firstShowStartDate}\n"
+#      $stderr.print "@lastShowStartDate =#{@lastShowStartDate}\n"
+#      $stderr.print "@lastShowStopDate  =#{@lastShowStopDate}\n"
+
+      # Set if --starttime= nor --stoptime= not given.
+      if (@@options[:start_time].empty?)
+         @@options[:start_time] = @firstShowStartDate  
+      end
+      if (@@options[:stop_time].empty?)
+         @@options[:stop_time] = @lastShowStopDate  
+      end
+
+      # Force start/stop time on hour
+      @@options[:start_time][10,4] = "0000"
+
+      if @@options[:stop_time][10,2] != "00"
+         hour = (@@options[:stop_time][8,2]).to_i + 1
+         if hour > 23      # Next day
+            pstop = Time.parse(@@options[:stop_time]) + (3600)
+            @@options[:stop_time] = pstop.strftime("%Y%m%d%H%M%S")
+            @@options[:stop_time][12,2] = "00"
+         end
+         # FIXME: Below still needed?
+         @@options[:stop_time][8,2] = hour.to_s.rjust(2).sub(/\s/,'0') if hour < 10
+      end
+      @@options[:stop_time][10,4] = "0000"
+
+
+      channels = Channels.instance
+
+      channels.each { |id, c|
+         programmes = c.programmes
+#         $stderr.print "\n# programmes=#{c.number_of_programmes}\n\n"
+
+         programmes.each { | id, p|
+            delete_indicies = []
+            p.each_with_index { |programme, index|
+
+               if !programme.stopTimeStr
+                  programme.setStopTime @@options[:stop_time]
+               end
+
+               dstart = programme.startTimeStr
+               dstop = programme.stopTimeStr
+
+               # If programme ends before the desired start time...drop it.
+               nstart = @@options[:start_time].clone
+               nstart[10..11] = @@options[:time_divisor].to_s
+               if dstop < nstart
+#                  $stderr.print "#{index}, programme ends #{dstop} before start #{nstart}\n"
+#                  p.delete programme
+#                  p = p.compact
+                  delete_indicies << index
+                  next
+               end
+
+               # If programme starts after the desired stop time...drop it.
+               if (dstart >= @@options[:stop_time])
+#                  $stderr.print "#{index}, programme starts #{dstart} after stoptime #{@@options[:stop_time]}\n"
+#                  p.delete programme
+#                  p = p.compact
+                  delete_indicies << index
+                  next
+               end
+
+               # If programme starts before the desired start time, change it.
+               if (dstart < @@options[:start_time])
+                  programme.setStartTime @@options[:start_time]
+               end
+
+               # If programme stops after the desired stop time, change it.
+               if (dstop > @@options[:stop_time])
+                  programme.setStopTime @@options[:stop_time]
+               end
+
+               programme.calculateTimeData
+               programme.calculateProgrammeSlots
+               if programme.spanSlots < 1
+#                 $stderr.print "span slot=#{programme.spanSlots}\n"
+                  delete_indicies << index
+                  next
+               end
+            }
+
+            # Delete programme's in reverse order
+            delete_indicies.reverse_each { |i|
+               c.programmes[id].delete_at i
+               c.programmes[id].compact!
+            }
+            c.verifyStopDate
+#         $stderr.print "# programmes=#{c.number_of_programmes}\n"
+         }
+      }
+   end
    
 end
 
@@ -772,33 +849,22 @@ class XMLTV2HTML2
       @xml.parseChannels
       @xml.parseProgrammes
 
+      @xml.filterProgrammes
 
-      @@options['start_date'] =  @xml.firstShowStartDate
-      @@options['stop_date'] =  @xml.lastShowStopDate
+#$stderr.print "start_time=#{@@options[:start_time]}\n"
+#$stderr.print "stop_time= #{@@options[:stop_time]}\n"
 
-      # Force start/stop time on hour
-      @@options['start_date'][10,4] = "0000"
-
-#      info "start_date=",@@options['start_date']
-#      info "stop_date= ",@@options['stop_date']
-      if @@options['stop_date'][10,2] != "00"
-         hour = (@@options['stop_date'][8,2]).to_i + 1
-         if hour > 23
-            $stderr.print "yuck #{hour}\n"
-         end
-         @@options['stop_date'][8,2] = hour.to_s.rjust(2).sub(/\s/,'0')
-      end
-      @@options['stop_date'][10,4] = "0000"
+      pstart = Time.parse(@@options[:start_time])
 
-      pstart = Time.parse(@@options['start_date'])
-      pstop = Time.parse(@@options['stop_date'])
-      @@options['total_hours'] = ((pstop - pstart) / 3600).to_i
+      pstop = Time.parse(@@options[:stop_time])
+      @@options[:total_hours] = ((pstop - pstart) / 3600).to_i
 
+#$stderr.print " hours #{@@options[:total_hours]}\n"
       channels = Channels.instance
       channels.calc_programmes_slots
 
-      fdate = @@options['start_date'][0,8]
-      ldate = @@options['stop_date'][0,8]
+      fdate = @@options[:start_time][0,8]
+      ldate = @@options[:stop_time][0,8]
 
       @xml.setTitle(@dates)
 
@@ -824,7 +890,7 @@ class XMLTV2HTML2
 
       @out.doctype
       @out.header(@xml.HTML_title)
-      generatePopups if @@options['use_programme_popup']
+      generatePopups if @@options[:use_programme_popup]
       @out.text_before_table(@xml.top_title)
       @out.table_start
       @out.table_times
@@ -836,6 +902,7 @@ class XMLTV2HTML2
          @out.outputChannelBegin
          slot_list = c.createSlotList
          next unless slot_list
+
          i = 0
          pi = -1
          slot_list.each { |entry|
@@ -848,14 +915,26 @@ class XMLTV2HTML2
                   sindex += 1
                   pi += 1
                   prog = c.programme_at(pi)
+
+                  # Where we had to add dummy in middle
+                  if prog.title == "No Data"
+                     @out.outputDummyProgramme(span)
+                     next
+                  end
+
                   @out.outputProgramme(prog, sindex, span)
-#                  @out.outputProgramme(c.programme_at(pi), sindex, span)
-                  if @@options['use_favorites'] and @@options['output_favorites'] and @@options['favorites'].include?(prog.title)
+                  if @@options[:use_favorites] and @@options[:output_favorites] and @@options[:favorites].include?(prog.title)
 #$stderr.print "found a fav #{prog.title}\n"
                      favorites_list << prog
                   end
                when "Q"                # Use previous Programme's info
-                  @out.outputProgramme(c.programme_at(pi), sindex, span)
+                  prog = c.programme_at(pi)
+                  # Where we had to add dummy in middle
+                  if prog.title == "No Data"
+                     @out.outputDummyProgramme(span)
+                     next
+                  end
+                  @out.outputProgramme(prog, sindex, span)
                when "C"
                   @out.outputChannel(c)
             else
@@ -864,8 +943,8 @@ class XMLTV2HTML2
             i += 1
          }
          @out.outputChannelEnd
-         if @@options['times_interval'] > 0 and 
-            ((times_counter % @@options['times_interval']) == 0)
+         if @@options[:times_interval] > 0 and 
+            ((times_counter % @@options[:times_interval]) == 0)
             @out.table_times
          end
          times_counter += 1
@@ -907,11 +986,11 @@ class Html
       print '<title>'
       print title if title
       print '</title>'; nl
-      print '<link rel="stylesheet" href="', @@options['css_filename']
+      print '<link rel="stylesheet" href="', @@options[:css_filename]
       print '" type="text/css">'; nl
 
-      if @@options['use_programme_popup']
-         if @@options['programme_popup_method'] == "DHTML"
+      if @@options[:use_programme_popup]
+         if @@options[:programme_popup_method] == "DHTML"
             print '<script language="JavaScript1.2" src="popup.js" type="text/javascript"></script>'; nl
          else
             print '<script language="JavaScript1.2" type="text/javascript">'
@@ -936,17 +1015,17 @@ class Html
 
       # Styles
       print 'Style[1]=['
-      print '"', @@options['popup_title_color'], '",'
-      print '"', @@options['popup_body_color'], '",'
-      print '"', @@options['popup_title_background_color'], '",'
-      print '"', @@options['popup_body_background_color'], '",'
+      print '"', @@options[:popup_title_color], '",'
+      print '"', @@options[:popup_body_color], '",'
+      print '"', @@options[:popup_title_background_color], '",'
+      print '"', @@options[:popup_body_background_color], '",'
       print '"","","","",'
-      print '"', @@options['popup_title_font'], '",'
-      print '"', @@options['popup_body_font'], '",'
+      print '"', @@options[:popup_title_font], '",'
+      print '"', @@options[:popup_body_font], '",'
       print '"center","",'
-      print '"', @@options['popup_title_font_size'], '",'
-      print '"', @@options['popup_body_font_size'], '",'
-      print @@options['popup_body_width'], ','
+      print '"', @@options[:popup_title_font_size], '",'
+      print '"', @@options[:popup_body_font_size], '",'
+      print @@options[:popup_body_width], ','
       print '"",'
       print '3,'     # Border width
       print '10,'    # Padding around body text
@@ -961,9 +1040,9 @@ class Html
    def outputPopupDescs(c, cindex)
       # The descriptions go here...Text[#]=["title","text"]
          c.programmes[c.id()].each { |s|
-            title = @@options['popup_title_format'].sub(/\%T/, s.title)
+            title = @@options[:popup_title_format].sub(/\%T/, s.title)
             title.sub!(/\%R/, s.rating)
-            desc = @@options['popup_body_format'].gsub(/%T/, s.title)
+            desc = @@options[:popup_body_format].gsub(/%T/, s.title)
             desc.sub!(/\%S/, s.subtitle)
             if (s.previouslyShown)     # rerun
                desc.sub!(/\%P/, "(R)")
@@ -993,32 +1072,32 @@ class Html
          print text
          print '</h3></center>'; nl
       end
-      if @@options['url_prev']
+      if @@options[:url_prev]
          print '<a class="links" href="' 
-         print @@options['url_prev']
+         print @@options[:url_prev]
          print '"><<< Previous</a> | '
       end
-      if @@options['url_next']
+      if @@options[:url_next]
          print '<a class="links" href="' 
-         print @@options['url_next']
+         print @@options[:url_next]
          print '">Next >>></a>'
       end
    end
 
    def text_after_table
-      if @@options['url_prev']
+      if @@options[:url_prev]
          print '<a class="links" href="' 
-         print @@options['url_prev']
+         print @@options[:url_prev]
          print '"><<< Previous</a> | '
       end
-      if @@options['url_next']
+      if @@options[:url_next]
          print '<a class="links" href="' 
-         print @@options['url_next']
+         print @@options[:url_next]
          print '">Next >>></a>'
       end
       print '<br />'
       outputInfo
-      outputLinks if @@options['output_links']
+      outputLinks if @@options[:output_links]
    end
 
    def table_start
@@ -1036,7 +1115,7 @@ class Html
    def outputDate
       days = @hours/24
       colspan = 96
-      colspan += 96 / @@options['channels_interval'] if @@options['channels_interval'] > 0
+      colspan += 96 / @@options[:channels_interval] if @@options[:channels_interval] > 0
 
       print '<tr class="date">'; nl
       (0 .. days-1).each { |d|
@@ -1046,12 +1125,12 @@ class Html
    end
 
    def table_times
-      intervals = 60 / @@options['time_divisor']
+      intervals = 60 / @@options[:time_divisor]
 
 
       # Need hour to start.... we'll force it to be on an hour later
-      starting_day = @@options['start_date'][6,2].to_i
-      starting_hour = @@options['start_date'][8,2].to_i
+      starting_day = @@options[:start_time][6,2].to_i
+      starting_hour = @@options[:start_time][8,2].to_i
 #      $stderr.print "Day to start:   #{starting_day}\n"
 #      $stderr.print "Hour to start:  #{starting_hour}\n"
 #      $stderr.print "Total hours:  #{$params.total_hours}\n"
@@ -1060,13 +1139,13 @@ class Html
       output_channel_space
 
       cs = 0
-      (starting_hour .. starting_hour + @@options['total_hours'] - 1).each { |h|
+      (starting_hour .. starting_hour + @@options[:total_hours] - 1).each { |h|
          (0 .. intervals-1).each { |hh|
             print '<td>';
-            printf "%02d", hh * @@options['time_divisor']; print '</td>';
+            printf "%02d", hh * @@options[:time_divisor]; print '</td>';
          }
          cs += 1
-         output_channel_space if @@options['channels_interval'] > 0 and cs % @@options['channels_interval'] == 0
+         output_channel_space if @@options[:channels_interval] > 0 and cs % @@options[:channels_interval] == 0
       }
       print '</tr>'; nl
 
@@ -1074,17 +1153,17 @@ class Html
       output_channel_space
       days = @hours/24
       cs = 0
-      cdate = Time.parse(@@options['start_date'])
+      cdate = Time.parse(@@options[:start_time])
 
-      (starting_hour .. starting_hour + @@options['total_hours'] - 1).each { |hi|
+      (starting_hour .. starting_hour + @@options[:total_hours] - 1).each { |hi|
          h = hi % 24
             print '<td colspan="',intervals,'" class="time">';
 
-            if @@options['output_date_in_time']
+            if @@options[:output_date_in_time]
                nl; print '<table width="100%" border="0" cellpadding="0">'; nl
                print '<tr><td align="left" class="time">';
             end
-            if @@options['time_format_12']
+            if @@options[:time_format_12]
                if h < 12
                   out = "#{h} am"
                else 
@@ -1095,16 +1174,16 @@ class Html
                out = sprintf "%02d", h
             end
             print out
-            if @@options['output_date_in_time']
+            if @@options[:output_date_in_time]
                print '<td align="right" class="date_in_time">';
-               print cdate.strftime(@@options['date_format'])
+               print cdate.strftime(@@options[:date_format])
                print '</td></tr>'; nl; print '</table></td>'; nl
             else
                print '</td>';
             end
             cs += 1
             cdate +=  3600    # Add 1 hour
-            output_channel_space if @@options['channels_interval'] > 0 and cs % @@options['channels_interval'] == 0
+            output_channel_space if @@options[:channels_interval] > 0 and cs % @@options[:channels_interval] == 0
          }
       print '</tr>'; nl
    end
@@ -1125,7 +1204,7 @@ class Html
    end
 
    def outputProgramme(s, index, slots)
-      return if s.spanSlots == 0    # Invalid programme - too short
+      return if !s or s.spanSlots == 0    # Invalid programme - too short
       if slots > 0
          print '<td colspan="', slots, '" class="'
       else
@@ -1133,7 +1212,7 @@ class Html
       end
 
       # Favorites override category.
-      if @@options['use_favorites'] and @@options['favorites'].include?(s.title)
+      if @@options[:use_favorites] and @@options[:favorites].include?(s.title)
          print 'favorite">'
       elsif s.category
          print s.category,'">'
@@ -1141,9 +1220,9 @@ class Html
          print 'programme">'
       end
       # Styles : 12=right; 1=center; 2=left; 3=float
-      if @@options['use_programme_popup']
+      if @@options[:use_programme_popup]
          if s.popupIndex >= 0
-            if @@options['programme_popup_method'] == "DHTML"
+            if @@options[:programme_popup_method] == "DHTML"
                print '<a onmouseover="stm(Text[', s.popupIndex
                print '],Style[1])" onmouseout="htm()">'; nl
             else
@@ -1182,11 +1261,11 @@ class Html
          outputProgramme(p, p.popupIndex, 1)
 
          print '<td align="center">'; nl
-         print p.times.fullStartTime.strftime("%a %b %d %I:%M %p")
+         print p.startTime.strftime("%a %b %d %I:%M %p")
          print '</td>'; nl
 
          print '<td align="center">'; nl
-         print p.times.fullStopTime.strftime("%a %b %d %I:%M %p")
+         print p.stopTime.strftime("%a %b %d %I:%M %p")
          print '</td>'; nl
 
          print '</tr>'; nl