listlace 0.0.2 → 0.0.3

data/README

@@ -17,7 +17,7 @@ appropriate, don't you think?
 
 It's a gem. So do this:
 
-  gem install listlace
+  $ gem install listlace
 
 But you also need mplayer. It has to be
 at /usr/bin/mplayer, for now.
@@ -67,7 +67,11 @@ itself will start playing the queue.
   - restart: seek back to the beginning of the current track
   - back: go back a song
   - skip: go to the next song
+  - seek: move to a different part of the track
+  - ff: fast-forward, or slow down
+  - repeat: choose the repeat mode, either :one or :all
+  - norepeat: turn off the repeat mode
   - status: show what's currently playing, as well as other information
-* queueing
+* queue
   - q: append some tracks to the queue, or get the queue
   - clear: clear the queue

data/lib/listlace/commands/playback.rb

@@ -1,4 +1,7 @@
 module Listlace
+  REPEAT_SYMBOL = "\u221E"
+  TIMES_SYMBOL = "\u00D7"
+
   # 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.
@@ -6,22 +9,26 @@ module Listlace
     if tracks.empty?
       if $player.paused?
         $player.resume
-        status :playing
+        status
       elsif $player.started?
-        $player.pause
-        status :playing
+        if $player.speed == 1
+          $player.pause
+          status
+        else
+          $player.set_speed 1
+          status
+        end
       else
         if $player.empty?
           puts "Nothing to play."
         else
           $player.start
-          track = $player.current_track
-          status :playing
+          status
         end
       end
     else
-      stop
-      clear
+      $player.stop
+      $player.clear
       q *tracks
       p
     end
@@ -37,13 +44,13 @@ module Listlace
   # Start the current track from the beginning.
   def restart
     $player.restart
-    status :playing
+    status
   end
 
   # Go back one song in the queue.
   def back
     if $player.back
-      status :playing
+      status
     else
       puts "End of queue."
     end
@@ -52,54 +59,77 @@ module Listlace
   # Go directly to the next song in the queue.
   def skip
     if $player.skip
-      status :playing
+      status
     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
+  # Seek to a particular position in the current track. If given an integer, it
+  # will seek that many seconds forward or backward. If given a Range, it will
+  # seek to that specific time, the first number in the Range representing the
+  # minutes, the second number representing the seconds. You can also pass a
+  # String like "1:23:45" to do the same thing. To seek to an absolute time in
+  # seconds, do it like "seek(abs: 40)". To seek to a percentage, do something
+  # like "seek(percent: 75)".
+  def seek(where)
+    $player.seek(where)
+    status
   end
 
-  # Clears the queue.
-  def clear
-    $player.clear
-    puts "Queue cleared."
+  # Fast-forward at a particular speed. Induces the chipmunk effect, which I
+  # find agreeable. Call p to go back to normal. You can also pass a value
+  # smaller than one to slow down.
+  def ff(speed = 2)
+    $player.set_speed(speed)
+    status
   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."
+  # Pass :all to start playing from the top of the queue when it gets to the
+  # end. Pass :one to repeat the current track.
+  def repeat(one_or_all = :all)
+    $player.repeat one_or_all
+    status
+  end
+
+  # Turn off the repeat mode set by the repeat command.
+  def norepeat
+    $player.repeat :off
+    status
+  end
+
+  # Show various information about the status of the player. The information it
+  # shows depends on what status types you pass:
+  #
+  #   :playlist - Shows the playlist that is currently playing
+  #   :playing - Shows the current track
+  #
+  def status(*types)
+    types = [:playlist, :playing] if types.empty?
+    types.each do |type|
+      case type
+      when :playlist
+        if $player.started?
+        track_number = $player.current_track_index + 1
+          num_tracks = q.length
+          repeat_one = $player.repeat_mode == :one ? REPEAT_SYMBOL : ""
+          repeat_all = $player.repeat_mode == :all ? REPEAT_SYMBOL : ""
+          puts "Playlist: queue (%d%s / %d%s)" % [track_number, repeat_one, num_tracks, repeat_all]
+        else
+          puts "Playlist: queue (%d songs)" % [q.length]
+        end
+      when :playing
+        if $player.started?
+          name = $player.current_track.name
+          artist = $player.current_track.artist
+          time = $player.formatted_current_time
+          total_time = $player.current_track.formatted_total_time
+          paused = $player.paused? ? "|| " : ""
+          speed = $player.speed != 1 ? "#{TIMES_SYMBOL}#{$player.speed} " : ""
+          puts "%s - %s (%s / %s) %s%s" % [name, artist, time, total_time, paused, speed]
+        else
+          puts "Stopped."
+        end
       end
     end
   end

data/lib/listlace/commands/queue.rb

@@ -0,0 +1,35 @@
+module Listlace
+  # 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 shuffle
+
+  end
+
+  def sort(by = :artist_asc_album_asc_track_number_asc)
+
+  end
+end

data/lib/listlace/models/track.rb

@@ -4,7 +4,16 @@ module Listlace
     has_many :playlists, through: :playlist_items
 
     def formatted_total_time
-      total_seconds = total_time / 1000
+      Track.format_time(total_time)
+    end
+
+    def play
+      $player.queue = [self]
+      Listlace.play
+    end
+
+    def self.format_time(milliseconds)
+      total_seconds = milliseconds / 1000
 
       seconds = total_seconds % 60
       minutes = (total_seconds / 60) % 60
@@ -16,10 +25,5 @@ module Listlace
         "%d:%02d" % [minutes, seconds]
       end
     end
-
-    def play
-      $player.queue = [self]
-      Listlace.play
-    end
   end
 end

data/lib/listlace/mplayer.rb

@@ -6,19 +6,38 @@ module Listlace
     def initialize(track, &on_quit)
       cmd = "/usr/bin/mplayer -slave -quiet #{Shellwords.shellescape(track.location)}"
       @pid, @stdin, @stdout, @stderr = Open4.popen4(cmd)
+      @paused = false
+      @extra_lines = 0
 
+      until @stdout.gets["playback"]
+      end
+
+      @quit_hook_active = false
       @quit_hook = Thread.new do
         Process.wait(@pid)
+        @quit_hook_active = true
         on_quit.call
       end
     end
 
-    def command(cmd)
+    def command(cmd, options = {})
+      if cmd == "pause"
+        @paused = !@paused
+      elsif @paused
+        cmd = "pausing #{cmd}"
+      end
+
       @stdin.puts cmd
+
+      if options[:expect_answer]
+        answer = "\n"
+        answer = @stdout.gets.sub("\e[A\r\e[K", "") while answer == "\n"
+        answer
+      end
     end
 
     def quit
-      @quit_hook.kill
+      @quit_hook.kill unless @quit_hook_active
       command "quit" if alive?
     end
 

data/lib/listlace/player.rb

@@ -3,7 +3,7 @@ module Listlace
   # then plays these tracks sequentially. The buttons for play, pause, next,
   # previous, etc. are all located here.
   class Player
-    attr_accessor :current_track
+    attr_reader :current_track, :current_track_index, :repeat_mode
 
     def initialize
       @mplayer = nil
@@ -12,6 +12,7 @@ module Listlace
       @current_track_index = nil
       @paused = false
       @started = false
+      @repeat_mode = false
     end
 
     def queue(track = nil)
@@ -72,6 +73,17 @@ module Listlace
       end
     end
 
+    def repeat(one_or_all_or_off)
+      case one_or_all_or_off
+      when :one
+        @repeat_mode = :one
+      when :all
+        @repeat_mode = :all
+      when :off
+        @repeat_mode = false
+      end
+    end
+
     def restart
       change_track(0)
     end
@@ -84,18 +96,66 @@ module Listlace
       change_track(1)
     end
 
+    def seek(where)
+      case where
+      when Integer
+        @mplayer.command("seek %d 0" % [where], expect_answer: true)
+      when Range
+        @mplayer.command("seek %d 2" % [where.begin * 60 + where.end], expect_answer: true)
+      when String
+        parts = where.split(":").map(&:to_i)
+        parts = [0] + parts if parts.length == 2
+        hours, minutes, seconds = parts
+        @mplayer.command("seek %d 2" % [hours * 3600 + minutes * 60 + seconds], expect_answer: true)
+      when Hash
+        if where[:abs]
+          if where[:abs].is_a? Integer
+            @mplayer.command("seek %d 2" % [where[:abs]], expect_answer: true)
+          else
+            seek(where[:abs])
+          end
+        elsif where[:percent]
+          @mplayer.command("seek %d 1" % [where[:percent]], expect_answer: true)
+        end
+      end
+    end
+
+    def speed
+      answer = @mplayer.command("get_property speed", expect_answer: true)
+      if answer =~ /^ANS_speed=([0-9.]+)$/
+        $1.to_f
+      end
+    end
+
+    def set_speed(speed)
+      @mplayer.command("speed_set %f" % [speed], expect_answer: true)
+    end
+
     def current_time
-      0
+      answer = @mplayer.command "get_time_pos", expect_answer: true
+      if answer =~ /^ANS_TIME_POSITION=([0-9.]+)$/
+        ($1.to_f * 1000).to_i
+      end
     end
 
     def formatted_current_time
-      "0:00"
+      Track.format_time(current_time)
     end
 
     private
 
-    def change_track(by = 1)
+    def change_track(by = 1, options = {})
       @current_track_index += by
+      if options[:auto] && @repeat_mode
+        case @repeat_mode
+        when :one
+          @current_track_index -= by
+        when :all
+          if @current_track_index >= @queue.length
+            @current_track_index = 0
+          end
+        end
+      end
       @current_track = @queue[@current_track_index]
       if @current_track && @current_track_index >= 0
         if paused?
@@ -112,7 +172,7 @@ module Listlace
 
     def load_track(track)
       @mplayer.quit if @mplayer
-      @mplayer = MPlayer.new(track) { send :change_track }
+      @mplayer = MPlayer.new(track) { send(:change_track, 1, auto: true) }
       @paused = false
     end
   end

data/lib/listlace.rb

@@ -21,6 +21,7 @@ require "listlace/commands/library"
 require "listlace/commands/playback"
 require "listlace/commands/selectors"
 require "listlace/commands/volume"
+require "listlace/commands/queue"
 
 # gotta ged rid of this global sometime
 $player = Listlace::Player.new

data/listlace.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.0.2"
-  s.date = "2012-08-22"
+  s.version = "0.0.3"
+  s.date = "2012-08-24"
   s.summary = "A music player in a REPL."
   s.description = "Listlace is a music player which is interacted with through a Ruby REPL."
   s.author = "Jeremy Ruten"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -138,6 +138,7 @@ files:
 - bin/listlace
 - lib/listlace/commands/library.rb
 - lib/listlace/commands/playback.rb
+- lib/listlace/commands/queue.rb
 - lib/listlace/commands/selectors.rb
 - lib/listlace/commands/volume.rb
 - lib/listlace/database.rb