airstream 0.3.4 → 0.3.6

data/bin/airimg

@@ -2,11 +2,21 @@
 
 require 'airstream'
 
+def self.exit(status)
+  Airstream::Io.show_input
+  puts "\n" # clear output
+  super status
+end
+
 options = {
   reciever: '192.168.1.8',
   interval: 3
 }
 
+EXIT_OK = 0
+EXIT_ERROR = 1
+EXIT_NO_HOST = 68
+
 CONFIG_FILE = File.join(ENV['HOME'], '.airstreamrc')
 
 if File.exists? CONFIG_FILE
@@ -53,19 +63,29 @@ begin
     exit 68
   end
 
-  server = Airstream::Server.new(options[:reciever])
+  device = Airstream::Device.new(options[:reciever])
 
+  io = Airstream::Io.new
+  io.quiet = options[:quiet]
+  io.verbose = options[:verbose]
+  io.puts "=> press ["+Airstream::Io::KEY_QUIT+"] to exit airstream"
+  Airstream::Io.hide_input
   ARGV.each do |file|
-    server.image = file
+    device.image = file
     sleep options[:interval]
+    io.catch_input
+    break if io.quit?
   end
 
+
 rescue Interrupt
   STDERR.puts
   STDERR.puts "exiting"
-  exit 0
+  exit EXIT_OK
 rescue OptionParser::InvalidArgument => ex
   STDERR.puts ex.message
   STDERR.puts option_parser
+  exit EXIT_ERROR
 end
 
+exit EXIT_OK

data/bin/airstream

@@ -2,6 +2,12 @@
 
 require 'airstream'
 
+def self.exit(status)
+  Airstream::Io.show_input
+  puts "\n" # clear output
+  super status
+end
+
 options = {
   reciever: '192.168.1.8',
   quiet: false,
@@ -11,6 +17,12 @@ options = {
 
 CONFIG_FILE = File.join(ENV['HOME'], '.airstreamrc')
 
+EXIT_OK = 0
+EXIT_ERROR = 1
+EXIT_NO_HOST = 68
+
+UPDATE_TIMEOUT = 0.2
+
 if File.exists? CONFIG_FILE
   options_config = YAML.load_file(CONFIG_FILE)
   options.merge!(options_config)
@@ -51,15 +63,16 @@ Basic options: (configure default in ~/.airstreamrc)
   opts.on("-v", "--version",
    "output version information then quit") do |path|
     puts "airstream v" + Airstream::VERSION
-    exit 0
+    exit EXIT_OK
   end
 end
 
 if ARGV.empty?
   STDERR.puts "No arguments given"
   STDERR.puts option_parser
-  exit 1
+  exit EXIT_ERROR
 end
+playlist = ARGV
 
 begin
 
@@ -67,64 +80,39 @@ begin
 
   unless options[:reciever]
     STDERR.puts "No host given"
-    exit 68
+    exit EXIT_NO_HOST
   end
 
   io = Airstream::Io.new
   io.quiet = options[:quiet]
   io.verbose = options[:verbose]
-  server = Airstream::Server.new(options[:reciever])
-
-  puts "=> Ctrl-C to exit airstream"
-  ARGV.each do |file|
-
-    server.allow_local_httpd = options[:use_local_httpd]
-    io.info "sending video file #{file}"
-    server.video = file
-
-    io.print "loading"
-    while server.loading?
-      io.print "."
-      sleep(0.7)
-    end
-    io.puts " done"
-
-    video_title = File.basename(file, '.mp4')
-    pbar_options = {
-      title: video_title,
-      total: server.video_duration,
-      format: '%t |%b%i| %p%%'
-    }
-
-    io.hide_input
-    pbar = ProgressBar.create(pbar_options)
-    while (elapsed_time=server.video_position) < server.video_duration
-      io.catch_input
-      break if io.quit? || io.skip?
-      pbar.progress = elapsed_time
-      formatted_time = Time.at(elapsed_time).gmtime.strftime('%R:%S')
-      pbar.title = "#{video_title} #{formatted_time}"
-      sleep 0.5
-    end
-    io.show_input
-    pbar.finish
-    break if io.quit?
-  end
+  device = Airstream::Device.new(options[:reciever], playlist)
+
+  io.puts "=> press ["+Airstream::Io::KEY_QUIT+"] to exit airstream"
+  Airstream::Io.hide_input
+  begin
+    sleep UPDATE_TIMEOUT
+    io.catch_input
+    device.update io
+  end until io.quit? || device.finished?
 
 rescue Airplay::Protocol::InvalidMediaError
   STDERR.puts
   STDERR.puts "invalid media file"
-  exit 0
-rescue NoMethodError # @FIX webrick raises no method error
-  STDERR.puts
-  STDERR.puts "file host shutdown"
-  exit 0
+  exit EXIT_ERROR
+# rescue NoMethodError # @FIX webrick raises no method error
+#   STDERR.puts
+#   STDERR.puts "file host shutdown"
+#   exit EXIT_OK
 rescue Interrupt
   STDERR.puts
   STDERR.puts "exiting"
-  exit 0
+  exit EXIT_ERROR
 rescue OptionParser::InvalidArgument => ex
   STDERR.puts ex.message
   STDERR.puts option_parser
+  exit EXIT_ERROR
 end
 
+exit EXIT_OK
+

data/lib/airstream.rb

@@ -15,4 +15,4 @@ require 'airstream/io.rb'
 require 'airstream/network.rb'
 require 'airstream/node.rb'
 require 'airstream/video.rb'
-require 'airstream/server.rb'
+require 'airstream/device.rb'

data/lib/airstream/device.rb

@@ -0,0 +1,98 @@
+
+module Airstream
+  # pbar = ProgressBar.create(pbar_options)
+  # while (elapsed_time=server.video_position) < server.video_duration
+  #   io.catch_input
+  #   break if io.quit? || io.skip?
+  #   pbar.progress = elapsed_time
+  #   formatted_time = Time.at(elapsed_time).gmtime.strftime('%R:%S')
+  #   pbar.title = "#{video_title} #{formatted_time}"
+  #   sleep 0.5
+  # end
+  # io.show_input
+  # pbar.finish
+  class Device
+
+    @local_httpd_allowed = false
+    @current_file_index
+
+    def initialize(reciever, files=[])
+      @video_files = files
+      @reciever = Airstream::Node.new reciever
+      @current_file_index = 0
+      self.video = files.first unless files.empty?
+    end
+
+    def image=(image_file)
+      @reciever.send_image image_file
+    end
+
+    def video=(video_file)
+      @pbar.finish unless @pbar == nil
+      @video_duration = nil
+      video = Video.new(video_file)
+      @player = @reciever.send_video(video.url)
+      print "loading"
+      while loading?
+        print "."
+        sleep 0.8
+      end
+      @pbar = ProgressBar.create({ format: '%t |%b%i| %p%%', total: video_duration })
+      @video_title = File.basename(video_file, File.extname(video_file))
+    end
+
+    def update(io)
+      elapsed_time = video_position
+      formatted_time = Time.at(elapsed_time).gmtime.strftime('%R:%S')
+      @pbar.title = "#{@video_title} #{formatted_time}"
+      if io.quit?
+        Airstream::Io.show_input
+        exit # TODO skip to last fil, no exit
+      elsif io.skip? || video_duration <= elapsed_time
+        @current_file_index += 1
+        self.video = @video_files[@current_file_index] if @video_files.count > @current_file_index
+      elsif io.prev?
+        if @current_file_index == 0
+          @reciever.scrub(0)
+        else
+          @current_file_index -= 1
+          self.video = @video_files[@current_file_index] if @video_files.count > @current_file_index
+        end
+      elsif io.fwd?
+        @reciever.scrub(video_position + 30) if video_position + 30 < video_duration
+      elsif io.back?
+        @reciever.scrub(video_position - 30) if video_position - 30 > 0
+      elsif io.pause?
+        paused? ? @player.pause : @player.resume
+      end
+    end
+
+    def finished?
+      !! (@current_file_index == @video_files.count-1) && (video_position == video_duration)
+    end
+
+    def allow_local_httpd=(is_allowed)
+      @local_httpd_allowed = is_allowed
+    end
+
+    def local_httpd_allowed?
+      @local_httpd_allowed
+    end
+
+    def loading?
+      @reciever.scrub['position'] == 0
+    end
+
+    def video_position
+      @pbar.progress = @reciever.scrub['position']
+    end
+
+    def video_duration
+      @video_duration = @video_duration || @reciever.scrub['duration']
+    end
+
+    def paused?
+      @paused = !@paused || false
+    end
+  end
+end

data/lib/airstream/io.rb

@@ -3,6 +3,13 @@ require 'io/wait'
 
 module Airstream
   class Io
+    KEY_QUIT = 'q'
+    KEY_SKIP = '>'
+    KEY_PREV = '<'
+    KEY_FWD  = '.'
+    KEY_BACK = ','
+    KEY_PAUSE = ' '
+
     attr_writer :quiet, :verbose
     attr_reader :key
 
@@ -18,11 +25,11 @@ module Airstream
       STDOUT.puts msg if @verbose
     end
 
-    def hide_input
+    def self.hide_input
       `stty raw -echo`
     end
 
-    def show_input
+    def self.show_input
       `stty -raw echo`
     end
 
@@ -36,11 +43,27 @@ module Airstream
     end
 
     def quit?
-      @key == "q"
+      @key == KEY_QUIT
     end
 
     def skip?
-      @key == "s"
+      @key == KEY_SKIP
+    end
+
+    def prev?
+      @key == KEY_PREV
+    end
+
+    def fwd?
+      @key == KEY_FWD
+    end
+
+    def back?
+      @key == KEY_BACK
+    end
+
+    def pause?
+      @key == KEY_PAUSE
     end
   end
 end

data/lib/airstream/version.rb

@@ -1,4 +1,4 @@
 
 module Airstream
-  VERSION = '0.3.4'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airstream
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airplay
@@ -103,12 +103,12 @@ files:
 - bin/airstream
 - bin/airimg
 - lib/airstream.rb
-- lib/airstream/version.rb
+- lib/airstream/device.rb
 - lib/airstream/io.rb
 - lib/airstream/network.rb
 - lib/airstream/node.rb
+- lib/airstream/version.rb
 - lib/airstream/video.rb
-- lib/airstream/server.rb
 homepage: https://github.com/unused/airstream
 licenses: []
 post_install_message: 

data/lib/airstream/server.rb

@@ -1,42 +0,0 @@
-
-module Airstream
-  class Server
-
-    @local_httpd_allowed = false
-
-    def initialize(reciever)
-      @device = Airstream::Node.new reciever
-    end
-
-    def image=(image_file)
-      @device.send_image image_file
-    end
-
-    def video=(video_file)
-      @video_duration = nil
-      video = Video.new(video_file)
-      @device.send_video(video.url)
-    end
-
-    def allow_local_httpd=(is_allowed)
-      @local_httpd_allowed = is_allowed
-    end
-
-    def local_httpd_allowed?
-      @local_httpd_allowed
-    end
-
-    def loading?
-      @device.scrub['position'] == 0
-    end
-
-    def video_position
-      @device.scrub['position']
-    end
-
-    def video_duration
-      @video_duration = @video_duration || @device.scrub['duration']
-    end
-
-  end
-end