rtv 0.1.6 → 0.1.7

data/bin/new.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+echo $*

data/bin/rtv

@@ -5,31 +5,14 @@ require 'rtv'
 require 'yaml'
 
 if __FILE__ == $0
-  config = {:senderfilter=>["pro7", "arte", "3sat", "rtl2", "sat1", "vox", "rtl", "k1"],
-    :senderressource=>"sendergruppeId:1,3",
-    :charset=>"UTF-8",
-    :senderlimit=>15,
-    :eine_pro_sender=>false,
-    :redundanz=>false}
-  
-  newconfig = begin
-    configfile = File.join(Gem.user_home, '.rtv')
-    YAML.load(File.read(configfile))
-  rescue
-    {}
+  begin
+    puts RTV::Manager.getTVString(ARGV.dup)
+  # puts RTV::Manager.getTVString(["20", "pro7"])
+  rescue RTV::NoConnectionException => e
+    puts e.message
+  rescue RTV::NotFoundException => e
+    puts e.message
+  rescue RTV::UsageException => e
+    puts e.message
   end
-
-  config.update newconfig
-
-  swtch = RTV::Switcher.new
-  swtch.config = config
-
-  rtv = RTV::Fetcher.new
-  rtv.config = swtch.config
-  rtv.options = swtch.uri_options(ARGV.dup)
-  program = rtv.fetch
-
-  prtr = RTV::Presenter.new rtv.config[:charset]
-  prtr.config = swtch.config
-  prtr.show program
 end

data/lib/rtv.rb

@@ -13,6 +13,45 @@ $KCODE = 'u'
 Channel = %w{ard zdf rtl sat1 pro7 k1 rtl2 super vox arte tele5 3sat dvier br hr mdr n3 rbb swr wdr bralp tvb h1 orf1 orf2 atv sf1 sf2 prs dwtv extra fes mux ztk zdoku zinfo dsf euro mtv viva nick kika qvc tw1 teno cc bbc cnn euron n24 ntv blm dmax nl1 nl2 nl3 pspo1 dir1 gold heima aplan butv disco junio mgm plane scifi 13th hit24 disge foge blum blume arena axn kinow sat1c silve histo nasn toon pr1 pr2 pr3 pr4 disne prfc prff prn prser krimi}
 
 module RTV
+  class UsageException < Exception
+  end
+  class NoConnectionException < Exception
+  end
+  class NotFoundException < Exception
+  end
+  class Manager
+    def self.getTVString args
+      config = {:senderfilter=>["pro7", "arte", "3sat", "rtl2", "sat1", "vox", "rtl", "k1"],
+        :senderressource=>"sendergruppeId:1,3",
+        :charset=>"UTF-8",
+        :senderlimit=>15,
+        :eine_pro_sender=>false,
+        :redundanz=>false}
+
+      newconfig = begin
+                    configfile = File.join(Gem.user_home, '.rtv')
+                    YAML.load(File.read(configfile))
+                  rescue
+                    {}
+                  end
+
+      config.update newconfig
+
+      swtch = RTV::Switcher.new
+      swtch.config = config
+
+      rtv = RTV::Fetcher.new
+      rtv.config = swtch.config
+      rtv.options = swtch.uri_options(args)
+
+      program = rtv.fetch
+
+      prtr = RTV::Presenter.new rtv.config[:charset]
+      prtr.config = swtch.config
+      return prtr.to_s(program)
+
+    end
+  end
   class Program
     attr_reader :channel
 
@@ -26,7 +65,7 @@ module RTV
   end
   class Show
     attr_accessor :channel, :name, :time, :date, :desc, :showview, :options
-    
+
     Filler = "\t"
 
     def to_s *lastshow
@@ -41,7 +80,7 @@ module RTV
         self.to_a.zip(lastshow.to_a).map{|x,y| (x == y) ? (' ' * x.to_s.size) : x}.reject{|x| x.empty?}.join(Filler)
       end
     end
-    
+
     def to_a
       tmp = [@channel, @date, @time, @name]
       tmp << @desc if @options[:desc]
@@ -50,12 +89,12 @@ module RTV
   end
   class Fetcher
     attr_accessor :options, :config
-    
+
     def initialize
       @options = {}
       @shows = Program.new
     end
-    
+
     def fetch
       while search_results?(doc = get_hdoc)
         extract_shows doc
@@ -65,7 +104,7 @@ module RTV
       puts if $DEBUG
       return @shows
     end
-    
+
     def extract_shows doc
       if @options[:format] == 'search'
         daten = (doc/"div[@id='titel-uebersicht']")
@@ -75,19 +114,19 @@ module RTV
             zeiten = zeiten.search("span.tv-sendung-uhrzeit")
           else
             puts "Keine Suchergebnisse!" if $DEBUG
-            exit
+            raise NotFoundException, "Keine Suchergebnisse!"
           end
           zeiten.each do |zeit|
             show = Show.new
-	    show.options = @config
+            show.options = @config
             show.time = zeit.innerText
-	    show.desc, show.showview = time_to_desc_and_showview(zeit)
+            show.desc, show.showview = time_to_desc_and_showview(zeit)
             show.name = time_to_name(zeit)
             show.channel = time_to_channel(zeit)
             show.date = datum.innerText[/^\D*(.+) Suchergebnis/, 1]
             add_show show
           end
-        end        
+        end
       else
         zeiten = (doc/"span.tv-sendung-uhrzeit")
         zeiten.each do |zeit|
@@ -101,35 +140,34 @@ module RTV
         end
       end
     end
-    
+
     private
     def add_show show
       @shows << show
     end
-    
+
     def get_hdoc
       begin
         uri = convert_to_url("http://www.klack.de/") + '?' + hsh_to_rqst(@options)
         puts "URL: #{uri}" if $DEBUG
         doc = Hpricot(open(uri))
       rescue
-        puts "No Network Connection!"
-        exit
-      end      
+        raise NoConnectionException, "No Network Connection!"
+      end
     end
-    
+
     def search_results? doc
       (doc/"td.noresult").empty?
     end
-    
+
     def hsh_to_rqst hsh
       hsh.to_a.map{|x| x.map{|y| CGI.escape(y.to_s)}.join('=')}.join('&')
     end
-    
+
     def time_to_name zeit
       zeit.parent.next_sibling.next_sibling.at("a.tv-sendung-titel").innerText
     end
-    
+
     def time_to_channel zeit
       zeit.parent.parent.at("span.tv-sendung-info/a").attributes["href"][/channelId=([^&]+)/, 1].downcase
     end
@@ -140,23 +178,24 @@ module RTV
       showview = desc_showv[/\s+Showview ([0-9-]+)/, 1]
       [desc, showview]
     end
-    
+
     def convert_to_url str
-      # entferne alle störenden Buchstaben und erstelle die URL
+      # entfernt alle störenden Buchstaben und erstellt die URL
       url = Base64.decode64("aHR0cDovL3d3dy50dnRvZGF5LmRlL3Byb2dyYW0yMDA3")
     end
   end
-  
+
   class Presenter
     Source_charset = 'ISO-8859-1'
-    
+
     attr_accessor :config
-    
+
     def initialize charset = 'UTF-8'
       @target_charset = charset
     end
 
-    def show program
+    def to_s program
+      returnstring = ""
       senderlimit = @config[:senderlimit]
       @config[:senderfilter].each do |channel|
         lastshow = nil
@@ -166,19 +205,24 @@ module RTV
           tmp.each do  |show|
             return if (@config[:senderlimit] -= 1) < 1
 
-            puts Iconv.iconv(@target_charset, Source_charset, show.to_s(lastshow))
-            
+            returnstring << Iconv.iconv(@target_charset, Source_charset, show.to_s(lastshow)).to_s << "\n"
+
             break if @config[:eine_pro_sender]
-	    lastshow = show
+            lastshow = show
           end
         end
       end
+      returnstring
+    end
+
+    def show programm
+      puts to_s(programm)
     end
   end
-  
+
   class Switcher
     attr_accessor :config
-    
+
     Usage = 'RTV - a command line ruby tv guide
 
 USAGE
@@ -209,58 +253,57 @@ EXAMPLES
 
         Beliebige sinnvolle Kombinationen in beliebiger Reihenfolge sind möglich:
         tv pro7 -d 20 11.07. sat1 - Alle Sendungen auf Pro7 und Sat.1 um 20 Uhr am 11.07. mit Beschreibung'
-    
+
     def initialize
       @uri_options = {}
     end
-    
+
     def uri_options args
       set_defaults
-      
+
       tmp_channel = @config[:senderfilter]
       @config[:senderfilter] = []
-      
+
       args.each do |arg|
         case arg.downcase
-          
+
           # Konfigurationenmodus
         when /(\w+):(\w+)/
           @config.update YAML.load("--- :" + $1 + ": " + $2)
-          
+
           # Hilfemodus
         when "help"
-          puts Usage
-          exit
-          
+          raise UsageException, Usage
+
           # Beschreibungmodus
         when "-d"
           @config[:desc] = true
-          
+
           # Datummodus
         when /^\d{1,2}\.\d{1,2}\.$/
           @uri_options[:date] = arg + Time.now.year.to_s
-          
+
           # Stundenmodus
         when /^\d{1,2}(?:\d{2})?$/
           @uri_options[:time] = arg
-          
+
           # Channelname oder -alias
         when *Channel
           @config[:senderfilter] << arg.downcase
-          
+
           # Suchmodus
         else
           @uri_options.update({:search => arg, :format => 'search', :time => 'all', :date => 'all', :slotIndex => 'all'})
           @config[:senderfilter] = Channel
         end
       end
-      
+
       # when channels are specified, use them only
       @config[:senderfilter] = tmp_channel if @config[:senderfilter].empty?
 
       @uri_options
     end
-    
+
     private
     def set_defaults
       # Haupt- und Regionalsender

metadata

@@ -3,13 +3,13 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rtv
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
-date: 2007-07-16 00:00:00 +02:00
+  version: 0.1.7
+date: 2007-09-30 00:00:00 +02:00
 summary: RTV is a command line tv guide for german television.
 require_paths: 
 - lib
 email: rretzbach@gmail.com
-homepage: http://rubyforge.org/projects/rtv/1
+homepage: http://rubyforge.org/projects/rtv/
 rubyforge_project: 
 description: 
 autorequire: rtv
@@ -30,7 +30,7 @@ authors:
 - Robert Retzbach
 files: 
 - bin/rtv
-- lib/#rtv.rb#
+- bin/new.sh
 - lib/rtv.rb
 - doc/senderliste.txt
 - etc/config.yaml.example
@@ -41,8 +41,8 @@ rdoc_options: []
 
 extra_rdoc_files: 
 - README
-executables: 
-- rtv
+executables: []
+
 extensions: []
 
 requirements: []

data/lib/#rtv.rb#

@@ -1,269 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'hpricot'
-require 'open-uri'
-require 'cgi'
-require 'iconv'
-require 'time'
-require 'base64'
-
-$KCODE = 'u'
-
-Channel = %w{ard zdf rtl sat1 pro7 k1 rtl2 super vox arte tele5 3sat dvier br hr mdr n3 rbb swr wdr bralp tvb h1 orf1 orf2 atv sf1 sf2 prs dwtv extra fes mux ztk zdoku zinfo dsf euro mtv viva nick kika qvc tw1 teno cc bbc cnn euron n24 ntv blm dmax nl1 nl2 nl3 pspo1 dir1 gold heima aplan butv disco junio mgm plane scifi 13th hit24 disge foge blum blume arena axn kinow sat1c silve histo nasn toon pr1 pr2 pr3 pr4 disne prfc prff prn prser krimi}
-
-module RTV
-  class Program
-    attr_reader :channel
-
-    def initialize
-      @channel = {}
-    end
-    def << show
-      @channel[show.channel] ||= []
-      @channel[show.channel] << show
-    end
-  end
-  class Show
-    attr_accessor :channel, :name, :time, :date, :desc, :showview, :options
-    
-    Filler = "\t"
-
-    def to_s *lastshow
-      if @options[:redundanz]
-        self.to_a.compact.join(Filler)
-      else
-        lastshow = if lastshow.first.nil?
-                     [()] * to_a.size
-                   else
-                     lastshow.first
-                   end
-        self.to_a.zip(lastshow.to_a).map{|x,y| (x == y) ? (' ' * x.to_s.size) : x}.reject{|x| x.empty?}.join(Filler)
-      end
-    end
-    
-    def to_a
-      tmp = [@channel, @date, @time, @name]
-      tmp << @desc if @options[:desc]
-      tmp
-    end
-  end
-  class Fetcher
-    attr_accessor :options, :config
-    
-    def initialize
-      @options = {}
-      @shows = Program.new
-    end
-    
-    def fetch
-      while search_results?(doc = get_hdoc)
-        extract_shows doc
-        @options[:offset] += 1
-        print "." if $DEBUG
-      end
-      puts if $DEBUG
-      return @shows
-    end
-    
-    def extract_shows doc
-      if @options[:format] == 'search'
-        daten = (doc/"div[@id='titel-uebersicht']")
-        daten.each do |datum|
-          zeiten = datum.parent.parent.parent.next_sibling
-          unless zeiten.nil?
-            zeiten = zeiten.search("span.tv-sendung-uhrzeit")
-          else
-            puts "Keine Suchergebnisse!" if $DEBUG
-            exit
-          end
-          zeiten.each do |zeit|
-            show = Show.new
-	    show.options = @config
-            show.time = zeit.innerText
-	    show.desc, show.showview = time_to_desc_and_showview(zeit)
-            show.name = time_to_name(zeit)
-            show.channel = time_to_channel(zeit)
-            show.date = datum.innerText[/^\D*(.+) Suchergebnis/, 1]
-            add_show show
-          end
-        end        
-      else
-        zeiten = (doc/"span.tv-sendung-uhrzeit")
-        zeiten.each do |zeit|
-          show = Show.new
-          show.options = @config
-          show.time = zeit.innerText
-          show.desc, show.showview = time_to_desc_and_showview(zeit)
-          show.name = time_to_name(zeit)
-          show.channel = time_to_channel(zeit)
-          add_show show
-        end
-      end
-    end
-    
-    private
-    def add_show show
-      @shows << show
-    end
-    
-    def get_hdoc
-      begin
-        uri = convert_to_url("http://www.klack.de/") + '?' + hsh_to_rqst(@options)
-        puts "URL: #{uri}" if $DEBUG
-        doc = Hpricot(open(uri))
-      rescue
-        puts "No Network Connection!"
-        exit
-      end
-      nur ein test ae öpseraf
-    end
-    
-    def search_results? doc
-      (doc/"td.noresult").empty?
-    end
-    
-    def hsh_to_rqst hsh
-      hsh.to_a.map{|x| x.map{|y| CGI.escape(y.to_s)}.join('=')}.join('&')
-    end
-    
-    def time_to_name zeit
-      zeit.parent.next_sibling.next_sibling.at("a.tv-sendung-titel").innerText
-    end
-    
-    def time_to_channel zeit
-      zeit.parent.parent.at("span.tv-sendung-info/a").attributes["href"][/channelId=([^&]+)/, 1].downcase
-    end
-
-    def time_to_desc_and_showview zeit
-      desc_showv = zeit.parent.parent.at("span.tv-sendung-info").innerText.strip.gsub(/[\t\r\n]+/, "\t")
-      desc = desc_showv.sub(/^\([^()]+\)\s+/, '').sub(/\s+Showview [0-9-]+/, '')
-      showview = desc_showv[/\s+Showview ([0-9-]+)/, 1]
-      [desc, showview]
-    end
-    
-    def convert_to_url str
-      # entferne alle störenden Buchstaben und erstelle die URL
-      url = Base64.decode64("aHR0cDovL3d3dy50dnRvZGF5LmRlL3Byb2dyYW0yMDA3")
-    end
-  end
-  
-  class Presenter
-    Source_charset = 'ISO-8859-1'
-    
-    attr_accessor :config
-    
-    def initialize charset = 'UTF-8'
-      @target_charset = charset
-    end
-
-    def show program
-      senderlimit = @config[:senderlimit]
-      @config[:senderfilter].each do |channel|
-        lastshow = nil
-        tmp = program.channel[channel]
-
-        unless tmp.nil?
-          tmp.each do  |show|
-            return if (@config[:senderlimit] -= 1) < 1
-
-            puts Iconv.iconv(@target_charset, Source_charset, show.to_s(lastshow))
-            
-            break if @config[:eine_pro_sender]
-	    lastshow = show
-          end
-        end
-      end
-    end
-  end
-  
-  class Switcher
-    attr_accessor :config
-    
-    Usage = 'RTV - a command line ruby tv guide
-
-USAGE
-
-	tv [ELEMENT] ...
-
-	ELEMENT kann folgende Werte enthalten:
-
-	a) TIME als Sendezeit im Format HH oder HH:MM (maximal eine TIME sinnvoll)
-	b) DATE als Datum im Format DD.MM
-	b) CHANNEL als Sender aus der Liste in doc/senderliste.txt
-	c) PATTERN als Suchbegriff (darf kein Sendername sein, siehe b))
-	d) DESCRIPTION als Beschreibung, feste Zeichenkette "-d"
-	e) HELP als Hilfe, feste Zeichenkette "help" (gibt diese Seite aus)
-
-
-EXAMPLES
-
-	tv           - Aktuelle Sendungen für ausgewählte Sender
-	tv 20        - Heute 20 Uhr alle Sendungen für ausgewählte Sender
-	tv 24.12.    - Alle Sendungen an Heilig Abend für ausgewählte Sender
-	tv pro7 sat1 - Aktuelle Sendungen von nur Pro7 und Sat.1
-	tv simpsons  - Alle Sendungen über Die Simpsons für alle Sender
-	tv -d        - Aktuelle Sendungen für ausgewählte Sender mit Beschreibung
-
-	Beliebige sinnvolle Kombinationen in beliebiger Reihenfolge sind möglich:
-	tv pro7 -d 20 11.07. sat1 - Alle Sendungen auf Pro7 und Sat.1 um 20 Uhr am 11.07. mit Beschreibung'
-    
-    def initialize
-      @uri_options = {}
-    end
-    
-    def uri_options args
-      set_defaults
-      
-      tmp_channel = @config[:senderfilter]
-      @config[:senderfilter] = []
-      
-      args.each do |arg|
-        case arg.downcase
-          
-          # Konfigurationenmodus
-        when /(\w+):(\w+)/
-          @config.update YAML.load("--- :" + $1 + ": " + $2)
-          
-          # Hilfemodus
-        when "help"
-          puts Usage
-          exit
-          
-          # Beschreibungmodus
-        when "-d"
-          @config[:desc] = true
-          
-          # Datummodus
-        when /^\d{1,2}\.\d{1,2}\.$/
-          @uri_options[:date] = arg + Time.now.year.to_s
-          
-          # Stundenmodus
-        when /^\d{1,2}(?:\d{2})?$/
-          @uri_options[:time] = arg
-          
-          # Channelname oder -alias
-        when *Channel
-          @config[:senderfilter] << arg.downcase
-          
-          # Suchmodus
-        else
-          @uri_options.update({:search => arg, :format => 'search', :time => 'all', :date => 'all', :slotIndex => 'all'})
-          @config[:senderfilter] = Channel
-        end
-      end
-      
-      # when channels are specified, use them only
-      @config[:senderfilter] = tmp_channel if @config[:senderfilter].empty?
-
-      @uri_options
-    end
-    
-    private
-    def set_defaults
-      # Haupt- und Regionalsender
-      @uri_options = {:date => 'now', :time => 'now', :format => 'genre', :channel => @config[:senderressource], :order => 'time', :offset => 0}
-    end
-  end
-end
-