xmltv2html 0.7.1 → 0.8.0

data/ChangeLog

@@ -1,4 +1,12 @@
 ------------------------------------------------------------------------
+r192 | kvh | 2006-02-25 17:57:39 -0500 (Sat, 25 Feb 2006) | 1 line
+Changed paths:
+   M /trunk/bin/xmltv2html.rb
+   M /trunk/xmltv2html.gemspec
+   M /trunk/xmltv2htmlrc
+
+The programs' description can be search for any given string, such as actors names.  The favorites' list is now case insensitive.
+------------------------------------------------------------------------
 r191 | kvh | 2006-02-19 17:01:20 -0500 (Sun, 19 Feb 2006) | 1 line
 Changed paths:
    M /trunk/bin/xmltv2html.rb

data/bin/xmltv2html.rb

@@ -4,7 +4,7 @@
 #
 #   xmltv2html.rb - A Ruby script to transform the XMLTV output into HTML.
 #
-#   Version  : 0.7.1
+#   Version  : 0.8.0
 #   Author   : Kurt V. Hindenburg <public@kurt.hindenburg.name>
 #
 #   Copyright (C) 2003, 2004, 2005 Kurt V. Hindenburg
@@ -75,8 +75,8 @@ require 'time'
 require 'set'
 require 'ostruct'
 
-XMLTV2HTML_VERSION="0.7.1"
-XMLTV2HTML_DATE="Feb 20, 2006"
+XMLTV2HTML_VERSION="0.8.0"
+XMLTV2HTML_DATE="Feb 26, 2006"
 
 class Time
    class << self
@@ -121,8 +121,16 @@ module XMLTV2HTML
          read_conf if @@options[:use_config_file]
          parse_command_line_options
 
+         # Downcase description search list for ease
+         @@options[:desc_search_list].each { |l|
+            l.downcase!
+         }
+         @@options[:favorites_list].each { |l|
+            l.downcase!
+         }
          # convert favorites_list to Set for faster lookup
          @@options[:favorites] = Set.new @@options[:favorites_list]
+
       end
 
       # Don't edit these, use an external xmltv2htmlrc file.
@@ -136,6 +144,8 @@ module XMLTV2HTML
             :output_favorites => false,
             :favorites_list => [],
             :favorites_sort_by_date => true,
+            :desc_search_list => [],
+            :desc_search_sort_by_date => true,
             :css_filename => 'xmltv2html.css',
             :categories => {},
             :output_date_in_time => false,
@@ -614,6 +624,7 @@ class XmlTV
    attr_reader :HTML_title      # Title of HTML page
    attr_reader :top_title      # Title of HTML page
    attr_accessor(:firstShowStartDate, :lastShowStartDate, :lastShowStopDate)
+   attr_reader :desc_match_list
 
    def initialize
       @firstShowStartDate = "99999999999999"
@@ -831,6 +842,24 @@ class XmlTV
          }
       }
    end
+
+   def searchProgrammesDesc
+      @desc_match_list = []
+
+      channels = Channels.instance
+
+      channels.each { |id, c|
+         programmes = c.programmes
+
+         programmes.each { | id, p|
+            p.each { |programme|
+               @@options[:desc_search_list].each { |s|
+                  @desc_match_list << programme if programme.desc.downcase.include?(s)
+               }
+            }
+         }
+      }
+   end
    
 end
 
@@ -868,6 +897,8 @@ class XMLTV2HTML2
 
       @xml.setTitle(@dates)
 
+      @xml.searchProgrammesDesc
+
    end
 
    def generatePopups
@@ -923,8 +954,7 @@ class XMLTV2HTML2
                   end
 
                   @out.outputProgramme(prog, sindex, span)
-                  if @@options[:use_favorites] and @@options[:output_favorites] and @@options[:favorites].include?(prog.title)
-#$stderr.print "found a fav #{prog.title}\n"
+                  if @@options[:use_favorites] and @@options[:output_favorites] and @@options[:favorites].include?(prog.title.downcase)
                      favorites_list << prog
                   end
                when "Q"                # Use previous Programme's info
@@ -954,6 +984,8 @@ class XMLTV2HTML2
 
       @out.output_favorites_list(favorites_list) if not favorites_list.empty?
 
+      @out.output_desc_matches(@xml.desc_match_list) if not @xml.desc_match_list.empty?
+
       @out.text_after_table
       @out.footer
    end
@@ -1212,7 +1244,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.downcase)
          print 'favorite">'
       elsif s.category
          print s.category,'">'
@@ -1284,6 +1316,48 @@ class Html
       print '</table>'; nl
    end
 
+   def output_desc_matches(list)
+      if @@options[:desc_search_sort_by_date]
+         list = list.sort! { |a, b| a.startTime<=>b.startTime }
+      else
+         list = list.sort! { |a, b| a.title<=>b.title }
+      end
+      
+      print '<br><br>'; nl
+      print '<table width="100%" border="3" cellpadding="3">'; nl
+      print '<tr><td colspan="4" align="center">Description Search Matches</td></tr>'; nl
+      print '<tr><td width="15%" align="center" nowrap>Channel</td>';
+      print '<td width="45%" align="center" nowrap>Title</td>';
+      print '<td width="20%" align="center">Start</td>';
+      print '<td width="20%" align="center">Stop</td>';
+      print '</tr>'; nl
+
+      channels = Channels.instance
+
+      list.each { |p|
+         print '<tr>'; nl
+
+         print '<td class="channel">'; nl
+         print channels[p.channelid].fullname
+         print '</td>'; nl
+
+         outputProgramme(p, p.popupIndex, 1)
+
+         print '<td align="center">'; nl
+         print p.startTime.strftime("%a %b %d %I:%M %p")
+         print '</td>'; nl
+
+         print '<td align="center">'; nl
+         print p.stopTime.strftime("%a %b %d %I:%M %p")
+         print '</td>'; nl
+
+         print '</tr>'; nl
+      }
+
+      print '</table>'; nl
+
+   end
+
    def outputInfo
       print '<br>'
       print '<span class="info">'

data/xmltv2htmlrc

@@ -31,6 +31,13 @@
 # If true, sort favorite list by programme's start time (else by title)
 #:favorites_sort_by_date: true
 
+# List of strings to serach each program's description for.
+#:desc_search_list: []
+#Example :desc_search_list: [ "jessica alba", "Scarlett Johansson" ]
+
+# If true, sort desc matches by programme's start time (else by title)
+#:desc_search_sort_by_date: true
+
 # Name of CSS file
 #:css_filename: 'xmltv2html.css'
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: xmltv2html
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2006-02-19 00:00:00 -05:00
+  version: 0.8.0
+date: 2006-02-25 00:00:00 -05:00
 summary: xmltv2html generates a HTML page from the output of XMLTV.
 require_paths: 
 - lib