listlace 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2d5c543763b463ddeb7d210dd9462eaca05944
-  data.tar.gz: a91502ded9981eade141ba10f7ee90b4fdf0e9ee
+  metadata.gz: 81dd49a642dc3679a690ddc7b4107d614d2356c6
+  data.tar.gz: 49cfdc7c09b8e1835346c3d334796e2a25a81287
 SHA512:
-  metadata.gz: da90361e229cf18c7f273ea58fa1bae79f2ae6e7f8b3fbfbf9d7e7163798c3653299562602863030a36937c0b98fd9a57b785ce119e707992a9a34fd0057142b
-  data.tar.gz: 116b0aa40716b9cde245cb3042fcf0efd37b89a119f17fcbe36ad8697de08c30fa7f72966d73e1378d78e5d9f60337c3f7fbdd0519c42a438e11de7d77189823
+  metadata.gz: 1894c03f8bcc99d20c212bbc8c2b80ae37cf4ebe67bd44e6053cd64eb22a19223a7f2fbbf44fd22a40bebdf2a82cbe51e985d629c2811401dd277ad1fabbc2a9
+  data.tar.gz: fe454c5393bdedf4acbc145393ea94c83726670eeaf7b243e6b7df7f62fdf856ccec7a377427082117bc22d15eebde2de6f80559df5900b8924ad1d0964fbd68

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    listlace (0.1.0)
+    listlace (0.2.0)
       bundler
       pry
       ruby-mpd

data/README.md

@@ -26,7 +26,25 @@ Query your music library and build playlists using selectors. There are selector
     ♫> artist "thirsty cups"
     => [8 songs]
 
-It returned an Array of 8 Songs. To do an exact, case-sensitive search, use `artist_exact`:
+It returned an Array of 8 Songs.
+
+You can pass multiple queries to a selector, and it will select all songs that match **any** of those queries:
+
+    ♫> _why = artist(:the_thirsty_cups, :moonboots, :the_child_who_was_a_keyhole)
+    => [33 songs]
+
+You can chain selectors together to narrow down a playlist:
+
+    ♫> _why.album(:elfin_princess).title(/^the/)
+    => [1 song]
+
+### String selectors
+
+The string selectors are: `title`, `artist`, `album`, and `genre`.
+
+String selectors have "exact" counterparts: `title_exact`, `artist_exact`, `album_exact`, and `genre_exact`.
+
+Use these "exact" selectors to do an exact, case-sensitive search:
 
     ♫> artist_exact "thirsty cups"
     => []
@@ -35,7 +53,7 @@ It returned an Array of 8 Songs. To do an exact, case-sensitive search, use `art
 
 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`:
+You can also pass in a `Regexp` or a `Symbol` to a string selector:
 
     ♫> artist :the_thirsty_cups
     => [8 songs]
@@ -44,9 +62,39 @@ You can also pass in a `Regexp` or a `Symbol`:
 
 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`.
+### Numeric selectors
+
+The numeric selectors are: `track`, `disc`, and `year`.
+
+In addition to `Integers`, you can pass a `Range` to match against or a `Hash` that specifies one or more comparison operators:
+
+    ♫> year 2000, 2004
+    => [362 songs]
+    ♫> year 1990..1999
+    => [521 songs]
+    ♫> year lt: 1970
+    => [76 songs]
+
+The comparison operators are `:eq`, `:ne`, `:gt`, `:ge`, `:lt`, and `:le`. You can also just use `:==`, `:>`, `:>=`, `:<`, and `:<=`.
+
+### Time selectors
+
+The time selector is just `time`, which matches the length of songs in seconds.
 
-In addition to tag selectors, here are some special selectors:
+It's basically a numeric selector, but you can pass a String containing a formatted time in place of a number:
+
+    ♫> time "1:23"
+    => [2 songs]
+    ♫> time "8:00"..."9:00"
+    => [79 songs]
+    ♫> time gt: "20:00"
+    => [5 songs]
+    ♫> time lt: 20
+    => [27 songs]
+
+"1:23" means 1 minute and 23 seconds, and "1:23:45" means 1 hour, 23 minutes, 45 seconds. If you just pass an integer, it is the number of seconds.
+
+### Special selectors
 
 ### all
 
@@ -62,20 +110,6 @@ In addition to tag selectors, here are some special selectors:
     ♫> 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
@@ -105,15 +139,15 @@ In addition to tag selectors, here are some special selectors:
 `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
+    Air - 10 000 Hz Legend - Electronic Performers (5:36)
+    Air - 10 000 Hz Legend - How Does It Make You Feel? (4:38)
+    Air - 10 000 Hz Legend - Radio #1 (4:23)
     ...
     ♫> 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
+    Eisley - Currents - Blue Fish (4:02)
+    Moonboots - Elfin Princess - The Fish Said Hello (2:44)
+    Radiohead - In Rainbows - Weird Fishes/Arpeggi (5:18)
+    Thee More Shallows - A History of Sport Fishing - A History of Sport Fishing (7:00)
 
 ### artists
 
@@ -158,6 +192,18 @@ In addition to tag selectors, here are some special selectors:
     ♫> genres title(:constantinople)
     TMBG (1 song)
 
+### years
+
+`years` with no arguments lists all the years in your music library. If you pass it a playlist, it will list all the years in that playlist.
+
+    ♫> years
+    2007 (205 songs)
+    2010 (220 songs)
+    2012 (148 songs)
+    ...
+    ♫> years artist :the_avalanches
+    2000 (18 songs)
+
 ### 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.

data/lib/listlace.rb

@@ -1,9 +1,10 @@
 require "ruby-mpd"
 
-require "listlace/core_ext/array"
-
 require "listlace/commands"
 require "listlace/selectors"
+require "listlace/time_helpers"
+
+require "listlace/core_ext/array"
 
 class Listlace
   attr_reader :mpd

data/lib/listlace/commands.rb

@@ -39,7 +39,8 @@ class Listlace
 
     def list(playlist = nil)
       (playlist || all).each do |song|
-        puts "#{song.artist} - #{song.album} - #{song.title}"
+        time = TimeHelpers.format_time(song.time)
+        puts "#{song.artist} - #{song.album} - #{song.title} (#{time})"
       end
       nil
     end
@@ -67,6 +68,14 @@ class Listlace
       end
       nil
     end
+
+    def years(playlist = nil)
+      (playlist || all).group_by(&:date).each do |year, songs|
+        plural = (songs.length == 1) ? "" : "s"
+        puts "#{year} (#{songs.length} song#{plural})"
+      end
+      nil
+    end
   end
 end
 

data/lib/listlace/core_ext/array.rb

@@ -2,7 +2,31 @@ class Array
   def playlist?
     @is_playlist ||= all? { |x| x.is_a? MPD::Song }
   end
-  
+
+  Listlace::Selectors::STRING_SELECTORS.each do |tag|
+    define_method(tag) do |*queries|
+      Listlace::Selectors.string_selector(tag, self, false, *queries)
+    end
+
+    define_method("#{tag}_exact") do |*queries|
+      Listlace::Selectors.string_selector(tag, self, true, *queries)
+    end
+  end
+
+  Listlace::Selectors::NUMERIC_SELECTORS.each do |tag|
+    define_method(tag) do |*queries|
+      Listlace::Selectors.numeric_selector(tag, self, *queries)
+    end
+  end
+
+  Listlace::Selectors::TIME_SELECTORS.each do |tag|
+    define_method(tag) do |*queries|
+      Listlace::Selectors.time_selector(tag, self, *queries)
+    end
+  end
+
+  alias year date
+
   alias _original_inspect inspect
   def inspect
     if playlist?

data/lib/listlace/selectors.rb

@@ -1,43 +1,89 @@
 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
+    STRING_SELECTORS = %w(title artist album genre)
+    NUMERIC_SELECTORS = %w(track date disc)
+    TIME_SELECTORS = %w(time)
+
+    (STRING_SELECTORS | NUMERIC_SELECTORS | TIME_SELECTORS).each do |tag|
+      define_method(tag) do |*queries|
+        all.send(tag, *queries)
       end
 
-      define_method("#{tag}_exact") do |what|
-        mpd.where({tag => what}, {strict: true})
+      if STRING_SELECTORS.include? tag
+        define_method("#{tag}_exact") do |*queries|
+          all.send("#{tag}_exact", *queries)
+        end
       end
     end
 
+    alias year date
+
     def all
-      mpd.songs
+      @all ||= mpd.songs
     end
 
     def none
       []
     end
 
-    def search(what)
-      mpd.where any: what
+    def self.string_selector(tag, playlist, exact, *queries)
+      if exact
+        playlist.select { |song| song.send(tag).to_s == query.to_s }
+      else
+        queries.map do |query|
+          case query
+          when Regexp
+            query = Regexp.new(query.source, Regexp::IGNORECASE) # case-insensitize
+            playlist.select { |song| song.send(tag).to_s =~ query }
+          when Symbol
+            playlist.select { |song| song.send(tag).to_s.downcase[query.to_s.downcase.tr("_", " ")] }
+          when String
+            playlist.select { |song| song.send(tag).to_s.downcase[query.downcase] }
+          end
+        end.inject(:|)
+      end
     end
-    
-    def where(params)
-      mpd.where(params)
+
+    def self.numeric_selector(tag, playlist, *queries)
+      queries.map do |query|
+        case query
+        when Numeric
+          playlist.select { |song| song.send(tag) == query }
+        when Hash
+          query.map do |op, value|
+            op = { eq: "==", ne: "!=", lt: "<", le: "<=", gt: ">", ge: ">=" }[op] || op
+            playlist.select { |song| song.send(tag).to_i.send(op, value) }
+          end.inject(:&)
+        when Range
+          playlist.select { |song| query === song.send(tag) }
+        end
+      end.inject(:|)
     end
 
-    def where_exact(params)
-      mpd.where(params, {strict: true})
+    def self.time_selector(tag, playlist, *queries)
+      queries.map! do |query|
+        case query
+        when String
+          TimeHelpers.parse_time(query)
+        when Range
+          Range.new(
+            TimeHelpers.parse_time(query.begin.to_s),
+            TimeHelpers.parse_time(query.end.to_s),
+            query.exclude_end?
+          )
+        when Hash
+          query.each do |op, value|
+            if value.is_a? String
+              query[op] = TimeHelpers.parse_time(value)
+            end
+          end
+          query
+        else
+          query
+        end
+      end
+
+      numeric_selector(tag, playlist, *queries)
     end
   end
 end

data/lib/listlace/time_helpers.rb

@@ -0,0 +1,34 @@
+class Listlace
+  module TimeHelpers
+    extend self
+
+    # Helper method to format a number of seconds as a string like "1:03:56".
+    def format_time(seconds, options = {})
+      raise ArgumentError, "can't format negative time" if seconds < 0
+
+      hours = seconds / 3600
+      minutes = (seconds / 60) % 60
+      seconds = seconds % 60
+
+      if hours > 0
+        "%d:%02d:%02d" % [hours, minutes, seconds]
+      else
+        "%d:%02d" % [minutes, seconds]
+      end
+    end
+
+    # Helper method to parse a string like "1:03:56" and return the number of
+    # seconds that time length represents.
+    def parse_time(string)
+      parts = string.split(":", -1).map(&:to_i)
+
+      raise ArgumentError, "too many parts" if parts.length > 3
+      raise ArgumentError, "can't parse negative numbers" if parts.any? { |x| x < 0 }
+
+      parts.unshift(0) until parts.length == 3
+      hours, minutes, seconds = parts
+      hours * 3600 + minutes * 60 + seconds
+    end
+  end
+end
+

data/listlace.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.2.0"
-  s.date = "2014-03-22"
+  s.version = "0.2.1"
+  s.date = "2014-03-24"
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/listlace/commands.rb
 - lib/listlace/core_ext/array.rb
 - lib/listlace/selectors.rb
+- lib/listlace/time_helpers.rb
 - listlace.gemspec
 homepage: http://github.com/yjerem/listlace
 licenses: