airstream 0.2.3 → 0.3.1

data/bin/airstream

@@ -6,9 +6,7 @@ options = {
   reciever: '192.168.1.8',
   quiet: false,
   verbose: false,
-  use_local_http: false,
-  http_path: '/var/www/html/airstream/',
-  http_url: 'http://192.168.1.2/airstream/'
+  use_local_http: true
 }
 
 CONFIG_FILE = File.join(ENV['HOME'], '.airstreamrc')
@@ -45,30 +43,14 @@ Basic options: (configure default in ~/.airstreamrc)
     options[:verbose] = verbose
   end
 
-  opts.on("--enable-use-httpd",
-   "use httpd to offer local files") do |use_httpd|
-    options[:use_local_httpd] = true
-  end
-
-  opts.on("-u HTTP_URL",
-   "the local webserver url") do |http_url|
-    options[:http_url] = http_url
-  end
-
-  opts.on("-p HTTP_PATH",
-   "the local webserver directory path") do |path|
-    options[:http_path] = path
-  end
-
-  # opts.on("--cleanup",
-  #  "remove the local webserver files and exit") do |path|
-  #   FileUtils.rm(Dir.glob(options[:http_path] + '/*'))
-  #   exit 0
+  # opts.on("--enable-use-httpd",
+  #  "use httpd to offer local files") do |use_httpd|
+  #   options[:use_local_httpd] = true
   # end
 
   opts.on("-v", "--version",
    "output version information then quit") do |path|
-    puts "airstream v" + Airplay::VERSION
+    puts "airstream v" + Airstream::VERSION
     exit 0
   end
 end
@@ -80,6 +62,7 @@ if ARGV.empty?
 end
 
 begin
+
   option_parser.parse!
 
   unless options[:reciever]
@@ -89,32 +72,46 @@ begin
 
   server = Airstream::Server.new(options[:reciever])
 
+  puts "=> Ctrl-C to exit airstream"
   ARGV.each do |file|
-    server.allow_local_httpd = options[:use_local_httpd]
-    if server.local_httpd_allowed?
-      server.http_path = options[:http_path]
-      server.http_url  = options[:http_url]
-    end
 
+    server.allow_local_httpd = options[:use_local_httpd]
+    puts "sending video file #{file}" if options[:verbose]
     server.video = file
 
+    print "loading " unless options[:quiet]
     "|/-\\".chars.cycle.each do |c|
-      print c; sleep(0.2); print "\b"
+      print c unless options[:quiet]
+      sleep(0.2)
+      print "\b" unless options[:quiet]
       break unless server.loading?
     end
+    puts "done" unless options[:quiet]
 
+    video_title = File.basename(file, '.mp4')
     pbar_options = {
-      title: File.basename(file, '.mp4'),
+      title: video_title,
       total: server.video_duration,
-      format: '%t %a |%b>>%i| %p%%'
+      format: '%t |%b%i| %p%%'
     }
     pbar = ProgressBar.create(pbar_options)
-    while server.video_position < server.video_duration
-      pbar.progress = server.video_position
+    while (elapsed_time=server.video_position) < server.video_duration
+      pbar.progress = elapsed_time
+      formatted_time = Time.at(elapsed_time).gmtime.strftime('%R:%S')
+      pbar.title = "#{video_title} #{formatted_time}"
       sleep 1.0
     end
     pbar.finish
   end
+
+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
 rescue Interrupt
   STDERR.puts
   STDERR.puts "exiting"

data/lib/airstream.rb

@@ -2,13 +2,16 @@
 require 'optparse'
 require 'airplay'
 require 'ruby-progressbar'
-require 'digest'
-require 'fileutils'
 require 'yaml'
+require 'rack'
 
 module Airstream
-  VERSION = '0.2.3'
-  DEFAULT_PORT = 7000
+  AIRPLAY_PORT = 7000
+  AIRSTREAM_PORT = 7000
 end
 
+require 'airstream/version.rb'
+require 'airstream/network.rb'
+require 'airstream/node.rb'
+require 'airstream/video.rb'
 require 'airstream/server.rb'

data/lib/airstream/network.rb

@@ -0,0 +1,11 @@
+
+require 'socket'
+
+module Airstream
+  class Network
+    # http://stackoverflow.com/questions/5029427/ruby-get-local-ip-nix
+    def self.get_local_ip
+      Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.ip_address
+    end
+  end
+end

data/lib/airstream/server.rb

@@ -1,15 +1,11 @@
 
 module Airstream
-  class Server < Airplay::Client
-    attr_accessor :http_path, :http_url, :video_duration
+  class Server
 
     @local_httpd_allowed = false
 
     def initialize(reciever)
-      node = Airplay::Server::Node.new(
-        reciever, reciever, reciever, Airstream::DEFAULT_PORT)
-      @device = Airplay::Client.new(node)
-      @device.use(node) # does not work without that second assign
+      @device = Airstream::Node.new reciever
     end
 
     def image=(image_file)
@@ -17,16 +13,9 @@ module Airstream
     end
 
     def video=(video_file)
-      video_duration = nil
-      if File.exists?(video_file) && local_httpd_allowed?
-        filename = Digest::MD5.hexdigest(File.basename(video_file, '.mp4')) + ".mp4"
-        unless File.exists?(http_path + filename)
-          FileUtils.cp(video_file, http_path + filename)
-        end
-        @device.send_video http_url + filename
-      else
-        @device.send_video video_file
-      end
+      @video_duration = nil
+      video = Video.new(video_file)
+      @device.send_video(video.url)
     end
 
     def allow_local_httpd=(is_allowed)

data/lib/airstream/version.rb

@@ -0,0 +1,4 @@
+
+module Airstream
+  VERSION = '0.3.1'
+end

data/lib/airstream/video.rb

@@ -0,0 +1,35 @@
+
+require 'rack'
+require 'webrick'
+
+module Airstream
+  class Video
+
+    @@server = nil
+    attr_reader :url
+
+    def initialize(video_file)
+      if File.exists? video_file
+        @@server.server.shutdown if @@server
+        @url = host_file(video_file)
+      else
+        @url = video_file
+      end
+    end
+
+    def host_file(file)
+      @@server = Rack::Server.new(
+        :server => :webrick,
+        :Host => Airstream::Network.get_local_ip,
+        :Port => AIRSTREAM_PORT,
+        :app => Rack::File.new(file),
+        :AccessLog => [], # stfu webrick
+        :Logger => WEBrick::Log::new("/dev/null", 7)
+      )
+      Thread.start do
+        @@server.start
+      end
+      "http://#{@@server.options[:Host]}:#{@@server.options[:Port]}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airstream
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airplay
@@ -59,8 +59,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "A command line tool to stream video and image files to\n                     airplay-devices,
-  a webserver is needed for local video\n                     files."
+description: ! "A command line tool to stream video and image files to\n                     airplay-devices."
 email:
 - christoph at lipautz.org
 executables:
@@ -72,6 +71,9 @@ files:
 - bin/airstream
 - bin/airimg
 - lib/airstream.rb
+- lib/airstream/version.rb
+- lib/airstream/network.rb
+- lib/airstream/video.rb
 - lib/airstream/server.rb
 homepage: https://github.com/unused/airstream
 licenses: []