rtv 0.1.1 → 0.1.5

data/bin/tv.rb

@@ -5,16 +5,22 @@ require 'rtv'
 require 'yaml'
 
 if __FILE__ == $0
-  config =
-  begin
+  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
-    {:senderfilter=>["pro7", "arte", "3sat", "rtl2", "sat1", "vox", "rtl", "k1"],
-      :senderressource=>"sendergruppeId:1,3",
-      :charset=>"UTF-8"}
+    {}
   end
 
+  config.update newconfig
+
   swtch = RTV::Switcher.new
   swtch.config = config
 

data/lib/rtv.rb

@@ -6,6 +6,7 @@ require 'open-uri'
 require 'cgi'
 require 'iconv'
 require 'time'
+require 'base64'
 
 $KCODE = 'u'
 
@@ -27,26 +28,27 @@ module RTV
     attr_accessor :channel, :name, :time, :date, :desc, :showview, :options
     
     Filler = "\t"
-    
-    def initialize
-      @date = nil
-    end
 
-    def dont_repeat lastshow = ['', '', '', '']
-      self.to_a.zip(lastshow.to_a).map{|x,y| (x == y) ? (' ' * x.to_s.size) : x}.compact.join(Filler)
+    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
-    def to_s
-      @name.to_s
-    end
   end
   class Fetcher
-    TVURL = 'http://www.tvtoday.de/program2007'
-    
     attr_accessor :options, :config
     
     def initialize
@@ -83,7 +85,7 @@ module RTV
             show.name = time_to_name(zeit)
             show.channel = time_to_channel(zeit)
             show.date = datum.innerText[/^\D*(.+) Suchergebnis/, 1]
-            @shows << show
+            add_show show
           end
         end        
       else
@@ -95,14 +97,18 @@ module RTV
           show.desc, show.showview = time_to_desc_and_showview(zeit)
           show.name = time_to_name(zeit)
           show.channel = time_to_channel(zeit)
-          @shows << show
+          add_show show
         end
       end
     end
     
     private
+    def add_show show
+      @shows << show
+    end
+    
     def get_hdoc
-      uri = TVURL + '?' + hsh_to_rqst(@options)
+      uri = convert_to_url("http://www.klack.de/") + '?' + hsh_to_rqst(@options)
       puts "URL: #{uri}" if $DEBUG
       doc = Hpricot(open(uri))
     end
@@ -129,6 +135,11 @@ 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
+      url = Base64.decode64("aHR0cDovL3d3dy50dnRvZGF5LmRlL3Byb2dyYW0yMDA3")
+    end
   end
   
   class Presenter
@@ -136,18 +147,23 @@ module RTV
     
     attr_accessor :config
     
-    def initialize charset='UTF-8'
+    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|
-            puts Iconv.iconv(@target_charset, Source_charset, show.dont_repeat(lastshow))
+            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
@@ -198,8 +214,10 @@ EXAMPLES
       
       args.each do |arg|
         case arg.downcase
-        when "all"
-          @uri_options = all
+          
+          # Konfigurationenmodus
+        when /(\w+):(\w+)/
+          @config.update YAML.load("--- :" + $1 + ": " + $2)
           
           # Hilfemodus
         when "help"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rtv
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-07-14 00:00:00 +02:00
+  version: 0.1.5
+date: 2007-07-15 00:00:00 +02:00
 summary: RTV is a command line tv guide for german television. It features a flexible argument parsing for quick usage in your favorite shell so you don't have to remember the syntax. Query shows by name, date, time or channel! Get it now!
 require_paths: 
 - lib