airstream 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dcc6b746507c0834d07796b1210fdd144a63fc0
-  data.tar.gz: 514729d6c594017ddfa7f2b5ffced46f4b14c48e
+  metadata.gz: ac0c884a1f577c6fc3fc4e1b0c3a355b385d77d3
+  data.tar.gz: 5b1a0c88738bfc1f0d2c922de030e3f250526b1c
 SHA512:
-  metadata.gz: 1e94db9ed3a632972a85e8345d4c234b923f88cbc8c7fc4095f97bd3209e4e350bbd82ae5d4a50e22e6c6e4101b9f7149c3af000028951918154c3540d82c292
-  data.tar.gz: 66740428e655199cf331d77ff629d48554109ecf28fd58065089241937738c9b8a1425a78c2235d9371429ebe66c98c0ebe22f593e58767d8fdb55bdc8ce2cf9
+  metadata.gz: b30d51c232d4aee85c099e52fde1ac32899e6a8eca2ac85903ae0b3cd6f75f496f27f70dd931e6b9daddbb4b21dec070bc884e4c8731d2a6bec1fd7e76ee791f
+  data.tar.gz: b1b079c7f04119542aeb3c6a92b0277bf5355dbfc4665cd73c6db985ba2d515404d3cb32e7fd44d63b43a5b3e09912d1fb70e44abb324902f4098784764a47b6

data/bin/airstream

@@ -88,22 +88,17 @@ begin
   io.verbose = options[:verbose]
   node = Airstream::Node.new options[:reciever]
   device = Airstream::Device.new node
+  io.puts "loading can take a few seconds..."
   playlist.map! { |file| Airstream::Video.new(file) }
   player = Airstream::Player.new device, playlist
 
-  io.puts "loading"
-  while player.loading?
-    io.print "."
-    sleep 0.8
-  end
-
   io.puts "=> press ["+Airstream::Io::KEY_QUIT+"] to exit airstream"
   Airstream::Io.hide_input
   pbar = ProgressBar.create({ format: '%t |%b%i| %p%%', total: player.duration })
   begin # reconsider playing...
     sleep UPDATE_TIMEOUT
     formatted_time = Time.at(player.elapsed_time).gmtime.strftime('%R:%S')
-    pbar.title = "#{formatted_time}"
+    pbar.title = "#{player.current_title} #{formatted_time}"
     pbar.progress = player.elapsed_time
     io.catch_input
     player.update io

data/lib/airstream/device.rb

@@ -17,6 +17,11 @@ module Airstream
       else
         raise "Unkown file type send to device"
       end
+      block_while_loading
+    end
+
+    def block_while_loading
+      sleep 0.2 until position != 0
     end
 
     def image=(image_file)
@@ -36,8 +41,8 @@ module Airstream
       @player.resume
     end
 
-    def scrub
-      @player.scrub
+    def scrub(seconds=nil)
+      @player.scrub seconds
     end
 
     def duration

data/lib/airstream/player.rb

@@ -22,7 +22,6 @@ module Airstream
     end
 
     def current_file=(file)
-      # OPTIMIZE check if file exists (local, remote)
       @device.file = file
     end
     private :current_file=
@@ -69,6 +68,10 @@ module Airstream
       end
     end
 
+    def current_title
+      @files[@file_index]
+    end
+
     def finished?
       @finished || false
     end

data/lib/airstream/version.rb

@@ -1,4 +1,4 @@
 
 module Airstream
-  VERSION = '0.4.4'
+  VERSION = '0.4.6'
 end

data/lib/airstream/video.rb

@@ -6,23 +6,21 @@ module Airstream
   class Video
 
     @@server = nil
-    attr_reader :url
 
     def initialize(video_file)
       @filename = video_file
-      if File.exists? video_file
-        @@server.server.shutdown if @@server
-        @url = host_file
-      else
-        @url = video_file
-      end
     end
 
     def to_s
       File.basename(@filename, File.extname(@filename))
     end
 
+    def url
+      File.exists?(@filename) ? host_file : @filename
+    end
+
     def host_file
+      @@server.server.shutdown if @@server
       @@server = Rack::Server.new(
         :server => :webrick,
         :Host => Airstream::Network.get_local_ip,
@@ -36,5 +34,6 @@ module Airstream
       end
       "http://#{@@server.options[:Host]}:#{@@server.options[:Port]}"
     end
+    private :host_file
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airstream
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Christoph Lipautz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airplay