qtunes 0.0.3 → 0.0.4

data/bin/qtunes

@@ -10,6 +10,7 @@ class QtunesCLI < Thor
   map 's' => :server
   desc 'server', 'Serve Qtunes frontend'
   def server
+    require 'qtunes/server'
     puts "== Starting Qtunes server"
     Qtunes::Server.run!
   end

data/config.ru

@@ -1,4 +1,4 @@
 # Use this config to develop the webinterface with shotgun (which gives you reload-per-request):
 # $> bundle exec shotgun config.ru
-require './lib/qtunes'
+require './lib/qtunes/server'
 run Qtunes::Server

data/lib/qtunes.rb

@@ -1,6 +1,5 @@
 require "qtunes/player"
 require "qtunes/version"
-require "qtunes/server"
 
 module Qtunes
 end

data/lib/qtunes/server.rb

@@ -1,3 +1,4 @@
+require 'qtunes'
 require 'sinatra/base'
 require 'rack-flash'
 require 'digest/sha2'
@@ -15,8 +16,11 @@ module Qtunes
     set :public, "#{dir}/server/public"
     set :static, true
 
+    before do
+      @current = self.class.song_to_hash(player.file)
+    end
+
     get '/' do
-      @song = player.file
       @songs = queue.values
 
       erb :songs
@@ -24,7 +28,6 @@ module Qtunes
     
     get '/library' do
       @page = params[:page] ? params[:page].to_i : 1
-      @song = player.file
       @songs = library.values.extend(Qtunes::Paginatable).page(@page)
 
       erb :songs
@@ -86,18 +89,23 @@ module Qtunes
     protected
       def self.songs_to_hash
         yield.inject({}) do |res,path|
-          begin
-            song = AudioInfo.open(path).to_h
-          rescue AudioInfoError
-            next res
-          end
-          res[song_id(path)] = song.merge('path' => path, 'id' => song_id(path))
+          res[song_id(path)] = song_to_hash(path)
           res
         end
       end
 
-      def self.song_id(file)
-        Digest::SHA256.hexdigest(file)[0,10]
+      def self.song_id(path)
+        Digest::SHA256.hexdigest(path)[0,10]
+      end
+
+      def self.song_to_hash(path)
+        result = {}
+        begin
+          result.merge!(AudioInfo.open(path).to_h)
+        rescue AudioInfoError
+        end
+        result.merge!('path' => path, 'id' => song_id(path))
+        result
       end
 
       def debug(object)

data/lib/qtunes/server/public/base.css

@@ -70,6 +70,10 @@ a:hover{
   font-size: 1.25em;
   font-weight: bold;
 }
+.song.current, .song.current * {
+  background-color: #485460;
+  color: #FFF !important;
+}
 .song a:hover{
   color: #000 !important;
 }

data/lib/qtunes/server/views/_song.erb

@@ -0,0 +1,15 @@
+<div class="song <%= 'current' if defined?(current) %>">
+  <% if not defined?(current) %>
+    <span class="controls">
+      <% if queue[song['id']] %>
+        <a href="/remove/<%= song['id'] %>" title="remove from queue">-</a>
+      <% else %>
+        <a href="/add/<%= song['id'] %>" title="add to queue">+</a>
+      <% end %>
+    </span>
+  <% end %>
+
+  <span class="artist"><%= song['artist'] && !song['artist'].empty? ? song['artist'] : song['path'] %></span>
+  <span class="title"><%= song['title'] %></span>
+  <span class="album"><%= song['album'] %></span>
+</div>

data/lib/qtunes/server/views/songs.erb

@@ -1,29 +1,17 @@
-<h3>Now playing: '<%= @song %>'</h3>
+<%= erb :_song, {}, {:song => @current, :current => true} %>
 
 <% if @page %>
   <a href="?page=<%= @page - 1 %>">Previous</a>
   <a href="?page=<%= @page + 1 %>">Next</a>
 <% end %>
 
-<% @songs.each do |song| %>
-  <div class="song">
-    <span class="controls">
-      <% if queue[song['id']] %>
-      <a href="/remove/<%= song['id'] %>" title="remove from queue">-</a>
-      <% else %>
-      <a href="/add/<%= song['id'] %>" title="add to queue">+</a>
-      <% end %>
-    </span>
-
-    <span class="artist"><%= song['artist'] %></span>
-    <span class="title"><%= song['title'] %></span>
-    <span class="album"><%= song['album'] %></span>
-  </div>
+<% @songs.each_with_index do |song,ix| %>
+  <%= erb :_song, {}, {:song => song} %>
 <% end %>
 
 <% if @songs.empty? %>
   <div class="content">
-    No songs found!
+    No more songs found!
   </div>
 <% end %>
 

data/lib/qtunes/version.rb

@@ -1,3 +1,3 @@
 module Qtunes
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qtunes
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &18146680 !ruby/object:Gem::Requirement
+  requirement: &17686820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18146680
+  version_requirements: *17686820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &18146180 !ruby/object:Gem::Requirement
+  requirement: &17686320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *18146180
+  version_requirements: *17686320
 - !ruby/object:Gem::Dependency
   name: rack-flash
-  requirement: &18145680 !ruby/object:Gem::Requirement
+  requirement: &17685820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *18145680
+  version_requirements: *17685820
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &18145220 !ruby/object:Gem::Requirement
+  requirement: &17685360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *18145220
+  version_requirements: *17685360
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &18144760 !ruby/object:Gem::Requirement
+  requirement: &17684900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *18144760
+  version_requirements: *17684900
 - !ruby/object:Gem::Dependency
   name: ruby-audioinfo
-  requirement: &18144300 !ruby/object:Gem::Requirement
+  requirement: &17684440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *18144300
+  version_requirements: *17684440
 description: add songs to queue, let cmus eat it
 email:
 - gert@thinkcreate.nl
@@ -97,6 +97,7 @@ files:
 - lib/qtunes/player.rb
 - lib/qtunes/server.rb
 - lib/qtunes/server/public/base.css
+- lib/qtunes/server/views/_song.erb
 - lib/qtunes/server/views/layout.erb
 - lib/qtunes/server/views/songs.erb
 - lib/qtunes/version.rb