the_little_streamer 0.1.1 → 0.2.0

data/bin/the_little_streamer

@@ -47,6 +47,19 @@ def css
   span#album {
     font-style: italic;
   }
+
+  div#playlist {
+    float: left;
+    margin-top: 15px;
+    height: 80%;
+    overflow: auto;
+    text-align: left;
+  }
+
+  div#playerbox {
+    float: left;
+    text-align: center;
+  }
   CSS
 end
 
@@ -69,8 +82,26 @@ def audio path
   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 songs
+def playlist_js songs
   <<-JAVASCRIPT
   <script type="text/javascript">
     var player = document.getElementById('player');
@@ -88,6 +119,10 @@ def playlist songs
       else
         return;
 
+      play_current();
+    }
+
+    play_current = function() {
       var song = playlist[current_song];
       player.src = song.path;
       artist.innerHTML = song.artist
@@ -95,6 +130,11 @@ def playlist songs
       title.innerHTML = song.title
       player.play();
     }
+
+    play_index = function(index) {
+      current_song = index;
+      play_current();  
+    }
   </script>
   JAVASCRIPT
 end
@@ -114,6 +154,46 @@ 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>
+  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 = []
@@ -135,12 +215,7 @@ def play_artist artist, order = "normal"
     end
   end
 
-  html <<-HTML
-    #{song_info songs.first}<br/>
-    #{audio songs.first.path}<br/>
-    #{prev_and_next if songs.length > 1}
-    #{playlist songs}
-  HTML
+  player_html songs
 end
 
 #HTML for playing all songs on an album
@@ -153,12 +228,7 @@ def play_album artist, album, order = "normal"
     songs = Music[artist][album].values.sort_by { |s| s.track }
   end
 
-  html <<-HTML
-    #{song_info songs.first}<br/>
-    #{audio songs.first.path}<br/>
-    #{prev_and_next if songs.length > 1}
-    #{playlist songs}
-  HTML
+  player_html songs
 end
 
 #HTML for song information header
@@ -209,7 +279,17 @@ GC.start #Clean up after TagLib2
 #List artists
 get '/' do
   path = '/artist/'
-  html Music.keys.sort.map { |a| link path, a }.join "<br/>"
+  html <<-HTML
+    #{Music.keys.sort.map { |a| link path, a }.join "<br/>"}<br/><br/>
+    Random
+    #{link("/", "all", "10", :limit => 10, :order => :random)}
+    #{link("/", "all", "50", :limit => 50, :order => :random) }
+    #{link("/", "all", "100", :limit => 100, :order => :random) }
+  HTML
+end
+
+get '/all' do
+  play_all params["limit"], params["order"]
 end
 
 #List albums by given artist

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: the_little_streamer
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Justin Collins
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -07:00
+date: 2011-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -39,6 +41,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -70,6 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -78,15 +82,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Sinatra application for streaming music.
+summary: Simple Sinatra application for streaming music.
 test_files: []