quiyo 0.1.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/bin/quiyo

@@ -11,19 +11,67 @@ print "               __
        \\/_/             \\/__/  is starting. Have patience, fool!
 "
 
-unless File.exists?("#{ENV["HOME"]}/.config/quiyo")
-  p "Generating configuration"
-  Dir.mkdir("#{ENV["HOME"]}/.config/quiyo")
-  File.open("#{ENV["HOME"]}/.config/quiyo/config.yml", "w") { |f| f.write("
+config_path = (ENV["XDG_CONFIG_HOME"] == NIL ? ENV["HOME"] + "/.config" : ENV["XDG_CONFIG_HOME"]) + "/quiyo"
+
+unless File.exists?("#{config_path}/config.yml")
+	p "Generating configuration"
+	Dir.mkdir(config_path)
+	File.open("#{config_path}/config.yml", "w") { |f| f.write("
 server:       localhost
 port:         6600
 mpd_user:     #{ENV["USER"]}
 
 music_path:   #{ENV["HOME"]}/Music
-database:     #{ENV["HOME"]}/.config/quiyo/database.db") }
-  p "Sample configuration can be found at #{ENV["HOME"]}/.config/quiyo"
-  p "Edit the configuration, and re-run Quiyo"
-  abort
+database:     #{config_path}/database.db
+
+#
+# Colors:
+# %<color number (0-255)> - start color
+# %n - stop color
+#
+# Placeholders:
+# $state - Current state (play/pause/stop)
+# $flags - Status flags (as in ncmpc: z = random, x = crossfade, r = repeat)
+#
+# Everything else is printed verbatim
+#
+
+prompt:         %4$state%n(%7$flags%n) %2>>>%n
+
+separator:      ----~---~-~---------~~------~-
+
+colors:
+  artist:       4
+  title:        1
+  album:        2
+  year:         7
+  separator:    238
+  info_key:     99
+  info_value:   185
+  error:        196 
+  smiley_frown: 202
+
+aliases:
+  np:           nowplaying
+  stats:        info
+  pl:           play(action[1])
+  pa:           pause
+  st:           stop
+  nx:           playnext
+  prev:         playprevious
+  lspl:         lsplist
+  clear:        clearplist
+  add:          addtoplist(action)
+  del:          removefromplist(action[1])
+  lsartists:    list('artists')
+  lsalbums:     list('albums', action)
+  loves:        loved
+  vol:          vol(action[1])
+  exit:         quit
+  v:            action.drop(1).join(' ')" }
+	p "Sample configuration can be found at #{config_path}"
+	p "Edit the configuration, and re-run Quiyo"
+	abort
 end
 
 require "quiyo"

data/lib/quiyo/colors.rb

@@ -1,9 +1,18 @@
-module Colors
-  def colorize(text, color_code)
-    "\001\e[38;5;#{color_code}m\002#{text}\001\e[0m\002"
-  end
-end
-
 class Quiyo
-  include Colors
+	module Colors
+		def colorize(text, color_code)
+			"\001\e[38;5;#{color_code}m\002#{text}\001\e[0m\002"
+		end
+
+		def printsonglist(song)
+			print "[%s] %s : %s [%s]\n" % [
+			                               song["pos"],
+			                               colorize(song["artist"], CONF["colors"]["artist"]),
+			                               colorize(song["title"], CONF["colors"]["title"]),
+			                               colorize(song["album"], CONF["colors"]["album"])
+			                              ]
+		end
+
+	end
+	include Colors
 end

data/lib/quiyo/core.rb

@@ -1,59 +1,55 @@
-module Core
-  def showprompt
-    Readline.completion_append_character = " "
-    Readline.completion_proc = Proc.new { |str|
-      Dir[PATH+str+'*'].grep( /^#{Regexp.escape(str)}/ )
-    }
-
-    def readline_hist
-      line = Readline.readline(prompt, true)
-      return nil if line.nil?
-      if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
-        Readline::HISTORY.pop
-      end
-      line
-    end
-
-    while line = readline_hist
-      @mpd.connect unless @mpd.connected?
-      action = line.split
-      case action[0]
-        when "np", "now-playing";           nowplaying
-        when "info", "stats";               info
-
-        when "pl", "play";                  play(action[1])
-        when "pa", "pause";                 pause
-        when "st", "stop";                  stop
-        when "nx", "next";                  playnext
-        when "prev", "previous";            playprevious
-
-        when "lspl", "lsplaylist";          lsplist
-        when "clear", "clearplaylist";      clearplist
-        when "add", "addtoplaylist";        addtoplist(action)
-
-        when "search";                      search(action)
-        when "lsartists", "list-artists";   list("artists")
-        when "lsalbums", "list-albums";     list("albums", action)
-
-        when "love";                        love
-        when "loved", "loves";              loved
-
-        when "vol", "volume";               vol(action[1])
-
-        when "quit", "exit";                quit
-
-        when "v", "verbose";                eval(action.drop(1).join(" "))
-
-        else;                               help
-      end
-    end
-  end
-
-  def help
-    p "Some help text here"
-  end
-end
-
 class Quiyo
-  include Core
+	module Core
+		def readline_hist
+			line = Readline.readline(prompt, true)
+			return nil if line.nil?
+			if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
+				Readline::HISTORY.pop
+			end
+			line
+		end
+
+		def showprompt
+			Readline.completion_append_character = " "
+			Readline.completion_proc = Proc.new { |str|
+				Dir[PATH+str+'*'].grep( /^#{Regexp.escape(str)}/ )
+			}
+
+			while line = self.readline_hist
+				@mpd.connect unless @mpd.connected?
+				action = line.split
+				actions = {
+					"np"              => lambda { nowplaying() },
+					"info"            => lambda { info },
+					"play"            => lambda { play(action[1]) },
+					"pause"           => lambda { pause },
+					"stop"            => lambda { stop },
+					"next"            => lambda { playnext },
+					"previous"        => lambda { playprevious },
+					"lsplaylist"      => lambda { lsplist },
+					"clearplaylist"   => lambda { clearplist },
+					"addtoplaylist"   => lambda { addtoplist(action) },
+					"delfromplaylist" => lambda { removefromplist(action[1]) },
+					"search"          => lambda { search(action) },
+					"list-artists"    => lambda { list("artists") },
+					"list-albums"     => lambda { list("albums", action) },
+					"love"            => lambda { love },
+					"loved"           => lambda { loved },
+					"volume"          => lambda { vol(action[1]) },
+					"quit"            => lambda { quit },
+					"verbose"         => lambda { eval(action.drop(1).join(" ")) }
+				}
+
+				CONF["aliases"].each { |k,v| actions[k] = lambda { eval(v) } }
+
+				actions[action[0]].call
+
+			end
+		end
+
+		def help
+			p "Some help text here"
+		end
+	end
+	include Core
 end

data/lib/quiyo/database.rb

@@ -1,40 +1,39 @@
-module Database
-  DataMapper.setup(:default, "sqlite3://" + CONF["database"])
-
-  class Love # {{{
-    include DataMapper::Resource
+class Quiyo
+	module Database
+		DataMapper.setup(:default, "sqlite3://" + CONF["database"])
 
-    property :id,       Serial
-    property :song,     String
-    property :loved_at, Time
-  end # }}}
+		class Love
+			include DataMapper::Resource
 
-  def love
-    @love = Love.create(
-      :song     => @mpd.current_song["file"],
-      :loved_at => Time.now
-    )
-  end
+			property :id,       Serial
+			property :song,     String
+			property :loved_at, Time
+		end
 
-  def loved
-    Love.each { |s|
-      song = @mpd.songs(s.song).first
-      printf "[%s] %s : %s [%s]\n" % [
-        s.id,
-        colorize(song["artist"], 99),
-        colorize(song["title"], 202),
-        colorize(song["album"], 107)
-      ]
-    }
-  end
+		def love
+			@love = Love.create(
+			                    :song     => @mpd.current_song["file"],
+			                    :loved_at => Time.now
+			                    )
+		end
 
-  if(!File.exists?(CONF["database"]))
-    DataMapper.auto_migrate!
-  else
-    DataMapper.auto_upgrade!
-  end
-end
+		def loved
+			Love.each { |s|
+				song = @mpd.songs(s.song).first
+				printf "[%s] %s : %s [%s]\n" % [
+				                                s.id,
+				                                colorize(song["artist"], CONF["colors"]["artist"]),
+				                                colorize(song["title"],  CONF["colors"]["title"]),
+				                                colorize(song["album"],  CONF["colors"]["album"])
+				                               ]
+			}
+		end
 
-class Quiyo
-  include Database
+		if(!File.exists?(CONF["database"]))
+			DataMapper.auto_migrate!
+		else
+			DataMapper.auto_upgrade!
+		end
+	end
+	include Database
 end

data/lib/quiyo/playback.rb

@@ -1,14 +1,13 @@
-module Playback
-  def play(arg = nil);  @mpd.play(arg);     nowplaying; end
-  def playnext;         @mpd.next;          nowplaying; end
-  def playprevious;     @mpd.previous;      nowplaying; end
-  def stop;             @mpd.stop;          nowplaying; end
-  def pause
-    @mpd.paused? ? @mpd.pause=(false) : @mpd.pause=(true)
-    nowplaying
-  end
-end
-
 class Quiyo
-  include Playback
+	module Playback
+		def play(arg = nil);  @mpd.play(arg);     nowplaying; end
+		def playnext;         @mpd.next;          nowplaying; end
+		def playprevious;     @mpd.previous;      nowplaying; end
+		def stop;             @mpd.stop;          nowplaying; end
+		def pause
+			@mpd.paused? ? @mpd.pause=(false) : @mpd.pause=(true)
+			nowplaying
+		end
+	end
+	include Playback
 end

data/lib/quiyo/playlist.rb

@@ -1,28 +1,25 @@
-module Playlist
-  def lsplist
-    @mpd.playlist.each { |s|
-      printf "[%s] %s : %s [%s]\n" % [
-        s.pos,
-        colorize(s.artist, 99),
-        colorize(s.title, 202),
-        colorize(s.album, 107)
-      ]
-    }
-  end
+class Quiyo
+	module Playlist
+		def lsplist
+			@mpd.playlist.each { |s| printsonglist(s) }
+		end
 
-  def clearplist
-    @mpd.clear
-  end
+		def clearplist
+			@mpd.clear
+		end
 
-  def addtoplist(action)
-    @mpd.search(action[1], action.drop(2).join(" ")).each { |s|
-      @mpd.add(s.file)
-    }
-  rescue
-    puts "Usage: addtoplaylist searchstring"
-  end
-end
+		def addtoplist(action)
+			@mpd.search(action[1], action.drop(2).join(" ")).each { |s|
+				@mpd.add(s.file)
+			}
+		rescue
+			puts "Usage: addtoplaylist searchstring"
+		end
 
-class Quiyo
-  include Playlist
+		def removefromplist(id)
+			@mpd.delete(id)
+		end
+
+	end
+	include Playlist
 end

data/lib/quiyo/server.rb

@@ -1,45 +1,43 @@
-module Server
-  def quit
-    @mpd.disconnect
-    Process.exit
-  end
+class Quiyo
 
-  def vol(arg)
-    @mpd.volume=(arg)
-  rescue
-    p "Usage: vol [0-100]"
-  end
+	def initialize(server, port, version)
+		print colorize("++", 197) + " Connecting to MPD at #{server}:#{port}..."
+		@mpd = MPD.new server, port
+		@mpd.connect
+		print colorize("Connected!\n", 70)
+		print colorize("++", 197) + " This is quiyo #{version}\n\n"
+	end
 
-  def search(action)
-    @mpd.search(action[1], action.drop(2).join(" ")).each { |s|
-      printf "%s : %s [%s]\n" % [
-        yellow(s.artist),
-        blue(s.title),
-        green(s.album)
-      ]
-    }
-  rescue
-    p "Usage: search [artist|title|album] name"
-  end
+	module Server
+		def quit
+			@mpd.disconnect
+			Process.exit
+		end
 
-  def list(type, arg = nil)
-    case type
-      when "artists"
-        @mpd.artists.each { |s| p s }
-      when "albums"
-        @mpd.albums(arg.drop(1).join(" ")).each { |s| p s }
-    end
-  end
-end
+		def vol(arg)
+			@mpd.volume=(arg)
+		rescue
+			p "Usage: vol [0-100]"
+		end
 
-class Quiyo
-  include Server
+		def search(action)
+			@mpd.search(action[1], action.drop(2).join(" ")).each { |s|
+				printf "%s : %s [%s]\n" % [
+				                           colorize(s.artist, 99),
+				                           colorize(s.title, 202),
+				                           colorize(s.album, 107)
+				                          ]
+			}
+		end
 
-  def initialize(server, port, version)
-    print colorize("++", 197) + " Connecting to MPD at #{server}:#{port}..."
-    @mpd = MPD.new server, port
-    @mpd.connect
-    print colorize("Connected!\n", 70)
-    print colorize("++", 197) + " This is quiyo #{version}\n\n"
-  end
+		def list(type, arg = nil)
+			case type
+			when "artists"
+				@mpd.artists.each { |s| p s }
+			when "albums"
+				@mpd.albums(arg.drop(1).join(" ")).each { |s| p s }
+			end
+		end
+	end
+	include Server
 end

data/lib/quiyo/status.rb

@@ -1,77 +1,81 @@
-module Status
-  def nowplaying
-    song = @mpd.current_song
-    puts colorize(song["title"], 202) +
-      " by " +
-      colorize(song["artist"], 99) +
-      " on " +
-      colorize(song["album"], 107) +
-      " [" + colorize(song["date"], 213) + "]"
-  rescue
-    puts "#{colorize("Nothing", 196)} playing right now #{colorize(":(", 229)}"
-  end
-
-  def info
-    def _print(key, value)
-      print "%-20s %s\n" % [ colorize(key.capitalize + ":", 99), colorize(value, 202) ]
-    end
+class Quiyo
+	module Status
+		def nowplaying
+			song = @mpd.current_song
+			print "%s by %s on %s [%s]\n" % [
+			                                 colorize(song["title"],  CONF["colors"]["title"]),
+			                                 colorize(song["artist"], CONF["colors"]["artist"]),
+			                                 colorize(song["album"],  CONF["colors"]["album"]),
+			                                 colorize(song["date"],   CONF["colors"]["year"])
+			                                ]
+		rescue
+			print "%s playing right now, stoopid %s\n" % [
+			                                              colorize("Nothing", CONF["colors"]["error"]),
+			                                              colorize(":(",      CONF["colors"]["smiley_frown"])
+			                                             ]
+		end
 
-    sep = "----~---~-~---------~~------~-"
+		def info
+			def _print(key, value)
+				print "%-20s %s\n" % [
+				                      colorize(key.capitalize + ":", CONF["colors"]["info_key"]),
+				                      colorize(value,                CONF["colors"]["info_value"])
+				                     ]
+			end
 
-    s = @mpd.status
-    sid = @mpd.song_with_id(s[:songid])
+			s = @mpd.status
+			sid = @mpd.song_with_id(s[:songid])
 
-    # Get current song
-    %w{artist title album date file}.each { |k|
-      _print(k, sid[k])
-    }
-    _print "DURATION", time(sid["time"])
-    puts sep
+			# Get current song
+			%w{artist title album date file}.each { |k|
+				_print(k, sid[k])
+			}
+			_print "DURATION", time(sid["time"])
+			print colorize(CONF["separator"], CONF["colors"]["separator"]), "\n"
 
-    # Get MPD Status
-    %w{volume repeat random playlistlength xfade}.each { |k|
-      _print(k, s[k])
-    }
-    puts sep
+			# Get MPD Status
+			%w{volume repeat random playlistlength xfade}.each { |k|
+				_print(k, s[k])
+			}
+			print colorize(CONF["separator"], CONF["colors"]["separator"]), "\n"
 
-    s = @mpd.stats
+			s = @mpd.stats
 
-    # Get MPD Stats
-    %w{artists albums songs}.each { |k| 
-      _print(k, s[k])
-    }
-    puts sep
+			# Get MPD Stats
+			%w{artists albums songs}.each { |k| 
+				_print(k, s[k])
+			}
+			print colorize(CONF["separator"], CONF["colors"]["separator"]), "\n"
 
-    # Get MPD Times
-    %w{uptime playtime db_playtime}.each { |k,v|
-      _print(k, time(s[k]))
-    }
-  end
+			# Get MPD Times
+			%w{uptime playtime db_playtime}.each { |k,v|
+				_print(k, time(s[k]))
+			}
+		end
 
-  def time(sec)
-    string = ""
-    time = sec.to_i
-    days = (time/86400)
-    hours = (time/3600 - days * 24)
-    minutes = (time/60 - (hours * 60 + days * 1440))
-    seconds = (time - (minutes * 60 + hours * 3600 + days * 86400))
-    { "d" => days, "h" => hours, "m" => minutes, "s" => seconds}.each { |k,v|
-      string += "%02d%s " % [v, k] if v > 0
-    }
-    return string
-  end
+		def time(sec)
+			string = ""
+			time = sec.to_i
+			days = (time/86400)
+			hours = (time/3600 - days * 24)
+			minutes = (time/60 - (hours * 60 + days * 1440))
+			seconds = (time - (minutes * 60 + hours * 3600 + days * 86400))
+			{ "d" => days, "h" => hours, "m" => minutes, "s" => seconds}.each { |k,v|
+				string += "%02d%s " % [v, k] if v > 0
+			}
+			return string
+		end
 
-  def prompt
-    return "%s(%s%s%s) %s " % [
-      colorize(@mpd.status["state"], 67),
-      colorize(@mpd.status["repeat"] == "1" ? "r" : "", 107),
-      colorize(@mpd.status["random"] == "1" ? "z" : "", 107),
-      colorize(@mpd.status["xfade"] != "0" ? "x" : "", 107),
-      colorize(">>>", 142)
-    ]
-  end
-end
-
-class Quiyo
-  include Status
+		def prompt
+			return CONF["prompt"]
+				.gsub(/%(\d+)/, "\001\e[38;5;\\1m\002")
+				.gsub("%n", "\001\e[0m\002")
+				.gsub("$state", @mpd.status["state"])
+				.gsub("$flags",
+				      (@mpd.status["repeat"] == "1" ? "r" : "") +
+				      (@mpd.status["random"] == "1" ? "z" : "") +
+				      (@mpd.status["xfade"] != "0" ? "x" : "")) + " "
+		end
+	end
+	include Status
 end

data/lib/quiyo.rb

@@ -14,17 +14,7 @@
 ].each { |m| require m }
 
 # ...and this...
-config_paths = [ ENV["XDG_CONFIG_HOME"] ]
-ENV["XDG_CONFIG_DIRS"].split(":").each { |d|
-  config_paths << d
-}
-
-config_paths.each { |p|
-  if File.exists?("#{p}/quiyo/config.yml")
-    CONF = YAML.load_file "#{p}/quiyo/config.yml"
-    break
-  end
-}
+CONF = YAML.load_file (ENV["XDG_CONFIG_HOME"] == NIL ? ENV["HOME"] + "/.config" : ENV["XDG_CONFIG_HOME"]) + "/quiyo/config.yml"
 
 # ...and this, too!
 %w[

data/quiyo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quiyo}
-  s.version = "0.1.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["crshd"]
-  s.date = %q{2011-07-19}
+  s.date = %q{2011-09-20}
   s.default_executable = %q{quiyo}
   s.description = %q{Inspired by pimpd2}
   s.email = %q{crshd@mail.com}
@@ -34,9 +34,7 @@ Gem::Specification.new do |s|
     "lib/quiyo/playlist.rb",
     "lib/quiyo/server.rb",
     "lib/quiyo/status.rb",
-    "quiyo.gemspec",
-    "test/helper.rb",
-    "test/test_quiyo.rb"
+    "quiyo.gemspec"
   ]
   s.homepage = %q{http://github.com/crshd/quiyo}
   s.licenses = ["MIT"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - crshd
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +08:00
+date: 2011-09-20 00:00:00 +00:00
 default_executable: quiyo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,8 +125,6 @@ files:
 - lib/quiyo/server.rb
 - lib/quiyo/status.rb
 - quiyo.gemspec
-- test/helper.rb
-- test/test_quiyo.rb
 has_rdoc: true
 homepage: http://github.com/crshd/quiyo
 licenses: 
@@ -141,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1485489352837026096
+      hash: 1102096542118000620
       segments: 
       - 0
       version: "0"

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'quiyo'
-
-class Test::Unit::TestCase
-end

data/test/test_quiyo.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestQuiyo < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end