the_little_streamer 0.3.0 → 0.4.0

data/bin/the_little_streamer

@@ -11,6 +11,11 @@ require 'pathname'
 #Supply a directory with all the music in it
 abort "Point me to the music!" unless ARGV[0]
 
+trap "INT" do
+  $stderr.puts "Exiting..."
+  exit!
+end
+
 #Wrap up in HTML
 def html body
   <<-HTML
@@ -27,7 +32,7 @@ def html body
       <script>
       if(document.getElementById('artist')) {
         window.onload = function() {
-         var artist = document.getElementById('artist').innerHTML;
+         var artist = document.getElementById('artist').firstChild.innerText;
          var title = document.getElementById('title').innerHTML;
          document.title = title + " by " + artist;
         }
@@ -54,10 +59,28 @@ def css
     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;
@@ -80,10 +103,19 @@ def link root, path, text = path, params = {}
   "<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=#{("/" << CGI.escapeHTML(path)).inspect} autobuffer controls autoplay >
+  <audio id='player' onEnded='javascript:play_next()' src=#{("/" << CGI.escape(path)).inspect} autobuffer controls autoplay >
     You need the power of HTML5!
   </audio>
   <script type="text/javascript">
@@ -138,7 +170,7 @@ def playlist_js songs
       artist.innerHTML = song.artist
       album.innerHTML = song.album
       title.innerHTML = song.title
-      document.title = song.title + " by " + song.artist;
+      document.title = song.title + " by " + artist.firstChild.innerText;
       player.play();
     }
 
@@ -153,10 +185,10 @@ end
 #Javascript for a song
 def song_to_js song
   <<-JAVASCRIPT
-  { artist: #{song.artist.inspect},
-    album: #{song.album.inspect},
+  { 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 "/" << song.path).inspect} }
+    path: #{(CGI.escapeHTML "/" << CGI.escape(song.path)).inspect} }
   JAVASCRIPT
 end
 
@@ -174,6 +206,7 @@ def player_html songs
       #{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
@@ -244,7 +277,7 @@ end
 
 #HTML for song information header
 def song_info song
-  "<span id='title'>#{song.title}</span> by <span id='artist'>#{song.artist}</span><br/><span id='album'>#{song.album}</span>"
+  "<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
@@ -266,14 +299,21 @@ set :public, ARGV[0]
 #Make sure Sinatra sings
 set :run, true
 
+$stderr.puts "Scanning music..."
+
+old_stderr = $stderr.dup
+
+$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"
-    album ||= "Unknown"
+    artist = "Unknown" if artist.nil? or artist.empty?
+    album = "Unknown" if album.nil? or album.empty?
+    
     info = nil
 
     if title
@@ -285,17 +325,20 @@ Dir.glob "#{ARGV[0]}/**/*.{mp3,ogg}", File::FNM_CASEFOLD do |file|
   end
 end
 
+$stderr = old_stderr
+
 GC.start #Clean up after TagLib2
 
 #List artists
 get '/' do
   path = '/artist/'
   html <<-HTML
-    #{Music.keys.sort.map { |a| link path, a }.join "<br/>"}<br/><br/>
-    Random
+    (Random
     #{link("/", "all", "10", :limit => 10, :order => :random)}
     #{link("/", "all", "50", :limit => 50, :order => :random) }
-    #{link("/", "all", "100", :limit => 100, :order => :random) }
+    #{link("/", "all", "100", :limit => 100, :order => :random) })<br/><hr/>
+
+    #{Music.keys.sort.map { |a| link path, a }.join "<br/>"}<br/><br/>
   HTML
 end
 
@@ -307,7 +350,8 @@ end
 get '/artist/:artist/?' do |artist|
   unless Music[artist].empty?
     path = "/artist/#{artist}/album/"
-    html Music[artist].keys.sort.map { |a| link path, a }.join("<br/>") << "<br/><br/>" <<
+    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)
 
@@ -329,7 +373,8 @@ end
 get '/artist/:artist/album/:album/?' do |artist, album|
   unless Music[artist][album].empty?
     path = "/artist/#{artist}/album/#{album}/song/"
-    html Music[artist][album].values.sort_by { |s| s.track || 0}.map { |s| link path, s.title }.join("<br/>") << "<br/><br/>" <<
+    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
@@ -349,10 +394,7 @@ end
 #Play song!
 get '/artist/:artist/album/:album/song/:song/?' do |artist, album, title|
   if song = Music[artist][album][title]
-    html <<-HTML
-      #{song_info song}<br/>
-      #{audio song.path}
-    HTML
+    player_html [song]
   else
     html "Could not find <b>#{title}</b> on <b>#{album}</b> by <b>#{artist}</b>."
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: the_little_streamer
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Justin Collins
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -07:00
-default_executable: 
+date: 2012-01-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -25,6 +25,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -39,6 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
@@ -56,7 +58,6 @@ extra_rdoc_files: []
 files: 
 - bin/the_little_streamer
 - README.md
-has_rdoc: true
 homepage: http://github.com/presidentbeef/the_little_streamer
 licenses: []
 
@@ -70,6 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -78,13 +80,14 @@ 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.8.10
 signing_key: 
 specification_version: 3
 summary: Simple Sinatra application for streaming music.