listlace 0.0.1 → 0.0.2

data/Gemfile

@@ -1,4 +1,2 @@
 source :rubygems
 gemspec
-
-gem "mplayer-ruby", git: "git://github.com/yjerem/mplayer-ruby.git"

data/Gemfile.lock

@@ -1,17 +1,10 @@
-GIT
-  remote: git://github.com/yjerem/mplayer-ruby.git
-  revision: ffa7213d1c0340fa79aa794929affba65d4cff28
-  specs:
-    mplayer-ruby (0.1.0)
-      open4 (>= 1.0.1)
-
 PATH
   remote: .
   specs:
-    listlace (0.0.1)
+    listlace (0.0.2)
       activerecord
       activesupport
-      mplayer-ruby
+      open4
       plist
       pry
       sqlite3
@@ -52,5 +45,4 @@ PLATFORMS
 
 DEPENDENCIES
   listlace!
-  mplayer-ruby!
   rake

data/README

@@ -13,31 +13,61 @@ double-click.
 Conjuring audio with spells is much more
 appropriate, don't you think?
 
-I'm thinking it'll go a little something
-like this. Observe:
-
-    $ listlace
-    Hello, you have 1466 songs.
-    ll> muse = album("Origin of Symmetry") + song("Blackout", artist: "Muse")
-     => Playlist (12 songs)
-    ll> maps = album("Turning The Mind") - song("Die Happy, Die Smiling")
-     => Playlist (11 songs)
-    ll> playlist = muse.shuffle + maps.shuffle
-     => Playlist (23 songs)
-    ll> playlist.play
-    Now Playing: Blackout - Muse (0:00 / 4:22)
-    ll> p
-    Paused: Blackout - Muse (0:07 / 4:22)
-    ll> seek 3..10
-    Paused: Blackout - Muse (3:10 / 4:22)
-    ll> p
-    Now Playing: Blackout - Muse (3:10 / 4:22)
-    ll> playlist.save "Maps & Muse"
-    ll> status
-    Playing playlist "Maps & Muse" (1 / 23)
-    Now Playing: Blackout - Muse (4:04 / 4:22)
-    ll> next
-    Now Playing: Space Dementia - Muse (0:00 / 6:21)
-
-And so on.
+-- install
 
+It's a gem. So do this:
+
+  gem install listlace
+
+But you also need mplayer. It has to be
+at /usr/bin/mplayer, for now.
+
+-- usage
+
+The gem gives you an executable called
+'listlace'. So do this:
+
+  $ listlace
+
+It will make a '.listlace' directory in
+$HOME, where the database of tracks and
+playlists is stored. Then it will give you
+a prompt. Don't be alarmed, it speaks
+Ruby.
+
+The only way to populate the database right
+now is to import your iTunes library.
+That goes a little something like this:
+
+  >> import_from_itunes "/Users/jeremy/Music/iTunes/iTunes Music Library.xml"
+
+Now you can play your music.
+
+-- p's and q's
+
+p is the most important command. It's the
+play command. It's also the pause/resume
+command. You can pass it some tracks or a
+playlist, and it will queue up the music
+and start playing it, sequentially. If you
+don't pass it anything, that's when it acts
+as a pause/resume button.
+
+q is the queue command. You can pass it some
+tracks or a playlist and it'll add them to the
+queue. The queue is just an array of tracks
+to be played in order. The p command by
+itself will start playing the queue.
+
+-- commands
+
+* playback
+  - p: play/pause/resume
+  - stop: stop playback
+  - restart: seek back to the beginning of the current track
+  - back: go back a song
+  - skip: go to the next song
+  - status: show what's currently playing, as well as other information
+* queueing
+  - q: append some tracks to the queue, or get the queue
+  - clear: clear the queue

data/lib/listlace/commands/playback.rb

@@ -1,15 +1,106 @@
 module Listlace
-  def play
-    if $player.queue.empty?
-      puts "Nothing to play."
+  # The play command. With no arguments, it either resumes playback or starts
+  # playing the queue. With arguments, it replaces the queue with the given
+  # tracks and starts playing.
+  def p(*tracks)
+    if tracks.empty?
+      if $player.paused?
+        $player.resume
+        status :playing
+      elsif $player.started?
+        $player.pause
+        status :playing
+      else
+        if $player.empty?
+          puts "Nothing to play."
+        else
+          $player.start
+          track = $player.current_track
+          status :playing
+        end
+      end
     else
-      $player.start
-      track = $player.current_track
-      puts "Now Playing: #{track.artist} - #{track.name} (0:00 / #{track.formatted_total_time})"
+      stop
+      clear
+      q *tracks
+      p
     end
   end
 
+  # Stops playback. The queue is still intact, but goes back to the beginning
+  # when playback is started again.
   def stop
     $player.stop
+    puts "Stopped."
+  end
+
+  # Start the current track from the beginning.
+  def restart
+    $player.restart
+    status :playing
+  end
+
+  # Go back one song in the queue.
+  def back
+    if $player.back
+      status :playing
+    else
+      puts "End of queue."
+    end
+  end
+
+  # Go directly to the next song in the queue.
+  def skip
+    if $player.skip
+      status :playing
+    else
+      puts "End of queue."
+    end
+  end
+
+  # The queue command. Simply appends tracks to the queue. Tracks can be
+  # specified by a single Track, a Playlist, an ActiveRecord::Relation, or an
+  # Array containing any of the above. With or without arguments, it returns the
+  # queue as an Array of Tracks, so this can be used as an accessor method.
+  def q(*tracks)
+    tracks.each do |playlist_or_track|
+      case playlist_or_track
+      when Track
+        $player.queue playlist_or_track
+      when Playlist
+        q *playlist_or_track.tracks
+      when Array
+        q *playlist_or_track
+      when ActiveRecord::Relation
+        q *playlist_or_track.all
+      end
+    end
+    $player.queue
+  end
+
+  # Clears the queue.
+  def clear
+    $player.clear
+    puts "Queue cleared."
+  end
+
+  def status(type = [:playlist, :playing])
+    case type
+    when Array
+      type.each { |t| status t }
+    when :playlist
+      #nop
+    when :playing
+      if $player.started?
+        s = $player.paused? ? "Paused" : "Now Playing"
+        name = $player.current_track.name
+        artist = $player.current_track.artist
+        time = $player.formatted_current_time
+        total_time = $player.current_track.formatted_total_time
+        puts "%s: %s - %s (%s / %s)" % [s, name, artist, time, total_time]
+      else
+        puts "Stopped."
+      end
+    end
   end
 end

data/lib/listlace/mplayer.rb

@@ -0,0 +1,32 @@
+module Listlace
+  # This is a simple MPlayer wrapper, it just handles opening the MPlayer
+  # process, hooking into when mplayer exits (when the song is done), and
+  # issuing commands through the slave protocol.
+  class MPlayer
+    def initialize(track, &on_quit)
+      cmd = "/usr/bin/mplayer -slave -quiet #{Shellwords.shellescape(track.location)}"
+      @pid, @stdin, @stdout, @stderr = Open4.popen4(cmd)
+
+      @quit_hook = Thread.new do
+        Process.wait(@pid)
+        on_quit.call
+      end
+    end
+
+    def command(cmd)
+      @stdin.puts cmd
+    end
+
+    def quit
+      @quit_hook.kill
+      command "quit" if alive?
+    end
+
+    def alive?
+      Process.getpgid(@pid)
+      true
+    rescue Errno::ESRCH
+      false
+    end
+  end
+end

data/lib/listlace/player.rb

@@ -1,60 +1,119 @@
 module Listlace
+  # This is the music box. It contains a queue, which is an array of tracks. It
+  # then plays these tracks sequentially. The buttons for play, pause, next,
+  # previous, etc. are all located here.
   class Player
-    attr_accessor :mplayer, :queue, :current_track
+    attr_accessor :current_track
 
     def initialize
       @mplayer = nil
       @queue = []
       @current_track = nil
       @current_track_index = nil
+      @paused = false
+      @started = false
+    end
+
+    def queue(track = nil)
+      @queue << track if track.is_a? Track
+      @queue.dup
+    end
+
+    def clear
+      stop
+      @queue = []
+    end
+
+    def empty?
+      @queue.empty?
+    end
+
+    def paused?
+      @paused
+    end
+
+    def started?
+      @started
     end
 
     def start
-      unless @queue.empty?
+      unless empty?
+        @started = true
         @current_track = @queue.first
         @current_track_index = 0
-        _play @current_track
-      end
-    end
-
-    def next
-      @current_track_index += 1
-      @current_track = @queue[@current_track_index]
-      if @current_track
-        _play @current_track
-      else
-        stop
+        load_track(@current_track)
       end
     end
 
     def stop
-      @mplayer.quit if _mplayer_alive?
+      @mplayer.quit if @mplayer
       @mplayer = nil
       @current_track = nil
       @current_track_index = nil
+      @paused = false
+      @started = false
     end
 
-    private
-
-    def _play(track)
-      @mplayer.quit if _mplayer_alive?
-      @mplayer = MPlayer::Slave.new track.location
+    def pause
+      if not paused?
+        @paused = true
+        @mplayer.command "pause"
+      end
+    end
 
-      Thread.new do
-        Process.wait(@mplayer.pid)
-        $player.next
+    def resume
+      if paused?
+        @paused = false
+        if @mplayer && @mplayer.alive?
+          @mplayer.command "pause"
+        else
+          load_track @current_track
+        end
       end
     end
 
-    def _mplayer_alive?
-      if @mplayer
-        begin
-          Process.getpgid(@mplayer.pid)
-          true
-        rescue Errno::ESRCH
-          false
+    def restart
+      change_track(0)
+    end
+
+    def back
+      change_track(-1)
+    end
+
+    def skip
+      change_track(1)
+    end
+
+    def current_time
+      0
+    end
+
+    def formatted_current_time
+      "0:00"
+    end
+
+    private
+
+    def change_track(by = 1)
+      @current_track_index += by
+      @current_track = @queue[@current_track_index]
+      if @current_track && @current_track_index >= 0
+        if paused?
+          @mplayer.quit if @mplayer
+        else
+          load_track(@current_track)
         end
+        true
+      else
+        stop
+        false
       end
     end
+
+    def load_track(track)
+      @mplayer.quit if @mplayer
+      @mplayer = MPlayer.new(track) { send :change_track }
+      @paused = false
+    end
   end
 end

data/lib/listlace.rb

@@ -5,11 +5,13 @@ module Listlace
   PROMPT = [proc { ">> " }, proc { " | " }]
 end
 
-require "mplayer-ruby"
+require "open4"
+require "shellwords"
 require "active_record"
 
 require "listlace/database"
 require "listlace/player"
+require "listlace/mplayer"
 
 require "listlace/models/track"
 require "listlace/models/playlist"

data/listlace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.date = "2012-08-22"
   s.summary = "A music player in a REPL."
   s.description = "Listlace is a music player which is interacted with through a Ruby REPL."
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files += ["bin/listlace"]
   s.files += Dir["lib/**/*.rb"]
 
-  %w(pry plist sqlite3 activerecord activesupport mplayer-ruby).each do |gem_name|
+  %w(pry plist sqlite3 activerecord activesupport open4).each do |gem_name|
     s.add_runtime_dependency gem_name
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mplayer-ruby
+  name: open4
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -144,6 +144,7 @@ files:
 - lib/listlace/models/playlist.rb
 - lib/listlace/models/playlist_item.rb
 - lib/listlace/models/track.rb
+- lib/listlace/mplayer.rb
 - lib/listlace/player.rb
 - lib/listlace.rb
 homepage: http://github.com/yjerem/listlace