qtunes 0.0.2 → 0.0.3

data/README.md

@@ -0,0 +1,57 @@
+Qtunes
+========
+
+Qtunes let's you control the queue of a local cmus-player via a web-interface (which is a rip-off of [Holman's Play](https://github.com/holman/play)).
+
+Requirements
+------------
+
+- [cmus](http://cmus.sourceforge.net/)
+    
+    OSX: `brew install cmus`
+
+Installation
+------------
+    
+    $ gem install qtunes
+    
+
+Usage
+------------
+
+    $ qtunes
+    Tasks:
+      qtunes help [TASK]  # Describe available tasks or one specific task
+      qtunes server       # Serve Qtunes frontend
+      qtunes version      # Display installed Qtunes version
+
+Author
+------
+
+Gert Goet (eval) :: gert@thinkcreate.nl :: @gertgoet
+
+License
+------
+
+(The MIT license)
+
+Copyright (c) 2011 Gert Goet, ThinkCreate
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/config.ru

@@ -0,0 +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'
+run Qtunes::Server

data/lib/qtunes/paginatable.rb

@@ -0,0 +1,13 @@
+module Qtunes
+  module Paginatable
+    attr_accessor :per_page
+
+    def page(n)
+      slice(*[n - 1, 1].map{|i| i * self.per_page }) || []
+    end
+
+    def per_page
+      @per_page ||= 10
+    end
+  end
+end

data/lib/qtunes/player.rb

@@ -1,4 +1,5 @@
 require 'cocaine'
+require 'shellwords'
 
 module Qtunes
   class Player
@@ -29,6 +30,18 @@ module Qtunes
       info['status']
     end
 
+    def playing?
+      status == 'playing'
+    end
+
+    def stopped?
+      status == 'stopped'
+    end
+
+    def paused?
+      status == 'paused'
+    end
+
     def file
       info['file']
     end
@@ -70,7 +83,7 @@ module Qtunes
     end
 
     def enqueue(file)
-      Cocaine::CommandLine.new('cmus-remote', "-q '#{file}'").run
+      Cocaine::CommandLine.new('cmus-remote', "-q #{file.shellescape}").run
     end
 
     def queue

data/lib/qtunes/server.rb

@@ -1,9 +1,14 @@
 require 'sinatra/base'
+require 'rack-flash'
 require 'digest/sha2'
 require 'audioinfo'
+require 'qtunes/paginatable'
 
 module Qtunes
   class Server < Sinatra::Base
+    enable :sessions
+    use Rack::Flash, :sweep => false
+
     dir = File.dirname(File.expand_path(__FILE__))
 
     set :views,  "#{dir}/server/views"
@@ -11,45 +16,49 @@ module Qtunes
     set :static, true
 
     get '/' do
-      @song = PLAYER.file
-      @songs = queue
+      @song = player.file
+      @songs = queue.values
 
       erb :songs
     end
     
     get '/library' do
-      @song = PLAYER.file
-      @songs = library
+      @page = params[:page] ? params[:page].to_i : 1
+      @song = player.file
+      @songs = library.values.extend(Qtunes::Paginatable).page(@page)
 
       erb :songs
     end
 
     get '/add/:id' do
-      PLAYER.enqueue(library[params[:id]][:path])
+      player.enqueue(library[params[:id]]['path']) && flash[:notice] = "Song added"
+      player.play if player.stopped?
 
-      redirect '/'
+      redirect back
     end
 
     get '/remove/:id' do
-      ix = library.keys.index(params[:id])
+      ix = queue.keys.index(params[:id])
 
       # badass!
-      PLAYER.view_queue
-      PLAYER.win_top
-      ix.times{ PLAYER.win_down }
-      PLAYER.win_remove
-      
-      redirect '/'
+      player.view_queue
+      player.win_top
+      ix.times{ player.win_down }
+      player.win_remove && flash[:notice] = "Song removed"
+
+      redirect back
     end
 
-    configure do
-      puts "Configure"
+    def self.player
+      @player ||= Qtunes::Player.new
+    end
 
-      PLAYER = Qtunes::Player.new
+    def player
+      self.class.player
     end
 
     def self.queue
-      songs_to_hash{ PLAYER.queue }
+      songs_to_hash{ player.queue }
     end
 
     def queue
@@ -57,22 +66,32 @@ module Qtunes
     end
 
     def self.library
-      @library ||= songs_to_hash{ PLAYER.library }
+      @library ||= begin
+        print "Loading library..."
+        result = songs_to_hash{ player.library }
+        puts "Done"
+        result
+      end
     end
 
     def library
       self.class.library
     end
 
+    helpers do
+      include Rack::Utils
+      alias_method :h, :escape_html
+    end
+
     protected
       def self.songs_to_hash
         yield.inject({}) do |res,path|
           begin
-            song = {:path => path}.merge(AudioInfo.open(path).to_h)
+            song = AudioInfo.open(path).to_h
           rescue AudioInfoError
             next res
           end
-          res[song_id(path)] = song
+          res[song_id(path)] = song.merge('path' => path, 'id' => song_id(path))
           res
         end
       end
@@ -80,5 +99,21 @@ module Qtunes
       def self.song_id(file)
         Digest::SHA256.hexdigest(file)[0,10]
       end
+
+      def debug(object)
+        begin
+          Marshal::dump(object)
+          "<pre class='debug_dump'>#{h(object.to_yaml).gsub("  ", "&nbsp; ")}</pre>"
+        rescue Exception => e  # errors from Marshal or YAML
+          # Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
+          "<code class='debug_dump'>#{h(object.inspect)}</code>"
+        end
+      end
+
+    configure do
+      puts "Configure"
+
+      Qtunes::Server.library
+    end
   end
 end

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

@@ -30,7 +30,7 @@ a:hover{
 }
 
 .navigation{
-  text-align: right;
+  text-align: left;
   padding: 2px 10px;
   font-weight: bold;
   letter-spacing: -1px;
@@ -76,9 +76,9 @@ a:hover{
 .song .artist{
   font-size: 3em;
   letter-spacing: -5px;
+  color: #485460;
 }
 .song .artist a{
-  color: #485460;
 }
 .song .title{
   padding-left: 10px;

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

@@ -6,17 +6,20 @@
 </head>
 
 <body>
-  <h1>Title</h1>
+  <h1><a href='/'>Qtunes</a></h1>
 
   <div class="navigation">
-    <form method="get" action="/search">
-      <input type="search" name="q" />
-    </form>
-
     <a href="/">Queue</a>
     <a href="/library">Library</a>
   </div>
 
+  <% if flash[:notice] %>
+    <p class="notice"><%= flash[:notice] %></p>
+  <% end %>
+  <% if flash[:error] %>
+    <p class="error"><%= flash[:error] %></p>
+  <% end %>
+
   <%= yield %>
 </body>
 </html>

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

@@ -1,31 +1,34 @@
-<p>Now playing: '<%= @song %>'</p>
+<h3>Now playing: '<%= @song %>'</h3>
 
-<% @songs.each do |id, song| %>
+<% 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[id] %>
-      <a href="/remove/<%= id %>" title="remove from queue">-</a>
+      <% if queue[song['id']] %>
+      <a href="/remove/<%= song['id'] %>" title="remove from queue">-</a>
       <% else %>
-      <a href="/add/<%= id %>" title="add to queue">+</a>
+      <a href="/add/<%= song['id'] %>" title="add to queue">+</a>
       <% end %>
     </span>
 
-
-    <span class="artist">
-      <a href="/artist/{{artist_name}}"><%= song['artist'] %></a>
-    </span>
-
-    <span class="title">
-      <a href="/song/{{id}}"><%= song['title'] %></a>
-    </span>
-    <span class="album">
-      <a href="/artist/{{artist_name}}/album/{{album_name}}"><%= song['album'] %></a>
-    </span>
+    <span class="artist"><%= song['artist'] %></span>
+    <span class="title"><%= song['title'] %></span>
+    <span class="album"><%= song['album'] %></span>
   </div>
 <% end %>
 
 <% if @songs.empty? %>
   <div class="content">
-    The queue is empty. Quick, play some <a href="/artist/Ace+of+Base">Ace of Base</a>; no one's looking.
+    No songs found!
   </div>
 <% end %>
+
+<% if @page %>
+  <a href="?page=<%= @page - 1 %>">Previous</a>
+  <a href="?page=<%= @page + 1 %>">Next</a>
+<% end %>
+

data/lib/qtunes/version.rb

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

data/qtunes.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "sinatra"
-  s.add_runtime_dependency "thor"
-  s.add_runtime_dependency "cocaine"
-  s.add_runtime_dependency "ruby-audioinfo"
+  s.add_development_dependency "shotgun"
+
+  s.add_runtime_dependency "sinatra", "~> 1.2.6"
+  s.add_runtime_dependency "rack-flash", "~> 0.1.2"
+  s.add_runtime_dependency "thor", "~> 0.14.6"
+  s.add_runtime_dependency "cocaine", "~> 0.2.0"
+  s.add_runtime_dependency "ruby-audioinfo", "~> 0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qtunes
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,53 +9,75 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000 +02:00
+date: 2011-08-25 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &11079020 !ruby/object:Gem::Requirement
+  name: shotgun
+  requirement: &18146680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18146680
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &18146180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *11079020
+  version_requirements: *18146180
+- !ruby/object:Gem::Dependency
+  name: rack-flash
+  requirement: &18145680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *18145680
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &11078600 !ruby/object:Gem::Requirement
+  requirement: &18145220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *11078600
+  version_requirements: *18145220
 - !ruby/object:Gem::Dependency
   name: cocaine
-  requirement: &11078180 !ruby/object:Gem::Requirement
+  requirement: &18144760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *11078180
+  version_requirements: *18144760
 - !ruby/object:Gem::Dependency
   name: ruby-audioinfo
-  requirement: &11077760 !ruby/object:Gem::Requirement
+  requirement: &18144300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *11077760
+  version_requirements: *18144300
 description: add songs to queue, let cmus eat it
 email:
 - gert@thinkcreate.nl
@@ -66,10 +88,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- README
+- README.md
 - Rakefile
 - bin/qtunes
+- config.ru
 - lib/qtunes.rb
+- lib/qtunes/paginatable.rb
 - lib/qtunes/player.rb
 - lib/qtunes/server.rb
 - lib/qtunes/server/public/base.css

data/README

@@ -1,4 +0,0 @@
-Qtunes let's you control the queue of a local cmus-player via a web-interface.
-
-# start server
-$> qtunes s[erver]