partygoer-player 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de5eedf33fdf8d92d9a529e7e388c2e73fa2f1a
-  data.tar.gz: 2203335b57f79b2a9ae9209e0cb71377e6fa8047
+  metadata.gz: cd808b3732d0e0668a599ed9622cd453901993ed
+  data.tar.gz: 41ecf1d437b1a5f47b6218b34278ec0754b6c269
 SHA512:
-  metadata.gz: ae09b7f31645833b5b3193ad0fdbf34730690de1591169ffd0935faee6152d55e926cee90fc224fd5ba80805554e3a04d7f177137471e1f45faf957fdfedee6f
-  data.tar.gz: 587e28e8f27bd002c21b185fb0129b2d22ff200c0732a3a858612e6f676794939d2152a5b41fc682777b589678d2679b6cd6ad2cee7149fd8b2826c96320483e
+  metadata.gz: 6b0a586cc946eb9dc4b57b756f3038a3b9f418d98cae49fb55b840c1afffbb2f898e29b51edb43d186c84e42be7e94e8bd2113913eb483da7d5baf6148b23f46
+  data.tar.gz: 0fd1065e887d3ad902da5d9f275fb8ea6e19a2b8226bf75cc06d9c0278b17a26535b5808f122566c7a88b99e9041eb4e41a44f4338d42270cc3cfc6d4e2fbe05

data/.gitignore

@@ -3,3 +3,4 @@
 **/*.log*
 **/.spotify
 **/config.yml
+*.gem

data/lib/partygoer-player.rb

@@ -3,172 +3,172 @@
 
 require 'yaml'
 require 'logger'
+require 'thread'
 
 require 'plaything'
 require 'partygoer-client'
 
 require_relative 'partygoer-player/support'
+require_relative 'partygoer-player/framereader'
 
 
 
 module PartyGoerPlayer
 
-  @@logger = Logger.new('partygoer-player.log', 2, 1_000_000)
-  @@logger.formatter = proc do |severity, datetime, _progname, msg|
-    "\n\n#{datetime} #{severity}:\n\t#{msg}"
+  def self.new(server)
+    Player.new(server)
   end
-  @@logger.level = Logger::DEBUG
 
-  client = PartyGoerClient.new('http://partygoer.io')
-
-  @@playign = false
+  class Player
+    @@logger = Support.logger
+
+    def initialize(server)
+      @client = PartyGoerClient.new(server)
+      @plaything = Plaything.new
+      @playing = false
+
+      $session_callbacks = {
+        log_message: proc do |_session, message|
+          @@logger.info { "Message from spotify: #{message}" }
+        end,
+
+        logged_in: proc do |_session, error|
+          @@logger.info { "Logged in: #{error}" }
+        end,
+
+        logged_out: proc do |_session|
+          @@logger.info { 'Logged out!' }
+        end,
+
+        streaming_error: proc do |_session, error|
+          @@logger.error { "Streaming error #{error.message}" }
+        end,
+
+        connection_error: proc do |_session, error|
+          @@logger.error { "Connection error: #{error}" }
+        end,
+
+        play_token_lost: proc do |_session|
+          @@logger.error { 'Play token lost. Stopping playback.' }
+          @plaything.stop
+          @playing = false
+        end,
+
+        streaming_error: proc do |_session, error|
+          @@logger.error { "Streaming error #{error}. Stopping playback" }
+          @plaything.stop
+          @playing = false
+        end,
+
+        start_playback: proc do |_session|
+          @@logger.debug { 'Starting playback' }
+          @plaything.play
+        end,
+
+        stop_playback: proc do |_session|
+          @@logger.debug { 'Stopping playback' }
+          Spotify.try(:session_player_play, session, false)
+          @plaything.stop
+        end,
+
+        get_audio_buffer_stats: proc do |_session, stats|
+          stats[:samples] = @plaything.queue_size
+          stats[:stutter] = @plaything.drops
+        end,
+
+        music_delivery: proc do |_session, format, frames, num_frames|
+          if num_frames == 0
+            @@logger.error { 'Music delivery audio discontuity' }
+            @plaything.stop
+            0
+          else
+            @@logger.debug {
+                            "#{num_frames} frames delivered. #{format.to_h.inspect}"
+                           }
+            frames = FrameReader.new(
+                          format[:channels], format[:sample_type], num_frames, frames)
+            consumed_frames = @plaything.stream(frames, format.to_h)
+            consumed_frames
+          end
+        end,
+
+        end_of_track: proc do |session|
+          Spotify.try(:session_player_play, session, false)
+          @@logger.info { 'End of track' }
+          @plaything.stop
+          if @client.up_next
+            play_track(session, @client.up_next['spotify_uri'])
+            @client.playing = @client.up_next
+            @playing = true
+          else
+            @playing = false
+          end
+        end
+      }
+
+      config = YAML.load_file('config.yml')
+      Support::DEFAULT_CONFIG[:callbacks] = Spotify::SessionCallbacks.new(
+                                                                 $session_callbacks)
+      @session = Support.initialize_spotify!(config['username'], config['password'])
+    end
 
 
-  def self.play_track(session, uri)
-    track = Spotify.link_as_track(Spotify.link_create_from_string(uri))
-    Spotify.session_process_events(session) until Spotify.track_is_loaded(track)
 
-    # Pause before we load a new track. Fixes a quirk in libspotify.
-    Spotify.try(:session_player_play, session, false)
-    Spotify.try(:session_player_load, session, track)
-    Spotify.try(:session_player_play, session, true)
-    @@playing = true
-    @@logger.info {"Playing next track: #{uri}"}
-  rescue
-    # Log something
-    @@playing = false
-  end
 
-  class FrameReader
-    include Enumerable
+    def play_track(session, uri)
+      track = Spotify.link_as_track(Spotify.link_create_from_string(uri))
+      Spotify.session_process_events(session) until Spotify.track_is_loaded(track)
 
-    def initialize(channels, sample_type, frames_count, frames_ptr)
-      @channels = channels
-      @sample_type = sample_type
-      @size = frames_count * @channels
-      @pointer = FFI::Pointer.new(@sample_type, frames_ptr)
+      # Pause before we load a new track. Fixes a quirk in libspotify.
+      Spotify.try(:session_player_play, session, false)
+      Spotify.try(:session_player_load, session, track)
+      Spotify.try(:session_player_play, session, true)
+      @playing = true
+      @@logger.info {"Playing next track: #{uri}"}
+    rescue
+      @@logger.error {"Failed to play track: #{uri}"}
+      @playing = false
     end
 
-    attr_reader :size
-
-    def each
-      return enum_for(__method__) unless block_given?
-
-      ffi_read = :"read_#{@sample_type}"
-
-      (0...size).each do |index|
-        yield @pointer[index].public_send(ffi_read)
-      end
+    def pause
+      Spotify.try(:session_player_play, @session, false)
     end
-  end
 
-  plaything = Plaything.new
-
-  $session_callbacks = {
-    log_message: proc do |_session, message|
-      @@logger.info { "Message from spotify: #{message}" }
-    end,
-
-    logged_in: proc do |_session, error|
-      @@logger.debug { "Logged in: #{error}" }
-    end,
-
-    logged_out: proc do |_session|
-      @@logger.debug { 'Logged out!' }
-    end,
-
-    streaming_error: proc do |_session, error|
-      @@logger.error { "Streaming error #{error.message}" }
-    end,
-
-    connection_error: proc do |_session, error|
-      @@logger.error { "Connection error: #{error}" }
-    end,
-
-    play_token_lost: proc do |_session|
-      @@logger.error { 'Play token lost. Stopping playback.' }
-      plaything.stop
-      @@playing = false
-    end,
-
-    streaming_error: proc do |_session, error|
-      @@logger.error { "Streaming error #{error}. Stopping playback" }
-      plaything.stop
-      @@playing = false
-    end,
-
-    start_playback: proc do |_session|
-      @@logger.debug { 'Starting playback' }
-      plaything.play
-    end,
-
-    stop_playback: proc do |_session|
-      @@logger.debug { 'Stopping playback' }
-      plaything.stop
-    end,
-
-    get_audio_buffer_stats: proc do |_session, stats|
-      stats[:samples] = plaything.queue_size
-      stats[:stutter] = plaything.drops
-    end,
-
-    music_delivery: proc do |_session, format, frames, num_frames|
-      if num_frames == 0
-        @@logger.error { 'Music delivery audio discontuity' }
-        plaything.stop
-        0
-      else
-        @@logger.error { "#{num_frames} frames delivered. #{format.to_h.inspect}" }
-        frames = FrameReader.new(
-                      format[:channels], format[:sample_type], num_frames, frames)
-        consumed_frames = plaything.stream(frames, format.to_h)
-        consumed_frames
-      end
-    end,
-
-    end_of_track: proc do |session|
-      @@logger.info { 'End of track' }
-      plaything.stop
-      if client.up_next
-        play_track(session, client.up_next['spotify_uri'])
-        client.playing = client.up_next
-        @@playing = true
-      else
-        @@playing = false
-      end
+    def resume
+      Spotify.try(:session_player_play, @session, true)
     end
-  }
-
-
-  Support::DEFAULT_CONFIG[:callbacks] = Spotify::SessionCallbacks.new(
-                                                             $session_callbacks)
 
-  CONFIG = YAML.load_file('config.yml')
-
-  session = Support.initialize_spotify!(CONFIG['username'], CONFIG['password'])
+    def play
+      resume
+    end
 
-  play_track(session, client.playing['spotify_uri']) if client.playing
 
-  loop do
-    Spotify.session_process_events(session)
-    if client.skip?
-      @@logger.info { 'Skipping track' }
-      if client.up_next
-        play_track(session, client.up_next['spotify_uri'])
-        client.playing = client.up_next
-      else
-        @@playing = false
-      end
-    end
-    unless @@playing
-      @@logger.info { 'Nothing playing, attempting to play next track' }
-      if client.up_next
-        play_track(session, client.up_next['spotify_uri'])
-        client.playing = client.up_next
-      else
-        @@playing = false
-      end
+    def start
+      play_track(@session, @client.playing['spotify_uri']) if @client.playing
+      t = Thread.new {
+        loop do
+          Spotify.session_process_events(@session)
+          if @client.skip?
+            @@logger.info { 'Skipping track' }
+            if @client.up_next
+              play_track(@session, @client.up_next['spotify_uri'])
+              @client.playing = @client.up_next
+            else
+              @playing = false
+            end
+          end
+          unless @playing
+            @@logger.info { 'Nothing playing, attempting to play next track' }
+            if @client.up_next
+              play_track(@session, @client.up_next['spotify_uri'])
+              @client.playing = @client.up_next
+            else
+              @playing = false
+            end
+          end
+          sleep(0.05)
+        end
+      }
     end
-    sleep(0.05)
   end
 end

data/lib/partygoer-player/framereader.rb

@@ -0,0 +1,23 @@
+module PartyGoerPlayer
+  class FrameReader
+    include Enumerable
+    attr_reader :size
+
+    def initialize(channels, sample_type, frames_count, frames_ptr)
+      @channels = channels
+      @sample_type = sample_type
+      @size = frames_count * @channels
+      @pointer = FFI::Pointer.new(@sample_type, frames_ptr)
+    end
+
+    def each
+      return enum_for(__method__) unless block_given?
+
+      ffi_read = :"read_#{@sample_type}"
+
+      (0...size).each do |index|
+        yield @pointer[index].public_send(ffi_read)
+      end
+    end
+  end
+end

data/lib/partygoer-player/support.rb

@@ -44,4 +44,8 @@ module Support
     end
     session
   end
+
+  def logger
+    @@logger
+  end
 end

data/partygoer-player.gemspec

@@ -0,0 +1,18 @@
+Gem::Specification.new do |s|
+  s.name        = 'partygoer-player'
+  s.version     = '0.0.3'
+  s.summary     = 'Play your partygoer queue!'
+  s.description = 'Uses the spotify gem and partygoer-client to play your ' +
+                  'partygoer queue'
+  s.authors     = ["Andrew Hamon"]
+  s.email       = 'andrew@hamon.cc'
+  s.files       = `git ls-files -z`.split "\0"
+  s.homepage    = 'http://github.com/andrewhamon/partygoer-player'
+  s.license     = 'MIT'
+
+  s.add_runtime_dependency 'spotify'  , '~> 12.6'
+  s.add_runtime_dependency 'plaything', '~> 1.1'
+  s.add_runtime_dependency 'partygoer-client', '~> 0.0.4'
+
+  s.required_ruby_version = '>= 1.9.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: partygoer-player
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Hamon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spotify
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: partygoer-client
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - lib/partygoer-player.rb
+- lib/partygoer-player/framereader.rb
 - lib/partygoer-player/support.rb
+- partygoer-player.gemspec
 homepage: http://github.com/andrewhamon/partygoer-player
 licenses:
 - MIT