listlace 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b99b9e103972f209f74a53b2328cc01aef9ee89f
-  data.tar.gz: 335147f7cbda256c7ed70273b14736edf46d697e
+  metadata.gz: 5e2d5c543763b463ddeb7d210dd9462eaca05944
+  data.tar.gz: a91502ded9981eade141ba10f7ee90b4fdf0e9ee
 SHA512:
-  metadata.gz: 1e7de49eb1117788b45e41fccee8bbbb987f3b1ee6d1bff7415096a510b4853bf8f2cd7c383d542f2b88cfb7ed5db8f33d92a116cb2203589a3a58a6b2395231
-  data.tar.gz: bd62fdc1d420b838d3699ea10f773e9cd98ceece1ef443a4f4bba7f44cace6d18e35ab91ef442049d15251e713d43edd23922c0098305c0829b28fe3447bdd91
+  metadata.gz: da90361e229cf18c7f273ea58fa1bae79f2ae6e7f8b3fbfbf9d7e7163798c3653299562602863030a36937c0b98fd9a57b785ce119e707992a9a34fd0057142b
+  data.tar.gz: 116b0aa40716b9cde245cb3042fcf0efd37b89a119f17fcbe36ad8697de08c30fa7f72966d73e1378d78e5d9f60337c3f7fbdd0519c42a438e11de7d77189823

data/Gemfile.lock

@@ -1,22 +1,22 @@
 PATH
   remote: .
   specs:
-    listlace (0.0.1)
+    listlace (0.1.0)
       bundler
-      mpd_client
       pry
+      ruby-mpd
 
 GEM
   remote: http://rubygems.org/
   specs:
     coderay (1.1.0)
     method_source (0.8.2)
-    mpd_client (0.0.3)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (0.9.2.2)
+    ruby-mpd (0.3.1)
     slop (3.5.0)
 
 PLATFORMS

data/README.md

@@ -19,13 +19,149 @@ The gem gives you an executable, so do this:
 
 It gives you a prompt, which is just a Ruby prompt, with the commands below implemented as methods.
 
+## Selectors
+
+Query your music library and build playlists using selectors. There are selectors for each tag (artist, album, title, etc.) As an example, here is how `artist` works:
+
+    ♫> artist "thirsty cups"
+    => [8 songs]
+
+It returned an Array of 8 Songs. To do an exact, case-sensitive search, use `artist_exact`:
+
+    ♫> artist_exact "thirsty cups"
+    => []
+    ♫> artist_exact "The Thirsty Cups"
+    => [8 songs]
+
+The first one didn't match anything, the second one matched the same 8 songs.
+
+You can also pass in a `Regexp` or a `Symbol`:
+
+    ♫> artist :the_thirsty_cups
+    => [8 songs]
+    ♫> artist /the thirst(y|ier|iest) cups/
+    => [8 songs]
+
+Underscores in symbols are interpreted as spaces.
+
+Here's a list of all tag selectors: `title`, `title_exact`, `artist`, `artist_exact`, `album`, `album_exact`, `genre`, and `genre_exact`.
+
+In addition to tag selectors, here are some special selectors:
+
+### all
+
+`all` returns all the songs in your library.
+
+    ♫> all
+    => [3560 songs]
+
+### none
+
+`none` returns an empty playlist.
+
+    ♫> none
+    => []
+
+### search
+
+`search` will match **any** tag that contains your query.
+
+    ♫> search "thirsty"
+    => [8 songs]
+
+### where, where\_exact
+
+`where` and `where_exact` let you specify multiple queries for different tags:
+
+    ♫> where(artist: "thirsty", title: "belljar")
+    => [1 song]
+
 ## Commands
 
 ### p
 
-`p` is like a play/pause button. If the player is paused, it unpauses. If the player is playing, then it pauses. If the player is stopped, then it starts playing.
+`p` is like a play/pause button. If the player is paused, it unpauses. If the player is playing, then it pauses. If the player is stopped, then it starts playing. If you pass it a playlist, it will set the queue to that playlist and begin playing it.
+
+    ♫> p
+    ♫> p album :in_the_faxed_atmosphere
+
+### q
+
+`q` without any arguments returns the queue (the current playlist). If you call `q` with a playlist as an argument, it will replace the queue with that playlist.
+
+
+    ♫> q genre :trance
+    ♫> q
+    => [53 songs]
+
+### stop
+
+`stop` stops playback.
+
+    ♫> stop
+
+### list
+
+`list` with no arguments lists all the songs in your music library. If you pass it a playlist, it will list all the songs in that playlist.
+
+    ♫> list
+    Air - 10 000 Hz Legend - Electronic Performers
+    Air - 10 000 Hz Legend - How Does It Make You Feel?
+    Air - 10 000 Hz Legend - Radio #1
+    ...
+    ♫> list title :fish
+    Eisley - Currents - Blue Fish
+    Moonboots - Elfin Princess - The Fish Said Hello
+    Radiohead - In Rainbows - Weird Fishes/Arpeggi
+    Thee More Shallows - A History of Sport Fishing - A History of Sport Fishing
+
+### artists
+
+`artists` with no arguments lists all the artists in your music library. If you pass it a playlist, it will list all the artists in that playlist.
+
+    ♫> artists
+    Air (55 songs)
+    Amplifier (53 songs)
+    Andrew Bird (93 songs)
+    ...
+    ♫> artists genre(:trance)
+    Infected Mushroom (13 songs)
+    Gouryella (3 songs)
+    Safri Duo feat. Clark Anderson (6 songs)
+    Safri Duo (16 songs)
+
+### albums
+
+`albums` with no arguments lists all the albums in your music library. If you pass it a playlist, it will list all the albums in that playlist.
+
+    ♫> albums
+    Air - 10 000 Hz Legend (11 songs)
+    Air - Love 2 (12 songs)
+    Air - Moon Safari (10 songs)
+    ...
+    ♫> albums artist(:infected_mushroom)
+    Infected Mushroom - Converting Vegetarians (22 songs)
+    Infected Mushroom - IM the Supervisor (9 songs)
+    Infected Mushroom - Legend of the Black Shawarma (11 songs)
+    Infected Mushroom - Stretched (4 songs)
+    Infected Mushroom - Vicious Delicious (11 songs)
+
+### genres
+
+`genres` with no arguments lists all the genres in your music library. If you pass it a playlist, it will list all the genres in that playlist.
+
+    ♫> genres
+    Trance (53 songs)
+    Hip-Hop (14 songs)
+    Jazz (10 songs)
+    ...
+    ♫> genres title(:constantinople)
+    TMBG (1 song)
 
 ### mpd
 
 `mpd` gives you an instance of the `MPDClient` object, which you can use to send any `mpd` command that isn't available in Listlace yet. This'll probably be removed once I actually implement all the commands.
 
+    ♫> mpd.version
+    => "0.16.0"
+

data/lib/listlace/commands.rb

@@ -1,17 +1,71 @@
 class Listlace
   module Commands
-    REPEAT_SYMBOL = "\u221E"
-    TIMES_SYMBOL = "\u00D7"
-
-    def p
-      case mpd.status["state"]
-      when "play"
-        mpd.pause(1)
-      when "pause"
-        mpd.pause(0)
-      when "stop"
+    def p(*playlist)
+      if playlist.empty?
+        case mpd.status[:state]
+        when :play
+          mpd.pause = true
+        when :pause
+          mpd.pause = false
+        when :stop
+          mpd.play
+        end
+      else
+        mpd.clear
+        playlist.flatten.each do |song|
+          mpd.add song.file
+        end
         mpd.play
       end
+      nil
+    end
+
+    def stop
+      mpd.stop
+      nil
+    end
+
+    def q(*playlist)
+      if playlist.empty?
+        mpd.queue
+      else
+        mpd.clear
+        playlist.flatten.each do |song|
+          mpd.add song.file
+        end
+        nil
+      end
+    end
+
+    def list(playlist = nil)
+      (playlist || all).each do |song|
+        puts "#{song.artist} - #{song.album} - #{song.title}"
+      end
+      nil
+    end
+
+    def artists(playlist = nil)
+      (playlist || all).group_by(&:artist).each do |artist, songs|
+        plural = (songs.length == 1) ? "" : "s"
+        puts "#{artist} (#{songs.length} song#{plural})"
+      end
+      nil
+    end
+
+    def albums(playlist = nil)
+      (playlist || all).group_by(&:album).each do |album, songs|
+        plural = (songs.length == 1) ? "" : "s"
+        puts "#{songs.first.artist} - #{album} (#{songs.length} song#{plural})"
+      end
+      nil
+    end
+
+    def genres(playlist = nil)
+      (playlist || all).group_by(&:genre).each do |genre, songs|
+        plural = (songs.length == 1) ? "" : "s"
+        puts "#{genre} (#{songs.length} song#{plural})"
+      end
+      nil
     end
   end
 end

data/lib/listlace/core_ext/array.rb

@@ -0,0 +1,25 @@
+class Array
+  def playlist?
+    @is_playlist ||= all? { |x| x.is_a? MPD::Song }
+  end
+  
+  alias _original_inspect inspect
+  def inspect
+    if playlist?
+      plural = (length == 1) ? "" : "s"
+      "[#{length} song#{plural}]"
+    else
+      _original_inspect
+    end
+  end
+
+  alias _original_pretty_inspect pretty_inspect
+  def pretty_inspect
+    if playlist?
+      inspect
+    else
+      _original_pretty_inspect
+    end
+  end
+end
+

data/lib/listlace/selectors.rb

@@ -0,0 +1,44 @@
+class Listlace
+  module Selectors
+    TAG_SELECTORS = %w(title artist album genre)
+
+    TAG_SELECTORS.each do |tag|
+      define_method(tag) do |what|
+        case what
+        when Regexp
+          what = Regexp.new(what.source, Regexp::IGNORECASE) # case-insensitize
+          all.select { |song| song.send(tag).to_s =~ what }
+        when Symbol
+          mpd.where(tag => what.to_s.tr("_", " "))
+        when String
+          mpd.where(tag => what)
+        end
+      end
+
+      define_method("#{tag}_exact") do |what|
+        mpd.where({tag => what}, {strict: true})
+      end
+    end
+
+    def all
+      mpd.songs
+    end
+
+    def none
+      []
+    end
+
+    def search(what)
+      mpd.where any: what
+    end
+    
+    def where(params)
+      mpd.where(params)
+    end
+
+    def where_exact(params)
+      mpd.where(params, {strict: true})
+    end
+  end
+end
+

data/lib/listlace.rb

@@ -1,15 +1,19 @@
-require "mpd_client"
+require "ruby-mpd"
+
+require "listlace/core_ext/array"
 
 require "listlace/commands"
+require "listlace/selectors"
 
 class Listlace
   attr_reader :mpd
 
   include Commands
+  include Selectors
 
   def initialize(host, port)
-    @mpd = MPDClient.new
-    @mpd.connect(host, port)
+    @mpd = MPD.new(host, port)
+    @mpd.connect
   end
 
   def disconnect

data/listlace.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.1.0"
-  s.date = "2014-03-15"
+  s.version = "0.2.0"
+  s.date = "2014-03-22"
   s.summary = "An mpd (music player daemon) client with a Ruby shell as the interface."
   s.description = "Listlace is an mpd (music player daemon) client with a Ruby shell as the interface."
   s.author = "Jeremy Ruten"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files += ["bin/listlace"]
   s.files += Dir["lib/**/*.rb"]
 
-  %w(bundler pry mpd_client).each do |gem_name|
+  %w(bundler pry ruby-mpd).each do |gem_name|
     s.add_runtime_dependency gem_name
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mpd_client
+  name: ruby-mpd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,6 +81,8 @@ files:
 - bin/listlace
 - lib/listlace.rb
 - lib/listlace/commands.rb
+- lib/listlace/core_ext/array.rb
+- lib/listlace/selectors.rb
 - listlace.gemspec
 homepage: http://github.com/yjerem/listlace
 licenses: