airstream 0.3.7 → 0.4.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 26c40a42a5da7cbfdd5467b39c2561d4af6e95d0
+  data.tar.gz: 095071b2e9df32109de7052bdb705434fc5cb16d
+SHA512:
+  metadata.gz: ebe726dd234697e786a91474b26f74e078f14016205c1ccdcccf70ac200b7e86350c734011de41d2951da9fd5d857540f0406d4edeb3304e3e8f4b10b2386113
+  data.tar.gz: f0bf04ee5c7768f0e60da864630f39540951b8fe5366acda57f1457bfb00724a96749456087da5fdd77e85c3295d2909042a43580c615b52b087d8292c30b19b

data/bin/airimg

@@ -86,6 +86,8 @@ rescue OptionParser::InvalidArgument => ex
   STDERR.puts ex.message
   STDERR.puts option_parser
   exit EXIT_ERROR
+ensure
+  Airstream::Io.show_input
 end
 
 exit EXIT_OK

data/bin/airstream

@@ -9,10 +9,10 @@ def self.exit(status)
 end
 
 options = {
-  reciever: '192.168.1.8',
+  reciever: '192.168.0.123',
   quiet: false,
   verbose: false,
-  use_local_http: true
+  # disable_local_http: true
 }
 
 CONFIG_FILE = File.join(ENV['HOME'], '.airstreamrc')
@@ -55,9 +55,9 @@ 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
+  # opts.on("--disable-use-httpd",
+  #  "do not create httpd to offer local files") do |disable_httpd|
+  #   options[:disable_local_httpd] = true
   # end
 
   opts.on("-v", "--version",
@@ -86,15 +86,29 @@ begin
   io = Airstream::Io.new
   io.quiet = options[:quiet]
   io.verbose = options[:verbose]
-  device = Airstream::Device.new(options[:reciever], playlist)
+  node = Airstream::Node.new options[:reciever]
+  device = Airstream::Device.new node
+  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
-  begin
+  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.progress = player.elapsed_time
     io.catch_input
-    device.update io
-  end until io.quit? || device.finished?
+    player.update io
+  end until io.quit? || player.finished?
+  pbar.finish
 
 rescue Airplay::Protocol::InvalidMediaError
   STDERR.puts
@@ -112,6 +126,8 @@ rescue OptionParser::InvalidArgument => ex
   STDERR.puts ex.message
   STDERR.puts option_parser
   exit EXIT_ERROR
+ensure
+  Airstream::Io.show_input
 end
 
 exit EXIT_OK

data/lib/airstream.rb

@@ -14,5 +14,6 @@ require 'airstream/version.rb'
 require 'airstream/io.rb'
 require 'airstream/network.rb'
 require 'airstream/node.rb'
+require 'airstream/player.rb'
 require 'airstream/video.rb'
 require 'airstream/device.rb'

data/lib/airstream/device.rb

@@ -1,99 +1,43 @@
 
 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
+  class Device
 
-    def image=(image_file)
-      @reciever.send_image image_file
-    end
+    attr_reader :player, :video_title
 
-    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))
+    def initialize(reciever)
+      @reciever = reciever
     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 file, 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
+    def file=(file)
+      if file.class == Video
+        self.video = file
+      # when
+        # TODO Image then self.image = file
+      else
+        raise "Unkown file type send to device"
       end
     end
 
-    def finished?
-      elapsed_time = video_position
-      !! (@current_file_index == @video_files.count-1) && (video_duration <= elapsed_time)
-    end
-
-    def allow_local_httpd=(is_allowed)
-      @local_httpd_allowed = is_allowed
-    end
-
-    def local_httpd_allowed?
-      @local_httpd_allowed
+    def image=(image_file)
+      @reciever.send_image image_file
     end
 
-    def loading?
-      @reciever.scrub['position'] == 0
+    def video=(video)
+      @player = @reciever.send_video video.url
+      @video_title = video.to_s
     end
 
-    def video_position
-      @pbar.progress = @reciever.scrub['position']
+    def scrub
+      @player.scrub
     end
 
-    def video_duration
-      @video_duration = @video_duration || @reciever.scrub['duration']
+    def duration
+      self.scrub["duration"]
     end
 
-    def paused?
-      @paused = !@paused || false
+    def position
+      self.scrub["position"]
     end
   end
 end

data/lib/airstream/io.rb

@@ -25,6 +25,10 @@ module Airstream
       STDOUT.puts msg if @verbose
     end
 
+    def error(msg)
+      STDERR.puts msg
+    end
+
     def self.hide_input
       `stty raw -echo`
     end

data/lib/airstream/node.rb

@@ -6,6 +6,7 @@ module Airstream
       node = Airplay::Server::Node.new(
         reciever, reciever, reciever, AIRPLAY_PORT)
       super node
+      # TODO test if does not work without
       use node # does not work without that second assign
     end
 

data/lib/airstream/version.rb

@@ -1,4 +1,4 @@
 
 module Airstream
-  VERSION = '0.3.7'
+  VERSION = '0.4.2'
 end

data/lib/airstream/video.rb

@@ -9,20 +9,25 @@ module Airstream
     attr_reader :url
 
     def initialize(video_file)
+      @filename = video_file
       if File.exists? video_file
         @@server.server.shutdown if @@server
-        @url = host_file(video_file)
+        @url = host_file
       else
         @url = video_file
       end
     end
 
-    def host_file(file)
+    def to_s
+      File.basename(@filename, File.extname(@filename))
+    end
+
+    def host_file
       @@server = Rack::Server.new(
         :server => :webrick,
         :Host => Airstream::Network.get_local_ip,
         :Port => AIRSTREAM_PORT,
-        :app => Rack::File.new(file),
+        :app => Rack::File.new(@filename),
         :AccessLog => [], # stfu webrick
         :Logger => WEBrick::Log::new("/dev/null", 7)
       )

metadata

@@ -1,97 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: airstream
 version: !ruby/object:Gem::Version
-  version: 0.3.7
-  prerelease: 
+  version: 0.4.2
 platform: ruby
 authors:
 - Christoph Lipautz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airplay
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "A command line tool to stream video and image files to\n                     airplay-devices."
+description: |-
+  A command line tool to stream video and image files to
+                       airplay-devices.
 email:
 - christoph at lipautz.org
 executables:
@@ -111,27 +102,26 @@ files:
 - lib/airstream/video.rb
 homepage: https://github.com/unused/airstream
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command line tool for streaming to airplay-devices
 test_files: []