jimmy_jukebox 0.3.7 → 0.4.1

data/bin/load_jukebox

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/jimmy_jukebox/load_jukebox_code.rb'
+require File.expand_path('../lib/jimmy_jukebox/load_jukebox_code.rb', File.dirname(__FILE__))

data/bin/play_jukebox

@@ -1,15 +1,38 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'readline'
-  require 'posix/spawn'
-rescue LoadError => e
-  raise unless e.message =~ /readline|posix|spawn/
-  puts "*** You must install the 'rb-readline' and 'posix_spawn' gems to use JimmyJukebox in Ruby ***"
-  exit
+if RUBY_ENGINE =~ /jruby/
+  begin
+    require 'spoon'
+    require 'readline'
+  rescue LoadError => e
+    if e.message =~ /spoon/
+      p "*** You must install the 'spoon' gem to use JimmyJukebox on JRuby ***"
+      exit
+    elsif e.message =~ /readline/
+      p "*** You must install 'readline' to use JimmyJukebox on JRuby ***"
+      exit
+    else
+      raise
+    end
+  end
+else
+  begin
+    require 'readline'
+    require 'posix/spawn'
+  rescue LoadError => e
+    if e.message =~ /readline/
+      p "*** You must install 'readline' or the 'rb-readline' gem to use JimmyJukebox in Ruby ***"
+      exit
+    elsif e.message =~ /posix/ || e.message =~ /spawn/
+      p "*** You must install the 'posix-spawn' gem to use JimmyJukebox in Ruby ***"
+      exit
+    else
+      raise
+    end
+  end
 end
 
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+lib = File.expand_path('../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 require 'jimmy_jukebox'
 include JimmyJukebox

data/lib/jimmy_jukebox/artists.rb

@@ -1,6 +1,7 @@
 module Artists
 
   JAZZ_ARTISTS = {
+  :acb  => "archibald_camp_banjo",
   :at   => "art_tatum",
   :as   => "artie_shaw",
   :bg   => "benny_goodman",
@@ -10,7 +11,9 @@ module Artists
   :cc   => "charlie_christian",
   :cp   => "charlie_parker",
   :ch   => "coleman_hawkins",
+  :chjb => "clifford_hayes_jug_blowers",
   :cb   => "count_basie",
+  :dx   => "dixieland",
   :dg   => "dizzy_gillespie",
   :dr   => "django_reinhardt",
   :de   => "duke_ellington",
@@ -37,7 +40,7 @@ module Artists
   end
 
   def value_to_yaml_file(value)
-    return value.to_s.capitalize unless value.to_s.match(/_/)
+    return value.to_s.capitalize + '.yml' unless value.to_s.match(/_/)
     value.to_s.split("_").map! { |name_component| name_component.capitalize }.join("") + '.yml'
   end
 

data/lib/jimmy_jukebox/jukebox.rb

@@ -1,81 +1,137 @@
+require 'jimmy_jukebox/user_config'
+
 module JimmyJukebox
 
-  module Jukebox
+  class Jukebox
 
-    class << Jukebox
+    class NoNewSongException < Exception; end
+    class NoCurrentSongException < Exception; end
+    class NoPreviousSongException < Exception; end
 
-      attr_accessor :current_song, :continuous_play
+    attr_accessor :current_song, :continuous_play
+    attr_writer   :user_config, :previous_song, :next_song, :playing
 
+    def initialize(new_user_config = UserConfig.new, continuous_play = true)
+      self.user_config = new_user_config
+      self.continuous_play = continuous_play
     end
 
-    def self.play_loop
-      @continuous_play = true
-      while @continuous_play do
-        play_once
+    def play_loop
+      loop do
+        if continuous_play && !playing?
+          p "Playing random song"
+          play_next_song
+        else
+          sleep 0.1
+        end
       end
     end
 
-    def self.play_once
-      begin
-        play_random_song
-      rescue SystemExit, Interrupt => e
-        terminate_current_song
-        puts "\nMusic terminated by user"
-        exit
-      end
+    def next_song
+      @next_song ? @next_song : random_song
     end
 
-    def self.quit
-      stop_looping
+    def play_next_song
+      play_song(next_song)
+    end
+
+    def quit
+      disable_continuous_play
       terminate_current_song
     end
 
-    def self.skip_song
-      if @current_song
-        puts "Terminating #{@current_song.music_file}"
-        terminate_current_song
+    def playing?
+      @playing ||= false
+    end
+
+    def previous_song
+      @previous_song || nil
+    end
+
+    def replay_previous_song
+      if previous_song
+        p "Replaying #{previous_song.music_file}"
+        #terminate_current_song
+        play_song(previous_song)
       else
-        raise "No @current_song"
+        raise NoPreviousSongException, "No previous song"
       end
     end
 
-    def self.pause_current_song
-      @current_song.pause
+    def skip_song
+      enable_continuous_play
+      if current_song
+        p "Skipping #{current_song.music_file}"
+        #play_random_song
+        self.previous_song = current_song
+        self.current_song = nil
+        previous_song.terminate
+        self.playing = false
+      else
+        raise NoCurrentSongException, "No current_song"
+      end
     end
 
-    def self.unpause_current_song
-      @current_song.unpause
+    def pause_current_song
+      current_song.pause
     end
 
-    def self.stop_looping
-      @continuous_play = false
+    def unpause_current_song
+      current_song.unpause
     end
 
-    def self.songs
+    def songs
       user_config.songs
     end
 
-    def self.play_random_song
-      #terminate_current_song
-      raise "JimmyJukebox has no songs to play!" if songs.length == 0
-      @current_song = Song.new( songs[rand(songs.length)] )
-      @current_song.play(user_config)
-      @current_song = nil # ????
+    def random_song
+      raise NoNewSongException, "JimmyJukebox can't find any songs to play!" if songs.length == 0
+      Song.new( songs[rand(songs.length)] )
+    end
+
+    def play_random_song
+      p "Inside play_random_song"
+      play_song(random_song)
+    end
+
+    def enable_continuous_play
+      self.continuous_play = true
+      p "Enabled continuous_play"
+    end
+
+    def disable_continuous_play
+      self.continuous_play = false
+      p "Disabled continuous_play"
+    end
+
+    def play_song(song)
+      terminate_current_song if current_song
+      self.playing = true
+      p "Setting current_song = #{song.music_file}"
+      self.current_song = song
+      current_song.play(user_config, self)
+      p "Finished playing"
+      self.previous_song = current_song
+      self.current_song = nil
+      self.playing = false
+    rescue Song::SongTerminatedPrematurelyException
+      p "Song ended prematurely"
     end
 
-    def self.terminate_current_song
-      if @current_song
-        puts "Terminating #{@current_song.music_file}"
-        @current_song.terminate
-        #@current_song = nil
+    def terminate_current_song
+      if current_song
+        p "Terminating #{current_song.music_file}"
+        current_song.terminate
+        self.previous_song = current_song
+        self.current_song = nil
+        self.playing = false
       else
-        puts "No song is currently playing"
+        raise NoCurrentSongException, "No current_song"
       end
     end
 
-    def self.user_config
-      @user_config = UserConfig.new unless @user_config
-      @user_config
+    def user_config
+      @user_config ||= UserConfig.new
     end
 
   end

data/lib/jimmy_jukebox/song.rb

@@ -2,105 +2,182 @@ module JimmyJukebox
 
   class Song
 
-    attr_reader :paused, :music_file
+    class InvalidSongFormatException < Exception; end
+    class NoPlayingPidException < Exception; end
+    class UnsupportedSongFormatException < Exception; end
+    class CannotSpawnProcessException < Exception; end
+    class SongTerminatedPrematurelyException < Exception; end
+
+    attr_reader   :music_file
+    attr_writer   :paused
     attr_accessor :player, :playing_pid
 
-    def initialize(music_file)
-      set_music_file(music_file)
-      @paused = false
-      @playing_pid = nil
+    def initialize(in_music_file)
+      set_music_file(in_music_file)
+      self.paused = false
+      self.playing_pid = nil
+    end
+
+    def paused?
+      @paused
     end
 
-    def set_music_file(music_file)
-      if music_file =~ /\.mp3$/i || music_file =~ /\.ogg$/i
-        @music_file = music_file
+    def set_music_file(in_music_file)
+      if in_music_file =~ /\.mp3$/i || in_music_file =~ /\.ogg$/i
+        @music_file = in_music_file
       else
-        raise "You can create a song only with an .mp3 or .ogg file"
+        raise InvalidSongFormatException, "JimmyJukebox plays only .mp3/.ogg files. #{in_music_file} is not valid"
       end
     end
 
+    def grandchild_pid
+      # returns grandchild's pid if the child process spawns a grandchild
+      # if so, the child is probably "/bin/sh" and the grandchild is "mpg123" or similar
+      gpid = `ps h --ppid #{playing_pid} -o pid`.strip.to_i
+      gpid == 0 ? nil : gpid
+    end
+
     def pause
-      @paused = true
+      self.paused = true
       # jruby doesn't seem to handle system() correctly
       # trying backticks
-      # system("kill -s STOP #{@playing_pid}") if @playing_pid
-      `kill -s STOP #{@playing_pid}` if @playing_pid
+      # system("kill -s STOP #{playing_pid}") if playing_pid
+      if grandchild_pid
+        p "Pausing"
+        `kill -s STOP #{grandchild_pid}`
+      elsif playing_pid
+        p "Pausing"
+        `kill -s STOP #{playing_pid}`
+      else
+        raise NoPlayingPidException, "*** Can't pause song because can't find playing_pid #{playing_pid} ***"
+      end
     end
 
     def unpause
-      @paused = false
+      self.paused = false
       # jruby doesn't seem to handle system() correctly
       # trying backticks
-      #system("kill -s CONT #{@playing_pid}") if @playing_pid
-      `kill -s CONT #{@playing_pid}` if @playing_pid
+      #system("kill -s CONT #{playing_pid}") if playing_pid
+      if grandchild_pid
+        p "Unpausing"
+        `kill -s CONT #{grandchild_pid}`
+      elsif playing_pid
+        p "Unpausing"
+        `kill -s CONT #{playing_pid}`
+      else
+        raise NoPlayingPidException, "*** Can't unpause song because can't find playing_pid #{playing_pid} ***"
+      end
+    end
+
+    def kill_playing_pid_and_children
+      grandpid = grandchild_pid
+      playpid = playing_pid
+      if grandpid
+        `kill #{grandpid}`
+        p "killed #{grandpid}"
+      end
+      `kill #{playpid}`
+      p "killed #{playpid}"
     end
 
     def terminate
-      @paused = false
-      #`killall #{@player}`
-      @player = nil
+      self.paused = false
+      #`killall #{player}`
+      self.player = nil
       # killing processes seems problematic in JRuby
       # I've tried several approaches, and nothing seems reliable
-      #Process.kill("SIGKILL",@playing_pid) if @playing_pid
-      #Process.kill("SIGTERM",@playing_pid) if @playing_pid
-      `kill #{@playing_pid}` if @playing_pid
-      @playing_pid = nil
+      #Process.kill("SIGKILL",playing_pid) if playing_pid
+      #Process.kill("SIGTERM",playing_pid) if playing_pid
+      if playing_pid
+        kill_playing_pid_and_children
+        self.playing_pid = nil
+      else
+        raise NoPlayingPidException, "*** Can't terminate song because can't find playing_pid #{playing_pid} ***"
+      end
     end
 
     def set_player(user_config)
-      if @music_file =~ /\.mp3$/i
-        @player = user_config.mp3_player
-      elsif @music_file =~ /\.ogg$/i
-        @player = user_config.ogg_player
+      if music_file =~ /\.mp3$/i
+        self.player = user_config.mp3_player
+      elsif music_file =~ /\.ogg$/i
+        self.player = user_config.ogg_player
+      else
+        raise UnsupportedSongFormatException, "Attempted to play a file format this program cannot play"
       end
-      raise "Attempted to play a file format this program cannot play" unless @player
     end
 
-    def play(user_config)
+    def play(user_config, jukebox)
       set_player(user_config)
       process_status = play_with_player
-      process_status.exitstatus.to_i == 0 ? (@playing_pid = nil) : (raise "Experienced a problem playing a song")
+      process_status.exitstatus.to_i == 0 ? (self.playing_pid = nil) : (raise SongTerminatedPrematurelyException, "Experienced a problem playing a song")
     end
 
     def play_with_player
-      puts "Press Ctrl-C to stop the music and exit this program"
-      puts "Now playing '#{@music_file}'"
-      command = @player
-      arg = File.expand_path(@music_file)
-      system_yield_pid(command,arg) do |pid|
-        @playing_pid = pid 
-      end
+      p "Now playing '#{music_file}'"
+      p "Press Ctrl-C to stop the music and exit this program"
+      music_file_path = File.expand_path(music_file)
+      run_command(player, music_file_path)
+      p "playing_pid = " + playing_pid.to_s
+      #system_yield_pid(player, music_file_path) do |pid|
+      #  self.playing_pid = pid 
+      #end
+      #if running_jruby?
+        Process.waitpid(playing_pid) # Waits for a child process to exit, returns its process id, and sets $? to a Process::Status object
+      #else
+      #  Process::waitpid(playing_pid)
+      #end
+      p "Stopped waiting"
+      $? # return Process::Status object with instance methods .stopped?, .exited?, .exitstatus
     end
 
   end
 
+  def running_jruby?
+    defined?(JRUBY_VERSION) || RUBY_ENGINE == 'jruby' || RUBY_PLATFORM == 'java'
+  end
+
+  def run_command(command, arg)
+    if running_jruby?
+      pid = Spoon.spawnp(command,arg)
+    else
+      begin
+        pid = POSIX::Spawn::spawn(command + ' ' + arg)
+        #pgid = Process.getpgid(pid)
+        #child = POSIX::Spawn::Child.new(command + ' ' + arg)
+        #pid = child.status.pid
+        
+        # create and run block in subprocess (which will terminate with status 0), capture subprocess pid
+        #pid = Process.fork do
+        #  exec(command + ' ' + arg)  # replace new process with system call
+        #  exit! 127                  # exit process and return exit status 127; should never be reached
+        #end
+      rescue NotImplementedError
+        raise CannotSpawnProcessException, "*** Cannot play music because we found neither Spoon.spawnp (for JRuby) nor Process.fork (for MRI) ***"
+      end
+    end
+    self.playing_pid = pid
+  end
+
   # make system call and get pid so you can terminate process
   def system_yield_pid(command,arg)
     # would like to use Process.respond_to?(:fork) but JRuby mistakenly returns true
-    if (defined?(JRUBY_VERSION) || RUBY_PLATFORM == 'java')
+    if running_jruby?
       pid = Spoon.spawnp(command,arg)
-      Process.waitpid(pid)      # Waits for a child process to exit, returns its process id, and sets $? to a Process::Status object
     else
       begin
-        pid = POSIX::Spawn::spawn(command + ' ' + arg)
-        stat = Process::waitpid(pid)
-        #pid = fork do             # creates and runs block in subprocess (which will terminate with status 0), capture subprocess pid
-        #  exec(command)           # replaces current process with system call
-        #  exit! 127               # exit process and return exit status 127; should never be reached
-        #end
+        #spawn(command + ' ' + arg)
+        #pid = POSIX::Spawn::spawn(command + ' ' + arg)
+        
+        # create and run block in subprocess (which will terminate with status 0), capture subprocess pid
+        pid = Process.fork do
+          exec(command + ' ' + arg)  # replace new process with system call
+          exit! 127                  # exit process and return exit status 127; should never be reached
+        end
       rescue NotImplementedError
-        raise "*** fork()...exec() not supported ***"
+        raise CannotSpawnProcessException, "*** Cannot play music because we found neither Spoon.spawnp (for JRuby) nor Process.fork (for MRI) ***"
       end
     end
     yield pid if block_given? # call block, passing in the subprocess pid
-    #if pid
-    #  puts "pid: #{pid}"
-    #  puts "current_song: #{Jukebox.current_song.inspect}"
-    #else
-    #  puts "No process id (pid)!"
-    #  raise "@current_song: #{Jukebox.current_song.inspect}"
-    #end
-    $?                        # return Process::Status object with instance methods .stopped?, .exited?, .exitstatus; see: http://www.ruby-doc.org/core/classes/Process/Status.html
   end
 
 end

data/lib/jimmy_jukebox/song_loader.rb

@@ -94,6 +94,10 @@ module JimmyJukebox
         end
       end
       check_downloaded_song_size(song_pathname)
+      rescue OpenURI::HTTPError
+        p "Warning: Could not download #{song_url}"
+        File.delete(song_pathname) if File.exists?(song_pathname)
+        return nil
     end
 
     def self.check_downloaded_song_size(song_pathname)

data/lib/jimmy_jukebox/songs/ArchibaldCampBanjo.yml

@@ -0,0 +1,21 @@
+---
+- http://archive.org/download/A.l.CampPlaysTheBanjo/BanjoSketch.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/BeautifulDreamer.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/Ciri-biri-binWaltz.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/DanceOfTheFireflies.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/DanceOfTheWoodenDolls.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/DixieChickenReel.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/GoldenBellPolka.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/JumpingJacks.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/JumpingJacks2.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/LightGayPolka.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/ListenToTheMockingbird.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/LittleToyTrain.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/MountGretnaMarch.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/SerenadeOfTheMandolins.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/SilverCrownScottische.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/TheDarkiesAwakening.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/TheDarktownCakewalk.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/TheFrogvilleBand.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/TheJerseyCarnivalMarch.mp3
+- http://archive.org/download/A.l.CampPlaysTheBanjo/WatchHillMarch.mp3

data/lib/jimmy_jukebox/songs/CharlieChristian.yml

@@ -1,9 +1,10 @@
 --- 
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-AirmailSpecial.mp3
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-BluesInB.mp3
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-HoneysuckleRose1939.mp3
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-MyDaddyRocksMe1940.mp3
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-SevenComeEleven.mp3
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-StompinAtTheSavoy1941.mp3
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-SwingToTheBop1941.mp3
-- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-WhollyCats.mp3
+- http://archive.org/download/CharlieChristian-SevenComeEleven/02.SevenComeEleven.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-AirmailSpecial.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-BluesInB.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-HoneysuckleRose1939.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-MyDaddyRocksMe1940.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-SevenComeEleven.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-StompinAtTheSavoy1941.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-SwingToTheBop1941.mp3
+#- http://www.archive.org/download/CharlieChristian-01-08/CharlieChristian-WhollyCats.mp3

data/lib/jimmy_jukebox/songs/CharlieParker.yml

@@ -1,4 +1,12 @@
 --- 
+- http://archive.org/download/CharlieParker-MyOldFlame/CharlieParker-MyOldFlame.mp3
+- http://www.archive.org/download/CharlieParker-Laura/06-Laura.mp3
+- http://www.archive.org/download/CharlieParker-AllTheThingsYouAre/CharlieParker-AllTheThingsYouAre.mp3
+- http://www.archive.org/download/CharlieParker-BodyAndSoul1943/CharlieParker-BodyAndSoul1943.mp3
+- http://www.archive.org/download/CharlieParker-MyOldFlame/CharlieParker-MyOldFlame.mp3
+- http://www.archive.org/download/CharlieParkerHazelScott-EmbraceableYou1943/CharlieParkerHazelScott-EmbraceableYou1943.mp3
+- http://archive.org/download/CharlieParker-LoverMantakeA/14.LoverMantakeA.mp3
+- http://archive.org/download/JazzBeBop/02Pista022.mp3
 - http://www.archive.org/download/CharlieParker-01-25/CharlieParker-ANightInTunisia.mp3
 - http://www.archive.org/download/CharlieParker-01-25/CharlieParker-Bebop.mp3
 - http://www.archive.org/download/CharlieParker-01-25/CharlieParker-BilliesBounce.mp3
@@ -25,9 +33,3 @@
 - http://www.archive.org/download/CharlieParker-01-25/CharlieParker-TheHymn1947.mp3
 - http://www.archive.org/download/CharlieParker-01-25/CharlieParker-WhiteChristmas.mp3
 - http://www.archive.org/download/CharlieParker-01-25/CharlieParker-YardbirdSuite.mp3
-- http://www.archive.org/download/CharlieParker-Laura/06-Laura.mp3
-- http://www.archive.org/download/CharlieParker-LoverMantakeA/14.LoverMantakeA.mp3
-- http://www.archive.org/download/CharlieParker-AllTheThingsYouAre/CharlieParker-AllTheThingsYouAre.mp3
-- http://www.archive.org/download/CharlieParker-BodyAndSoul1943/CharlieParker-BodyAndSoul1943.mp3
-- http://www.archive.org/download/CharlieParker-MyOldFlame/CharlieParker-MyOldFlame.mp3
-- http://www.archive.org/download/CharlieParkerHazelScott-EmbraceableYou1943/CharlieParkerHazelScott-EmbraceableYou1943.mp3

data/lib/jimmy_jukebox/songs/CliffordHayesJugBlowers.yml

@@ -0,0 +1,16 @@
+---
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-BarefootStomp.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-BlueGuitarStomp.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-ByeByeBlues.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-ClefClubStomp.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-DanceHallShuffle.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-EverybodyWantsMyTootelum.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-HeyIAmBlue.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-IfYouCantMakeItEasySweetMama.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-LoveBlues.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-NationalBlues.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-PleaseDontHollerMama.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-TryAndTreatHerRight.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-YoudBetterLeaveMeAloneSweetPapa.mp3
+- http://archive.org/download/CliffordHayesDixielandJugBlowers-01-14/CliffordHayesDixielandJugBlowers-YoureTicklinMe.mp3
+- http://archive.org/download/DixielandJugBlowersVcliffordHayes-MemphisShake1926/DixielandJugBlowersVcliffordHayes-MemphisShake1926.mp3

data/lib/jimmy_jukebox/songs/Dixieland.yml

@@ -0,0 +1,9 @@
+---
+- http://archive.org/download/JackSheedysDixielandJazzBand-TigerRag/JackSheedysDixielandJazzBand-TigerRag.mp3
+- http://archive.org/download/SamLaninsIpanaTroubadores-Dixieland/SamLaninsIpanaTroubadores-Dixieland.mp3
+- http://archive.org/download/OlleSundhsDixielandBand-Panama/OlleSundhsDixielandBand-Panama.mp3
+- http://archive.org/download/JudyGarland-DixielandBand1944/JudyGarland-DixielandBand1944.mp3
+- http://archive.org/download/OriginalDixielandJazzBand-Medley/OriginalDixielandJazzBand-Medley.mp3
+- http://archive.org/download/MamieSmith-GoinToDixieland/MamieSmith-GoinToDixieland.mp3
+- http://archive.org/download/BobCrosbyBobcats-DixielandShuffle1936/BobCrosbyBobcats-DixielandShuffle1936.mp3
+- http://archive.org/download/DickieValentine-KingOfDixieland1958/DickieValentine-KingOfDixieland1958.mp3

data/lib/jimmy_jukebox/songs/LouisArmstrong.yml

@@ -1,4 +1,9 @@
 --- 
+- http://archive.org/download/LouisArmstrong-comeBackSweetPapa/louisarmstrong-ComeBackSweetPapa.mp3
+- http://archive.org/download/LouisArmstrongOrch-BlueAgain1931/LouisArmstrongOrch-BlueAgain1931.mp3
+- http://archive.org/download/LouisArmstrongOrch-SweetheartsOnParade1931/LouisArmstrongOrch-SweetheartsOnParade1931.mp3
+- http://archive.org/download/LouisArmstrong-WhatAWonderfulWorld_39/LouisArmstrong-WhatAWonderfulWorld.mp3
+- http://archive.org/download/LouisArmstrongAllHisStars-struttinWithSomeBarbecue/LouisArmstrongAllHisStars-StruttinWithSomeBarbecue.mp3
 - http://www.archive.org/download/LouisArmstrong-AccentuateThePositive1945/LouisArmstrong-AccentuateThePositive1945.mp3
 - http://www.archive.org/download/LouisArmstrong-AdiosMuchachos1959/LouisArmstrong-AdiosMuchachos1959.mp3
 - http://www.archive.org/download/LouisArmstrong-CestSiBon1962/LouisArmstrong-CestSiBon1962.mp3

data/lib/jimmy_jukebox/songs/MilesDavis.yml

@@ -1,4 +1,35 @@
 --- 
+- http://archive.org/download/MilesDavisPortia/MilesDavis-Tutu-03.Portia.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/01-SoWhat.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/01-SomedayMyPrinceWillCome.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/02-Oleo.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/02-SpringIsHere.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/03-NoBlues.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/03-Teo.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/04-IThoughtAboutYou.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/04-Walkin.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/05-EnAranjuezConTuAmoradagioFrom-conciertoDeAranjuez-.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/05-TheMeaningOfTheBlues-lament.mp3
+- http://archive.org/download/MilesDavisAtCarnegieHall/06-NewRhumba.mp3
+- http://archive.org/download/CookinWithTheMilesDavisQuintet/01MyFunnyValentine.mp3
+- http://archive.org/download/CookinWithTheMilesDavisQuintet/03BluesByFive.mp3
+- http://archive.org/download/CookinWithTheMilesDavisQuintet/04Airegin.mp3
+- http://archive.org/download/CookinWithTheMilesDavisQuintet/05TuneUp_whenLightsAreLow.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/01ItNeverEnteredMyMind.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/02Four.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/03InYourOwnSweetWay.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/04TheThemetake1.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/05TranesBlues.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/06AhmadsBlues.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/07HalfNelson.mp3
+- http://archive.org/download/WorkinWithTheMilesDavisQuintet1959/08TheThemetake2.mp3
+- http://archive.org/download/SteaminWithTheMilesDavisQuintet/01SurreyWithTheFringeOnTop.mp3
+- http://archive.org/download/SteaminWithTheMilesDavisQuintet/02SaltPeanuts.mp3
+- http://archive.org/download/SteaminWithTheMilesDavisQuintet/03SomethingIDreamedLastNight.mp3
+- http://archive.org/download/SteaminWithTheMilesDavisQuintet/04Diane.mp3
+- http://archive.org/download/SteaminWithTheMilesDavisQuintet/05WellYouNeednt.mp3
+- http://archive.org/download/SteaminWithTheMilesDavisQuintet/06WhenIFallInLove.mp3
+- http://archive.org/download/MilesDavis-SpanishKey1/MilesDavis-SpanishKey1.mp3
 - http://www.archive.org/download/MilesDavis-InASilentWayitsAboutThatTime/MilesDavis-InASilentWayitsAboutThatTime.mp3
 - http://www.archive.org/download/MilesDavis-IFallInLoveTooEasily/03.IFallInLoveTooEasily.mp3
 - http://www.archive.org/download/MilesDavis-AllBlues/04-AllBlues.mp3