xmltv2html 0.7.0 → 0.7.1

data/ChangeLog

@@ -1,4 +1,17 @@
 ------------------------------------------------------------------------
+r191 | kvh | 2006-02-19 17:01:20 -0500 (Sun, 19 Feb 2006) | 1 line
+Changed paths:
+   M /trunk/bin/xmltv2html.rb
+   M /trunk/xmltv2htmlrc
+
+Allow the favorite list to be sorted by programme start date
+------------------------------------------------------------------------
+r190 | kvh | 2006-02-19 16:42:41 -0500 (Sun, 19 Feb 2006) | 1 line
+Changed paths:
+   M /trunk/bin/xmltv2html.rb
+
+add channel to favorite list output
+------------------------------------------------------------------------
 r189 | kvh | 2006-02-13 17:09:18 -0500 (Mon, 13 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.0
+#   Version  : 0.7.1
 #   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.0"
-XMLTV2HTML_DATE="Feb 13, 2006"
+XMLTV2HTML_VERSION="0.7.1"
+XMLTV2HTML_DATE="Feb 20, 2006"
 
 class Time
    class << self
@@ -135,6 +135,7 @@ module XMLTV2HTML
             :use_favorites => false,
             :output_favorites => false,
             :favorites_list => [],
+            :favorites_sort_by_date => true,
             :css_filename => 'xmltv2html.css',
             :categories => {},
             :output_date_in_time => false,
@@ -256,7 +257,7 @@ EOF
 
 class Programme
    attr_reader :title, :subtitle, :span, :times, :desc, :rating, :category
-   attr_reader :previouslyShown, :spanSlots, :startSlot
+   attr_reader :previouslyShown, :spanSlots, :startSlot, :channelid
    attr_accessor :startTimeStr, :stopTimeStr
    attr_accessor :startTime, :stopTime, :popupIndex
 
@@ -385,7 +386,6 @@ end
 class Channel
    attr_reader(:name, :id, :fullname)
    attr_accessor(:programmes)
-#   attr_reader(:programmes)
    attr_accessor(:totalSpan)
 
    def initialize(id, fn)
@@ -1244,20 +1244,30 @@ class Html
    end
 
    def output_favorites_list(fav_list)
-      fav_list = fav_list.sort! { |a, b| a.title<=>b.title }
-
-
+      if @@options[:favorites_sort_by_date]
+         fav_list = fav_list.sort! { |a, b| a.startTime<=>b.startTime }
+      else
+         fav_list = fav_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="3" align="center">Favorites</td></tr>'; nl
-      print '<tr><td width="50%" align="center" nowrap>Title</td>';
-      print '<td width="25%" align="center">Start</td>';
-      print '<td width="25%" align="center">Stop</td>';
+      print '<tr><td colspan="4" align="center">Favorites</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
+
       fav_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

data/xmltv2htmlrc

@@ -28,6 +28,9 @@
 # Print out list of favorites beneath the listings?
 #:output_favorites: false
 
+# If true, sort favorite list by programme's start time (else by title)
+#:favorites_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.0
-date: 2006-02-13 00:00:00 -05:00
+  version: 0.7.1
+date: 2006-02-19 00:00:00 -05:00
 summary: xmltv2html generates a HTML page from the output of XMLTV.
 require_paths: 
 - lib