RubyGems - the_little_streamer - Versions diffs - 0.4.2 → 0.4.3 - Mend

the_little_streamer 0.4.2 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +7 -0
data/README.md +1 -1
data/bin/the_little_streamer +12 -346
data/lib/the_little_streamer/finder.rb +72 -0
data/lib/the_little_streamer/html.rb +219 -0
data/lib/the_little_streamer/music.rb +83 -0
data/lib/the_little_streamer/player.rb +127 -0
data/lib/the_little_streamer/searcher.rb +21 -0
data/lib/the_little_streamer/song.rb +4 -0
data/lib/the_little_streamer.rb +7 -0
metadata +53 -67

checksums.yaml ADDED Viewed

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ba04105936f88f2cea71bf565934e892590cbf6f
+  data.tar.gz: 7da1b197bfc2e8ddac3bf5f3cee5faad14a09b8a
+SHA512:
+  metadata.gz: b8ba19974db05fc9e901b76a06945e6f01eac9954bff693baf50060a80593375b8456084967e585cee38c21e8defb4a93d522702f9bced89847ba7f9a87f359f
+  data.tar.gz: e249d40b2a7ab750448890d33c3226e5c16d038c574a9abb59f9aa8d973f6552e4b5d780212d3e1c4546a3af47123b54d3be0d20dc9d02219c6f83a28b629e64

data/README.md CHANGED Viewed

@@ -15,7 +15,7 @@ Browse to [http://localhost:4567](http://localhost:4567)
 ## Dependencies
  * [Sinatra](http://www.sinatrarb.com/)
- * [ruby-taglib2](https://github.com/rumblehq/ruby-taglib2)
+ * [taglib-ruby](http://robinst.github.io/taglib-ruby/)
  * A browser that supports HTML5, like [Chrome](http://www.google.com/chrome/)
 You are strongly encouraged to use [Mongrel](https://github.com/fauna/mongrel) or [Thin](http://code.macournoyer.com/thin/) (installable as gems) instead of WEBrick, as they will be way faster. Just install one and Sinatra will prefer it over WEBrick.

data/bin/the_little_streamer CHANGED Viewed

@@ -1,13 +1,12 @@
 #!/usr/bin/env ruby
 #This is a simple Sinatra application to play mp3/ogg files through a browser
 #using the HTML5 audio tag
+$LOAD_PATH.unshift "./lib"
 require 'rubygems'
-require 'taglib2'
 require 'sinatra'
-require 'cgi'
-require 'uri'
 require 'pathname'
+require 'the_little_streamer'
 #Supply a directory with all the music in it
 abort "Point me to the music!" unless ARGV[0]
@@ -17,280 +16,6 @@ trap "INT" do
   exit!
 end
-#Wrap up in HTML
-def html body
-  <<-HTML
-    <html>
-      <head>
-        <style type="text/css">
-          #{css}
-        </style>
-        <title>The Little Streamer</title>
-      </head>
-      <body>
-        #{body}
-      </body>
-      <script>
-      if(document.getElementById('artist')) {
-        window.onload = function() {
-         var artist = document.getElementById('artist').firstChild.innerText;
-         var title = document.getElementById('title').innerHTML;
-         document.title = title + " by " + artist;
-        }
-      }
-      </script>
-    </html>
-  HTML
-end
-def css
-  <<-CSS
-  body {
-    font-family: Helvetica,Verdana,Arial,sans-serif;
-    font-size: 13pt;
-  }
-  span#title {
-    font-size: 14pt;
-    font-weight: bold;
-  }
-  span#artist {
-    font-size: 14pt;
-    font-weight: bold;
-  }
-  span#artist a {
-    text-decoration: none;
-    color: black;
-   }
-  span#artist a:hover {
-    text-decoration: underline;
-  }
-  span#album {
-    font-style: italic;
-  }
-  span#album a {
-    text-decoration: none;
-    color: black;
-  }
-  span#album a:hover {
-    text-decoration: underline;
-  }
-  div#playlist {
-    float: left;
-    margin-top: 15px;
-    height: 80%;
-    overflow: auto;
-    text-align: left;
-  }
-  div#playerbox {
-    float: left;
-    text-align: center;
-  }
-  CSS
-end
-#Create a link
-def link root, path, text = path, params = {}
-  full_path = root.split('/').map! {|r| URI.escape r }.join('/') << "/" << URI.escape(path)
-  params = params.map { |k, v| "#{k}=#{v}" }.join "&"
-  "<a href=\"#{full_path}?#{params}\">#{text}</a>"
-end
-#Some navigation
-def title artist, album = nil
-  if album
-    "<h3>#{link "/", "", "Music"} : #{link "/artist/", artist, artist} : #{album}</h3>"
-  else
-    "<h3>#{link "/", "", "Music"} : #{artist}</h3>"
-  end
-end
-#Audio tag
-def audio path
-  <<-HTML
-  <audio id='player' onEnded='javascript:play_next()' src=#{("/" << URI.escape(path)).inspect} autobuffer controls autoplay >
-    You need the power of HTML5!
-  </audio>
-  <script type="text/javascript">
-    document.getElementById('player').volume = 0.3;
-  </script>
-  HTML
-end
-#HTML for displaying playlist
-def playlist_html songs
-  list = []
-  songs.each_with_index do |song, i|
-    list << "<li><a href=\"javascript:play_index(#{i})\">#{song.artist} - #{song.title}</a></li>"
-  end
-  <<-HTML
-    <div style="clear:both">&nbsp;</div>
-    <div id="playlist">
-      <ol>
-        #{list.join}
-      </ol>
-    </div>
-  HTML
-end
-#Javascript for playlist
-def playlist_js songs
-  <<-JAVASCRIPT
-  <script type="text/javascript">
-    var player = document.getElementById('player');
-    var artist = document.getElementById('artist');
-    var album = document.getElementById('album');
-    var title = document.getElementById('title');
-    var playlist = [#{songs.map { |s| song_to_js s }.join "," }]
-    var current_song = 0;
-    play_next = function(reverse) {
-      if(reverse && current_song > 0)
-        current_song--;
-      else if(!reverse && current_song < playlist.length)
-        current_song++;
-      else
-        return;
-      play_current();
-    }
-    play_current = function() {
-      var song = playlist[current_song];
-      player.src = song.path;
-      artist.innerHTML = song.artist
-      album.innerHTML = song.album
-      title.innerHTML = song.title
-      document.title = song.title + " by " + artist.firstChild.innerText;
-      player.play();
-    }
-    play_index = function(index) {
-      current_song = index;
-      play_current();
-    }
-  </script>
-  JAVASCRIPT
-end
-#Javascript for a song
-def song_to_js song
-  <<-JAVASCRIPT
-  { artist: #{link("/artist", song.artist, song.artist).inspect},
-    album: #{link("/artist/#{song.artist}/album/", song.album, song.album).inspect},
-    title: #{song.title.inspect},
-    path: #{(CGI.escapeHTML "/" << CGI.escape(song.path)).inspect} }
-  JAVASCRIPT
-end
-#Back/forward links
-def prev_and_next
-  "<a href='javascript:play_next(true)'>Prev</a>&nbsp;&nbsp;&nbsp;<a href='javascript:play_next()'>Next</a>"
-end
-#Output HTML for player
-def player_html songs
-  html <<-HTML
-    <div id="playerbox">
-      #{song_info songs.first}<br/>
-      #{audio songs.first.path}<br/>
-      #{prev_and_next if songs.length > 1}
-      #{playlist_js songs}
-      #{playlist_html songs if songs.length > 1}
-      <div style="clear:both">#{link "/", "", "Back to All Music"}</div>
-    </div>
-  HTML
-end
-def play_all limit = 100, order = "normal"
-  songs = []
-  case order
-  when "random"
-    Music.values.each do |artist|
-      artist.values.each do |album|
-        album.values.each do |song|
-          songs << song
-        end
-      end
-    end
-    songs.shuffle!
-  else
-    Music.values.each do |artist|
-      artist.values.each do |album|
-        album.values.sort_by { |s| s.track }.each do |song|
-          songs << song
-        end
-      end
-    end
-  end
-  player_html songs[0..limit.to_i]
-end
-#HTML for playing all songs by artist
-def play_artist artist, order = "normal"
-  songs = []
-  case order
-  when "random"
-    Music[artist].each_value do |album|
-      album.each_value do |song|
-        songs << song
-      end
-    end
-    songs.shuffle!
-  else
-    Music[artist].each_value do |album|
-      album.values.sort_by { |s| s.track }.each do |song|
-        songs << song
-      end
-    end
-  end
-  player_html songs
-end
-#HTML for playing all songs on an album
-def play_album artist, album, order = "normal"
-  case order
-  when "random"
-    songs = Music[artist][album].values.shuffle!
-  else
-    songs = Music[artist][album].values.sort_by { |s| s.track }
-  end
-  player_html songs
-end
-#HTML for song information header
-def song_info song
-  "<span id='title'>#{song.title}</span> by <span id='artist'>#{link "/artist/", song.artist}</span><br/><span id='album'>#{link "/artist/#{song.artist}/album", song.album}</span>"
-end
-#Storing all music information in here
-Music = Hash.new do |h,k|
-  h[k] = Hash.new do |hash, key|
-    hash[key] = Hash.new
-  end
-end
-#Song information
-Song = Struct.new :artist, :album, :title, :track, :path
 #Used to figure out path to music files
 root = Pathname.new ARGV[0]
@@ -302,101 +27,42 @@ set :run, true
 $stderr.puts "Scanning music..."
-old_stderr = $stderr.dup
+music = TLS::Music.new(TLS::Finder.new(root, ARGV[0]))
-$stderr.reopen("/dev/null", "w")
-#Grab information from all the song files
-Dir.glob "#{ARGV[0]}/**/*.{mp3,ogg}", File::FNM_CASEFOLD do |file|
-  begin
-    info = TagLib2::File.new(file)
-    artist, album, title, track = info.artist, info.album, info.title, info.track
-    artist = "Unknown" if artist.nil? or artist.empty?
-    album = "Unknown" if album.nil? or album.empty?
-    info = nil
-    if title
-      [artist, album, title].each { |i| i.tr!('/', '-') }
-      Music[artist][album][title] = Song.new(artist, album, title, track, Pathname.new(file).relative_path_from(root).to_s)
-    end
-  rescue Exception => e
-    $stderr.puts e if $DEBUG
-  end
+before do
+  @player = TLS::Player.new(music)
 end
-$stderr = old_stderr
-GC.start #Clean up after TagLib2
 #List artists
 get '/' do
-  path = '/artist/'
-  html <<-HTML
-    (Random
-    #{link("/", "all", "10", :limit => 10, :order => :random)}
-    #{link("/", "all", "50", :limit => 50, :order => :random) }
-    #{link("/", "all", "100", :limit => 100, :order => :random) })<br/><hr/>
-    #{Music.keys.sort.map { |a| link path, a }.join "<br/>"}<br/><br/>
-  HTML
+  @player.list_artists
 end
 get '/all' do
-  play_all params["limit"], params["order"]
+  @player.play_all params["limit"], params["order"]
 end
 #List albums by given artist
 get '/artist/:artist/?' do |artist|
-  unless Music[artist].empty?
-    path = "/artist/#{artist}/album/"
-    html title(artist) <<
-      Music[artist].keys.sort.map { |a| link path, a }.join("<br/>") << "<br/><br/>" <<
-      link("/artist/#{artist}/", "play", "Play All") << " - " <<
-      link("/artist/#{artist}/", "play", "Randomly", :order => :random)
-  else
-    html "Could not find <b>#{artist}</b>."
-  end
+  @player.list_albums_by artist
 end
 #Play songs by given artist
 get '/artist/:artist/play/?' do |artist|
-  unless Music[artist].empty?
-    play_artist artist, params["order"]
-  else
-    html "Could not find <b>#{artist}</b>."
-  end
+  @player.play_artist artist, params["order"]
 end
 #List songs on given album
 get '/artist/:artist/album/:album/?' do |artist, album|
-  unless Music[artist][album].empty?
-    path = "/artist/#{artist}/album/#{album}/song/"
-    html title(artist, album) <<
-      Music[artist][album].values.sort_by { |s| s.track || 0}.map { |s| link path, s.title }.join("<br/>") << "<br/><br/>" <<
-      link("/artist/#{artist}/album/#{album}/", "play", "Play All") << " - " <<
-      link("/artist/#{artist}/album/#{album}/", "play", "Randomly", :order => :random)
-  else
-    html "Could not find <b>#{album}</b> for <b>#{artist}</b>."
-  end
+  @player.list_songs_on artist, album
 end
 #Play all songs from a given album
 get '/artist/:artist/album/:album/play/?' do |artist, album|
-  if Music[artist][album]
-    play_album artist, album, params["order"]
-  else
-    html "Could not find <b>#{album}</b> by <b>#{artist}</b>."
-  end
+  @player.play_album artist, album, params["order"]
 end
 #Play song!
 get '/artist/:artist/album/:album/song/:song/?' do |artist, album, title|
-  if song = Music[artist][album][title]
-    player_html [song]
-  else
-    html "Could not find <b>#{title}</b> on <b>#{album}</b> by <b>#{artist}</b>."
-  end
+  @player.play_song artist, album, title
 end

data/lib/the_little_streamer/finder.rb ADDED Viewed

@@ -0,0 +1,72 @@
+require 'taglib'
+require 'the_little_streamer/song'
+module TLS
+  class Finder
+    def initialize root, path
+      @root = root
+      @paths = [path] #maybe support multiple paths in future
+      @songs = nil
+    end
+    def each_song &block
+      if @songs
+        @songs.each(&block)
+      else
+        get_songs(&block)
+      end
+    end
+    def each_file
+      @paths.each do |path|
+        Dir.glob "#{path}/**/*.{mp3,mP3,Mp3,MP3,ogg,Ogg,OGg,OGG,oGg,oGG,ogG,OgG}" do |file|
+          yield file
+        end
+      end
+    end
+    def get_songs
+      puts "Getting songs..."
+      @songs = []
+      each_file do |file|
+        song = get_song file
+        if song
+          @songs << song
+          yield song
+        end
+      end
+      GC.start #Clean up after TagLib2
+      @songs
+    end
+    def get_song file
+      song = nil
+      begin
+        TagLib::FileRef.open(file) do |fileref|
+          info = fileref.tag
+          artist, album, title, track = info.artist, info.album, info.title, info.track
+          artist = "Unknown" if artist.nil? or artist.empty?
+          album = "Unknown" if album.nil? or album.empty?
+          title = File.basename(file).split('.').first if title.nil? or title.empty?
+          if title
+            [artist, album, title].each { |i| i.tr!('/', '-') }
+            song = Song.new(artist, album, title, track, Pathname.new(file).relative_path_from(@root).to_s)
+          end
+        end
+      rescue Exception => e
+        p e
+        #Should probably do something here?
+      end
+      song
+    end
+  end
+end

data/lib/the_little_streamer/html.rb ADDED Viewed

@@ -0,0 +1,219 @@
+module TLS::HTML
+  #Wrap up in HTML
+  def page body = nil
+    if block_given?
+      body = yield
+    end
+    <<-HTML
+    <html>
+      <head>
+        <style type="text/css">
+    #{css}
+        </style>
+        <title>The Little Streamer</title>
+      </head>
+      <body>
+    #{body}
+      </body>
+      <script>
+      if(document.getElementById('artist')) {
+        window.onload = function() {
+         var artist = document.getElementById('artist').firstChild.innerText;
+         var title = document.getElementById('title').innerHTML;
+         document.title = title + " by " + artist;
+        }
+      }
+      </script>
+    </html>
+    HTML
+  end
+  def css
+    @css ||= <<-CSS
+  body {
+    font-family: Helvetica,Verdana,Arial,sans-serif;
+    font-size: 13pt;
+  }
+  span#title {
+    font-size: 14pt;
+    font-weight: bold;
+  }
+  span#artist {
+    font-size: 14pt;
+    font-weight: bold;
+  }
+  span#artist a {
+    text-decoration: none;
+    color: black;
+   }
+  span#artist a:hover {
+    text-decoration: underline;
+  }
+  span#album {
+    font-style: italic;
+  }
+  span#album a {
+    text-decoration: none;
+    color: black;
+  }
+  span#album a:hover {
+    text-decoration: underline;
+  }
+  div#playlist {
+    float: left;
+    margin-top: 15px;
+    height: 80%;
+    overflow: auto;
+    text-align: left;
+  }
+  div#playerbox {
+    float: left;
+    text-align: center;
+  }
+    CSS
+    @css
+  end
+  #Create a link
+  def link root, path, text = path, params = {}
+    full_path = root.split('/').map! {|r| URI.escape r }.join('/') << "/" << URI.escape(path)
+    params = params.map { |k, v| "#{k}=#{v}" }.join "&"
+    "<a href=\"#{full_path}?#{params}\">#{text}</a>"
+  end
+  #Some navigation
+  def title artist, album = nil
+    if album
+      "<h3>#{link "/", "", "Music"} : #{link "/artist/", artist, artist} : #{album}</h3>"
+    else
+      "<h3>#{link "/", "", "Music"} : #{artist}</h3>"
+    end
+  end
+  #Audio tag
+  def audio path
+    <<-HTML
+  <audio id='player' onEnded='javascript:play_next()' src=#{("/" << URI.escape(path)).inspect} autobuffer controls autoplay >
+    You need the power of HTML5!
+  </audio>
+  <script type="text/javascript">
+    document.getElementById('player').volume = 0.3;
+  </script>
+    HTML
+  end
+  #HTML for displaying playlist
+  def playlist_html songs
+    list = []
+    songs.each_with_index do |song, i|
+      list << "<li><a href=\"javascript:play_index(#{i})\">#{song.artist} - #{song.title}</a></li>"
+    end
+    <<-HTML
+    <div style="clear:both">&nbsp;</div>
+    <div id="playlist">
+      <ol>
+    #{list.join}
+      </ol>
+    </div>
+    HTML
+  end
+  #Javascript for playlist
+  def playlist_js songs
+    <<-JAVASCRIPT
+  <script type="text/javascript">
+    var player = document.getElementById('player');
+    var artist = document.getElementById('artist');
+    var album = document.getElementById('album');
+    var title = document.getElementById('title');
+    var playlist = [#{songs.map { |s| song_to_js s }.join "," }]
+    var current_song = 0;
+    play_next = function(reverse) {
+      if(reverse && current_song > 0)
+        current_song--;
+      else if(!reverse && current_song < playlist.length)
+        current_song++;
+      else
+        return;
+      play_current();
+    }
+    play_current = function() {
+      var song = playlist[current_song];
+      player.src = song.path;
+      artist.innerHTML = song.artist
+      album.innerHTML = song.album
+      title.innerHTML = song.title
+      document.title = song.title + " by " + artist.firstChild.innerText;
+      player.play();
+    }
+    play_index = function(index) {
+      current_song = index;
+      play_current();
+    }
+  </script>
+    JAVASCRIPT
+  end
+  #Javascript for a song
+  def song_to_js song
+    <<-JAVASCRIPT
+  { artist: #{link("/artist", song.artist, song.artist).inspect},
+    album: #{link("/artist/#{song.artist}/album/", song.album, song.album).inspect},
+    title: #{song.title.inspect},
+    path: #{(CGI.escapeHTML "/" << CGI.escape(song.path)).inspect} }
+    JAVASCRIPT
+  end
+  #HTML for song information header
+  def song_info song
+    "<span id='title'>#{song.title}</span> by <span id='artist'>#{link "/artist/", song.artist}</span><br/><span id='album'>#{link "/artist/#{song.artist}/album", song.album}</span>"
+  end
+  #Back/forward links
+  def prev_and_next
+    @prev_and_next ||= "<a href='javascript:play_next(true)'>Prev</a>&nbsp;&nbsp;&nbsp;<a href='javascript:play_next()'>Next</a>"
+    @prev_and_next
+  end
+  #Output HTML for player
+  def player_html songs
+    page <<-HTML
+    <div id="playerbox">
+    #{song_info songs.first}<br/>
+    #{audio songs.first.path}<br/>
+    #{prev_and_next if songs.length > 1}
+    #{playlist_js songs}
+    #{playlist_html songs if songs.length > 1}
+      <div style="clear:both">#{link "/", "", "Back to All Music"}</div>
+    </div>
+    HTML
+  end
+  def search_box
+    <<-HTML
+    <div id="searchbox">
+      <form action="/search">
+        <label for="search">Search:</label>
+        <input type="text" />
+      </form>
+    </div>
+    HTML
+  end
+end

data/lib/the_little_streamer/music.rb ADDED Viewed

@@ -0,0 +1,83 @@
+class TLS::Music
+  def initialize finder
+    #Hash three levels deep for artist, album, and song
+    @music = Hash.new do |h,k|
+      h[k] = Hash.new do |hash, key|
+        hash[key] = Hash.new
+      end
+    end
+    @songs = []
+    finder.each_song do |song|
+      add_song song
+    end
+  end
+  def add_song song
+    @music[song.artist][song.album][song.title] = song
+    @songs << song
+  end
+  def [] artist, album = nil, title = nil
+    if title
+      get_song artist, album, title
+    elsif album
+      get_album artist, album
+    elsif artist
+      get_artist artist
+    end
+  end
+  def all_songs
+    @songs
+  end
+  def has? artist, album = nil, title = nil
+    not self[artist, album, title].empty?
+  end
+  def get_artist artist
+    @music[artist]
+  end
+  def get_album artist, album
+    @music[artist][album]
+  end
+  def get_song artist, album, title
+    @music[artist][album][title]
+  end
+  def artist_names
+    @music.keys.sort!
+  end
+  def album_names_by artist
+    get_artist(artist).keys.sort!
+  end
+  def song_names_on artist, album
+    get_album(artist, album).keys.sort!
+  end
+  def songs_on artist, album
+    get_album(artist, album).values
+  end
+  def songs_by artist
+    songs = []
+    get_artist(artist).each_value do |album|
+      album.each_value do |song|
+        songs << song
+      end
+    end
+    songs
+  end
+  def albums_by artist
+    get_artist(artist).values
+  end
+end

data/lib/the_little_streamer/player.rb ADDED Viewed

@@ -0,0 +1,127 @@
+class TLS::Player
+  include TLS::HTML
+  def initialize music
+    @music = music
+  end
+  def play_all limit = 100, order = "normal"
+    case order
+    when "random"
+      songs = @music.all_songs.shuffle
+    else
+      songs = @music.all_songs
+    end
+    player_html songs[0..limit.to_i]
+  end
+  #HTML for playing all songs by artist
+  def play_artist artist, order = "normal"
+    if @music.has? artist
+      songs = []
+      case order
+      when "random"
+        songs = @music.songs_by(artist).shuffle!
+      else
+        @music.album_names_by(artist).each do |album|
+          @music.get_album(artist, album).values.sort_by { |s| s.track }.each do |song|
+            songs << song
+          end
+        end
+      end
+      player_html songs
+    else
+      artist_not_found artist
+    end
+  end
+  #HTML for playing all songs on an album
+  def play_album artist, album, order = "normal"
+    if @music.has? artist, album
+      if order == "random"
+        songs = @music.songs_on(artist, album).shuffle!
+      else
+        songs = @music.songs_on(artist, album).sort_by { |s| s.track }
+      end
+      player_html songs
+    else
+      album_not_found artist, album
+    end
+  end
+  def play_song artist, album, title
+    song = @music.get_song(artist, album, title)
+    if song
+      player_html [song]
+    else
+      song_not_found
+    end
+  end
+  def artist_not_found artist
+    page "Could not find <b>#{artist}</b>."
+  end
+  def song_not_found artist, album, title
+    page "Could not find <b>#{title}</b> on <b>#{album}</b> by <b>#{artist}</b>."
+  end
+  def album_not_found artist, album
+    page "Could not find <b>#{album}</b> by <b>#{artist}</b>."
+  end
+  def list_artists
+    path = '/artist/'
+    page <<-HTML
+    (Random
+    #{link("/", "all", "10", :limit => 10, :order => :random)}
+    #{link("/", "all", "50", :limit => 50, :order => :random) }
+    #{link("/", "all", "100", :limit => 100, :order => :random) })
+    #{search_box}
+    <br/><hr/>
+    #{@music.artist_names.map { |a| link path, a }.join "<br/>"}
+    <br/><br/>
+    HTML
+  end
+  def list_albums_by artist
+    if @music.has? artist
+      path = "/artist/#{artist}/album/"
+      page <<-HTML
+        #{title(artist)}
+        #{@music.album_names_by(artist).map { |a| link path, a }.join("<br/>")}
+        <br/><br/>
+        #{link("/artist/#{artist}/", "play", "Play All")} -
+        #{link("/artist/#{artist}/", "play", "Randomly", :order => :random)}
+        HTML
+    else
+      artist_not_found artist
+    end
+  end
+  def list_songs_on artist, album
+    if @music.has? artist, album
+      path = "/artist/#{artist}/album/#{album}/song/"
+      page <<-HTML
+        #{title(artist, album)}
+        #{@music.songs_on(artist, album).sort_by { |s| s.track || 0}.map { |s| link path, s.title }.join("<br/>")}
+        <br/><br/>
+        #{link "/artist/#{artist}/album/#{album}/", "play", "Play All" } -
+        #{link "/artist/#{artist}/album/#{album}/", "play", "Randomly", :order => :random }
+        HTML
+    else
+      album_not_found artist, album
+    end
+  end
+  def list_search search
+    songs = @music.find search
+  end
+end

data/lib/the_little_streamer/searcher.rb ADDED Viewed

@@ -0,0 +1,21 @@
+module TLS
+  class Searcher
+    def initialize music
+      @music = music
+    end
+    def find_all search
+      search = normalize search
+      @music.all_songs.select do |song|
+        song.title.downcase.include? search or
+        song.album.downcase.include? search or
+        song.artist.downcase.include? search
+      end
+    end
+    def normalize search
+      search.strip.gsub(/\s{2,}/, ' ').downcase
+    end
+  end
+end

data/lib/the_little_streamer/song.rb ADDED Viewed

@@ -0,0 +1,4 @@
+module TLS
+  #Song information
+  Song = Struct.new :artist, :album, :title, :track, :path
+end

data/lib/the_little_streamer.rb ADDED Viewed

@@ -0,0 +1,7 @@
+require 'cgi'
+require 'uri'
+require 'the_little_streamer/song'
+require 'the_little_streamer/finder'
+require 'the_little_streamer/music'
+require 'the_little_streamer/html'
+require 'the_little_streamer/player'

metadata CHANGED Viewed

@@ -1,95 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: the_little_streamer
-version: !ruby/object:Gem::Version
-  hash: 11
-  prerelease:
-  segments:
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.4.3
 platform: ruby
-authors:
+authors:
 - Justin Collins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2013-08-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 9
-        segments:
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: ruby-taglib2
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: taglib-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 11
-        segments:
-        - 1
-        - 2
-        version: "1.02"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  version_requirements: *id002
-description: Point the Little Streamer to your music directory and it will serve up the tunes using the HTML5 audio tag.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+description: Point the Little Streamer to your music directory and it will serve up
+  the tunes using the HTML5 audio tag.
 email:
-executables:
+executables:
 - the_little_streamer
 extensions: []
 extra_rdoc_files: []
-files:
+files:
 - bin/the_little_streamer
 - README.md
+- lib/the_little_streamer.rb
+- lib/the_little_streamer/finder.rb
+- lib/the_little_streamer/html.rb
+- lib/the_little_streamer/searcher.rb
+- lib/the_little_streamer/player.rb
+- lib/the_little_streamer/music.rb
+- lib/the_little_streamer/song.rb
 homepage: http://github.com/presidentbeef/the_little_streamer
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.15
+rubygems_version: 2.0.7
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Simple Sinatra application for streaming music.
 test_files: []