vkpd 1.3.1 → 1.3.2

data/lib/vkpd/cli.rb

@@ -10,6 +10,7 @@ module Vkpd
       do_play = true
       params["auto_complete"] = '1'
       player = :mpd
+      random = false
   
       if ARGV.empty?
         ARGV.push "-h"
@@ -24,6 +25,8 @@ module Vkpd
           exit 0
         when '-v', '--verbose'
           @verbose = true
+        when '-r', '--random'
+          random = true
         when '-p', '--mplayer'
           player = :mplayer
         when '-c', '--count', /^--count=\d+$/
@@ -65,13 +68,16 @@ module Vkpd
           ARGV.clear
         end
       end
-  
+
       params["access_token"]=Vkpd::config["access_token"]
-      
+
       response = make_vk_request(method,params)
       if method.match /search/
         response.shift
       end
+
+      response = response.shuffle if random
+
       case player
       when :mpd
         mpd.clear if do_clear
@@ -81,9 +87,20 @@ module Vkpd
         end
         mpd.play if do_play
       when :mplayer
-        response.each do |song|
-          puts song if @verbose
-          system "mplayer --cache=8192 --cache-min=2 #{song['url']}"
+        catch :stop do
+          response.each do |song|
+            ap song
+            system "mplayer --cache=8192 --cache-min=2 #{song['url']}"
+            begin
+              Timeout::timeout 0.25 do
+                case key = STDIN.getch
+                when 'q' then throw :stop
+                end
+              end
+            rescue Timeout::Error
+              # do nothing
+            end
+          end
         end
       end
     end

data/lib/vkpd/version.rb

@@ -1,3 +1,3 @@
 module Vkpd
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/lib/vkpd.rb

@@ -2,6 +2,8 @@
 require 'net/http'
 require 'net/https'
 require 'cgi'
+require 'ap'
+require 'io/console'
 require 'yaml'
 require 'json'
 require 'pathname'

data/vkpd.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "launchy"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "awesome_print"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vkpd
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: VKPD searches for music files on russian social network vk.com and adds/plays
   it with MPD.
 email: