dblugeon-rb-eyetv 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/eyetv.rb

@@ -25,14 +25,18 @@ module EyeTV
       chans
     end
 
-    def programs
+    #return program list, the only_future option indiquate if the future programs must be returned
+    def programs(only_future = true)
       programs_tab = []
       @instance.programs.get.each do |prog|
-        programs_tab.push(Program.new(prog))
+        if !only_future or prog.start_time.get > Time.now
+          programs_tab.push(Program.new(prog))
+        end
       end
       programs_tab
     end
 
+    #return recording list
     def recordings
       recordings =[]
       @instance.recordings.get.each do |recording|
@@ -62,6 +66,7 @@ module EyeTV
       @instance.is_recording.get
     end
 
+    #return channel list
     def current_channel_number
       @intance.current_channel.get
     end
@@ -80,8 +85,56 @@ module EyeTV
         end
       end
     end
+
+    #create a program with options 
+    #a nil option launch a live record 
+    #example : 
+    #a = EyeTV.new() 
+    #p = a.make_program(:channel_number => 3, :start_time => Time.now + 120 seconds, :title => "Knight Rider", :duration => 3600, :quality => :hight) 
+    #return an Program instance 
+    #throw a ConflictProgramException if there is a "time conflict" with the :start_time and the :duration option
+
+    def make_program(options = {})
+        program = check_program(options)
+        if program != nil
+          puts "program = #{program.to_s}"
+          raise ConflictProgramException.new(program)
+        end
+        record = Program.new(@instance.make(:new =>:program, :with_properties => options))
+    end
+
+    #check options for make a program
+    #return an program instance if a conflict is detected
+    #if no conflict founded, return nil
+
+    def check_program(options={})
+      if(options[:duration] == nil)
+        options[:duration] = 10800
+      end
+      if(options[:start_time] == nil)
+        options[:start_time] = Time.now
+      end
+      res = nil
+      programs(true).each do |prog|
+        if(res == nil and prog.conflict?(options[:start_time], options[:duration]))
+          res = prog
+        end
+      end
+      res
+    end
+  end
+
+  #Exception can be throw by the make_program from EyeTV class
+  class ConflictProgramException < Exception
+    #return the program in conflict
+    attr_reader :program_exist
+
+    def initialize(program)
+      program_exist = program
+    end
   end
 
+
   if __FILE__ == $0
     puts "start Eyetv"
     etv = EyeTV.new

data/lib/program.rb

@@ -32,6 +32,21 @@ module EyeTV
       @program_ref.duration.set(new_duration)
     end
 
+    #calculate the end time of program
+    def end_time
+      start_time + duration
+    end
+
+    #test if the parameters enter in conflict with a program instance
+    def conflict?(test_start_time, nduration)
+      nend_time = test_start_time + nduration
+      if nend_time < start_time or end_time < test_start_time
+        conflict = false
+      else
+        conflict = true
+      end
+    end
+
     def title
       @program_ref.title.get
     end
@@ -53,7 +68,12 @@ module EyeTV
     end
 
     def channel_number=(new_channel_number)
-      @program_ref.channel_number.set(new_channel_number)
+      old_value = channel_number
+      @program_ref.channel_number.set(new_channel_number.to_i)
+      if(channel_number == 0)
+        channel_number = old_value
+        raise "unknow channel #{new_channel_number}"
+      end
     end
 
     def self.input_sources_possible
@@ -65,7 +85,7 @@ module EyeTV
     end
 
     def input_source=(new_input_source)
-      raise "bad value for input_source" if not @@input_sources_possible.include?(new_input_source.to_sym)
+      raise "bad value for input_source" if !new_input_source.respond_to?(:to_sym) or not @@input_sources_possible.include?(new_input_source.to_sym)
       @program_ref.input_source.set(new_input_source.to_sym)
     end
 
@@ -78,7 +98,7 @@ module EyeTV
     end
 
     def repeats=(new_repeats)
-      raise "bad value for repeats" if not @@repeats_possible.include?(new_repeats.to_sym)
+      raise "bad value for repeats" if !new_repeats.respond_to?(:to_sym) or not @@repeats_possible.include?(new_repeats.to_sym)
       @program_ref.repeats.set(new_repeats.to_sym)
     end
 
@@ -91,7 +111,7 @@ module EyeTV
     end
 
     def quality=(new_quality)
-      raise "bad value for quality" if not @@qualities_possible.include?(new_quality.to_sym)
+      raise "bad value for quality" if !new_quality.respond_to?(:to_sym) or not @@qualities_possible.include?(new_quality.to_sym)
       @program_ref.quality.set(new_quality.to_sym)
     end
 

data/lib/recording.rb

@@ -86,6 +86,14 @@ module EyeTV
       @recording_ref.name.set(value)
     end
 
+    def episode
+      name
+    end
+
+    def episode=(value)
+      self.name = value
+    end
+
     def uid
       @recording_ref.unique_ID.get
     end

data/rb-eyetv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rb-eyetv}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dblugeon"]
-  s.date = %q{2009-09-07}
+  s.date = %q{2009-09-10}
   s.description = %q{
       This library provides ruby classes to control the EyeTV Application.
       You can launch the EyeTV apllication, explore recordings, channels or
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/recording.rb",
      "rb-eyetv.gemspec",
      "test/eyetv_test.rb",
+     "test/program_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/dblugeon/rb-eyetv}
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
   s.summary = %q{This library provides ruby classes to control the EyeTV Application}
   s.test_files = [
     "test/eyetv_test.rb",
+     "test/program_test.rb",
      "test/test_helper.rb"
   ]
 

data/test/eyetv_test.rb

@@ -5,6 +5,12 @@ class RbEyetvTest < Test::Unit::TestCase
   context "EyeTV application" do
     setup do
       @instance = EyeTV::EyeTV.new
+      if @instance.programs(true).empty?
+        @program_test = @instance.make_program({:start_time => Time.now + 3600, :duration => 3600, :title => "program unit test"})
+        @clean_program = true
+      else
+        @program_test = @instance.programs(true)[0]
+      end
     end
     should "not recording" do
       assert !(@instance.is_recording?)
@@ -33,5 +39,23 @@ class RbEyetvTest < Test::Unit::TestCase
         assert program.instance_of?(EyeTV::Program), "actual class = #{program.class.to_s}"
       end
     end
+
+    should "check check_program method with conflict program" do
+      assert_not_nil @instance.check_program({:start_time=>@program_test.start_time, :duration=>@program_test.duration})
+    end
+
+    should "check check_program method without conflict program" do
+      tmp_progs = @instance.programs(true).sort do |prog|
+        prog.start_time
+      end
+      prog = tmp_progs.last
+      assert_nil @instance.check_program({:start_time => prog.end_time + 200, :duration => prog.duration})
+    end
+
+    teardown do
+      if @clean_program
+        @program_test.delete
+      end
+    end
   end
 end

data/test/program_test.rb

@@ -0,0 +1,86 @@
+require 'test_helper'
+include EyeTV
+
+class RbProgramTest < Test::Unit::TestCase
+  context "EyeTV Program" do
+    setup do
+      @instance = EyeTV::EyeTV.new
+      if @instance.programs(true).empty?
+        @program_test = @instance.make_program({:start_time => Time.now + 3600, :duration => 3600, :title => "program unit test"})
+        @clean_program = true
+      else
+        @program_test = @instance.programs(true)[0]
+      end
+    end
+    
+    should "test raise exception in input_source= method" do
+      assert_raise RuntimeError do
+        @program_test.input_source = DateTime.new
+      end
+    end
+
+    should "test raise exception in repeats= method" do
+      assert_raise RuntimeError do
+        @program_test.repeats = "never1"
+      end
+    end
+
+    should "test raise exception in quality= method" do
+      assert_raise RuntimeError do
+        @program_test.quality = "hight2"
+      end
+    end
+
+    should "test raise exception in start_time= method" do
+      assert_raise RuntimeError do
+        @program_test.start_time = DateTime.new
+      end
+    end
+
+    should "test raise exception in channel_number= method with string" do
+      assert_raise RuntimeError do
+        @program_test.channel_number = "sqdqs"
+      end
+    end
+
+    should "test raise exception in channel_number= method with 12000 channel" do
+      assert_raise RuntimeError do
+        @program_test.channel_number = "12000"
+      end
+    end
+
+    should "end_time must be equals to start_time + duration" do
+      assert_equal (@program_test.start_time + @program_test.duration), @program_test.end_time
+    end
+    
+    should "program must conflict" do
+      test_start_time = @program_test.start_time + 200
+      duration = 1000
+
+      assert @program_test.conflict?(test_start_time, duration)
+      
+      test_start_time = @program_test.start_time - 100
+
+      assert @program_test.conflict?(test_start_time, duration)
+      
+      test_start_time = @program_test.end_time - 250
+      
+      assert @program_test.conflict?(test_start_time, duration)
+    end
+    
+    should "program should not conflict" do
+      test_start_time = @program_test.start_time - 1500
+      duration = 1000
+      
+      assert !@program_test.conflict?(test_start_time, duration)
+      
+      test_start_time = @program_test.end_time + 500
+    end
+    
+    teardown do
+      if @clean_program
+        @program_test.delete
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dblugeon-rb-eyetv
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - dblugeon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,10 @@ files:
 - lib/recording.rb
 - rb-eyetv.gemspec
 - test/eyetv_test.rb
+- test/program_test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/dblugeon/rb-eyetv
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -78,10 +78,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: This library provides ruby classes to control the EyeTV Application
 test_files: 
 - test/eyetv_test.rb
+- test/program_test.rb
 - test/test_helper.rb