airstream 0.2.2 → 0.2.3

data/bin/airimg

@@ -1,10 +1,6 @@
 #!/usr/bin/env ruby
 
-PROGRAM_VERSION = "0.2.1"
-
-require 'optparse'
-require 'airplay'
-require 'yaml'
+require 'airstream'
 
 options = {
   reciever: '192.168.1.8',
@@ -38,7 +34,7 @@ Basic options: (configure default in ~/.airstreamrc)
 
   opts.on("-v", "--version",
    "output version information then quit") do |path|
-    puts "airstream airimg v" + PROGRAM_VERSION
+    puts "airstream airimg v" + Airstream::VERSION
     exit 0
   end
 end
@@ -57,16 +53,17 @@ begin
     exit 68
   end
 
-  node = Airplay::Server::Node.new(options[:reciever],
-           options[:reciever], options[:reciever], 7000)
-  ap = Airplay::Client.new node
-  ap.use node # does not work without that second assign
+  server = Airstream::Server.new(options[:reciever])
 
   ARGV.each do |file|
-    ap.send_image file
+    server.image = file
     sleep options[:interval]
   end
 
+rescue Interrupt
+  STDERR.puts
+  STDERR.puts "exiting"
+  exit 0
 rescue OptionParser::InvalidArgument => ex
   STDERR.puts ex.message
   STDERR.puts option_parser

data/bin/airstream

@@ -1,13 +1,6 @@
 #!/usr/bin/env ruby
 
-PROGRAM_VERSION = "0.2.1"
-
-require 'optparse'
-require 'airplay'
-require 'ruby-progressbar'
-require 'digest'
-require 'fileutils'
-require 'yaml'
+require 'airstream'
 
 options = {
   reciever: '192.168.1.8',
@@ -67,9 +60,15 @@ Basic options: (configure default in ~/.airstreamrc)
     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
+  # end
+
   opts.on("-v", "--version",
    "output version information then quit") do |path|
-    puts "airstream v" + PROGRAM_VERSION
+    puts "airstream v" + Airplay::VERSION
     exit 0
   end
 end
@@ -88,50 +87,38 @@ begin
     exit 68
   end
 
-  node = Airplay::Server::Node.new(options[:reciever],
-           options[:reciever], options[:reciever], 7000)
-  ap = Airplay::Client.new node
-  ap.use node # does not work without that second assign
+  server = Airstream::Server.new(options[:reciever])
 
   ARGV.each do |file|
-    if File.exists?(file) && options[:use_local_httpd]
-      # raise ArgumentError unless options[:use_local_httpd]
-      # raise ArgumentError unless options[:http_path]
-      # raise ArgumentError unless options[:http_url]
-      filename = Digest::MD5.hexdigest(File.basename(file, '.mp4')) + ".mp4"
-
-      puts "generated hash-filename for local webserver: #{filename}" if options[:verbose]
-
-      unless File.exists?(options[:http_path] + filename)
-        FileUtils.cp(file, options[:http_path] + filename)
-        puts "copied file to #{options[:http_path]}#{filename}" if options[:verbose]
-      end
-      puts "sending local file #{filename}" unless options[:quiet]
-      ap.send_video options[:http_url] + filename
-    else
-      puts "sending remote file #{filename}" unless options[:quiet]
-      ap.send_video 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
-    print "loading" unless options[:quiet]
-    while ap.scrub['position'] == 0
-      # do not wait a second to make user believie it is
-      # loading much faster... psychology is a bitch
-      sleep 0.8
-      print "." unless options[:quiet]
+
+    server.video = file
+
+    "|/-\\".chars.cycle.each do |c|
+      print c; sleep(0.2); print "\b"
+      break unless server.loading?
     end
 
     pbar_options = {
       title: File.basename(file, '.mp4'),
-      total: ap.scrub['duration'],
+      total: server.video_duration,
       format: '%t %a |%b>>%i| %p%%'
     }
     pbar = ProgressBar.create(pbar_options)
-    while ap.scrub['position'] < ap.scrub['duration']
-      pbar.progress = ap.scrub['position']
+    while server.video_position < server.video_duration
+      pbar.progress = server.video_position
       sleep 1.0
     end
     pbar.finish
   end
+rescue Interrupt
+  STDERR.puts
+  STDERR.puts "exiting"
+  exit 0
 rescue OptionParser::InvalidArgument => ex
   STDERR.puts ex.message
   STDERR.puts option_parser

data/lib/airstream.rb

@@ -0,0 +1,14 @@
+
+require 'optparse'
+require 'airplay'
+require 'ruby-progressbar'
+require 'digest'
+require 'fileutils'
+require 'yaml'
+
+module Airstream
+  VERSION = '0.2.3'
+  DEFAULT_PORT = 7000
+end
+
+require 'airstream/server.rb'

data/lib/airstream/server.rb

@@ -0,0 +1,53 @@
+
+module Airstream
+  class Server < Airplay::Client
+    attr_accessor :http_path, :http_url, :video_duration
+
+    @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
+    end
+
+    def image=(image_file)
+      @device.send_image image_file
+    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
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airstream
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -71,12 +71,15 @@ extra_rdoc_files: []
 files:
 - bin/airstream
 - bin/airimg
+- lib/airstream.rb
+- lib/airstream/server.rb
 homepage: https://github.com/unused/airstream
 licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements: