hearken 0.0.5 → 0.0.6

data/lib/hearken.rb

@@ -1,3 +1,3 @@
 module Hearken
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/hearken/colour.rb

@@ -0,0 +1,5 @@
+module Hearken::Colour
+  def c text,colour
+    text.to_s.foreground colour
+  end
+end

data/lib/hearken/command/list.rb

@@ -1,7 +1,10 @@
 require 'hearken/command'
+require 'hearken/colour'
 
 class Hearken::Command::List
   include Hearken::Command
+  include Hearken::Colour
+
   usage '*<word>'
   help <<EOF
 lists the contents of the track queue
@@ -24,6 +27,6 @@ EOF
 
   def show time, track
     return unless @terms.empty? or @terms.all? {|term| track.search_string.include? term }
-    puts time ? "#{time.to_s.foreground(:blue)}\n\t#{track}" : track
+    puts time ? "#{c time.strftime("%H:%M:%S %d/%m/%Y"), :blue} #{track}" : track
   end
 end

data/lib/hearken/command/recent.rb

@@ -1,13 +1,20 @@
 require 'hearken/command'
+require 'hearken/colour'
 
 class Hearken::Command::Recent
   include Hearken::Command
+  include Hearken::Colour
+
   usage '<count>'
   help 'lists the specified number of recently added albums'
   execute do |text|
     @player.library.reload unless @player.library.tracks
+    all_tracks = @player.library.tracks.sort do |a, b|
+      tc = a.timestamp <=> b.timestamp
+      tc == 0 ? a.id <=> b.id : tc
+    end
     maximum, current_album, tracks, total_count = text.to_i, nil, [], 0
-    @player.library.tracks.reverse.each do |track|
+    all_tracks.reverse.each do |track|
       unless current_album
         current_album = track.album
         tracks = [track]
@@ -16,7 +23,7 @@ class Hearken::Command::Recent
       if current_album==track.album
         tracks << track
       else
-        puts "#{current_album} - #{extract_artist tracks} - #{tracks.size} tracks (#{tracks.last.search_id}-#{tracks.first.search_id})"
+        puts "#{c extract_artist(tracks), :yellow} #{c current_album, :cyan} #{tracks.size} tracks [#{tracks.last.search_id}-#{tracks.first.search_id}]"
         current_album = track.album
         tracks = [track]
         total_count += 1

data/lib/hearken/library.rb

@@ -38,10 +38,6 @@ class Hearken::Library
         @tracks << track
         id += 1
       end
-      @tracks.sort! do |a, b|
-        tc = a.timestamp <=> b.timestamp
-        tc == 0 ? a.id <=> b.id : tc
-      end
     end if File.exist? index_path
   end
 end

data/lib/hearken/player.rb

@@ -5,10 +5,12 @@ require 'hearken/queue'
 require 'hearken/scrobbler'
 require 'hearken/notification/growl_notifier'
 require 'hearken/library'
+require 'hearken/colour'
 
 module Hearken
   class Player
     include Queue
+    include Colour
     attr_reader :library, :scrobbler
 
     def initialize preferences
@@ -21,16 +23,12 @@ module Hearken
       create_paths
     end
 
-    def c text,colour
-      text.to_s.foreground colour
-    end
-
     def status
       if @pid
         track = self.current
-        puts "Since #{c Time.at(track.started), :cyan}\n\t#{track}"
         played = Time.now.to_i-track.started
-        puts "#{c played, :yellow} seconds (#{c track.time.to_i-played, :yellow} remaining)" if track.time
+        timing = "(#{c track.time.to_i-played, :yellow} remaining)" if track.time
+        puts "#{c Time.at(track.started).strftime("%H:%M:%S %d/%m/%Y"), :blue}: #{track} #{timing}"
       else
         puts 'not playing'.foreground(:yellow)
       end

data/lib/hearken/track.rb

@@ -26,7 +26,7 @@ class Hearken::Track
   end
 
   def to_s
-    "#{my(:search_id,:white)}: #{my(:artist, :yellow)} - #{my(:album,:cyan)} - #{my(:track,:magenta)} #{my(:title,:green)} (#{my(:time,:white)})"
+    "[#{my(:search_id,:white)}] #{my(:artist, :yellow)} #{my(:album,:cyan)} #{my(:track,:magenta)} #{my(:title,:green)} (#{my(:time,:white)})"
   end
 
   def to_short_s

metadata

@@ -2,7 +2,7 @@
 name: hearken
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mark Ryall
@@ -128,6 +128,7 @@ files:
 - hearken.gemspec
 - lib/hearken.rb
 - lib/hearken/cli.rb
+- lib/hearken/colour.rb
 - lib/hearken/command.rb
 - lib/hearken/command/enqueue.rb
 - lib/hearken/command/flush.rb