vkpd 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56320686f21b1c1cd391dfca5c9797fedf34a6d9
-  data.tar.gz: dfae90e3d340d7f7491ccda89061c7d10b60afd0
+  metadata.gz: 9f0172230df5bc278a55b6381daeba78174cddd6
+  data.tar.gz: e075f4be0f23dd55099f70df865ccefd535e8bb0
 SHA512:
-  metadata.gz: 3629d7c611799054c2d2663b31df0ee92251b31946fd0d4c933b0cfab784228e195faeebd00ed65e6f7eb8dda85b59b2bb730b0a402549c293e77a0e68a7935f
-  data.tar.gz: 4cd9854ec60de5bc842c1dc5f6ed3dce18df80ec1539533678d15b5435f7affb5f08b3e11ce5b8e0c29061cd89b2d0fee66fe5dc5a420c51e58d49417e74d140
+  metadata.gz: 31cec65e08e73c75a11d304cd2712668e97a76f24be1df3f54c925128eef2449c67b7fe43deaffcdb768aa3584e905bd07484a811f06722a91a50184dfa1ae00
+  data.tar.gz: 2413965094bf9397bdad20c0117818b7de9ed2e4f64accc95aa20f5e4157920164753da07d95b6d7ffee4663a31a7fb1e5b92a45c09e22bcc63e930a21d6a9c3

data/lib/vkpd.rb

@@ -7,6 +7,7 @@ require 'io/console'
 require 'yaml'
 require 'json'
 require 'pathname'
+require 'tempfile'
 require 'sinatra/base'
 require 'launchy'
 require 'ruby-mpd'

data/lib/vkpd/cli.rb

@@ -9,7 +9,7 @@ module Vkpd
       do_clear = true
       do_play = true
       params["auto_complete"] = '1'
-      player = ENV['VKPD_PLAYER'].to_sym || :mpd
+      player = ENV['VKPD_PLAYER'] || 'mpd'
       random = false
   
       if ARGV.empty?
@@ -29,7 +29,6 @@ module Vkpd
           random = true
         when '-p', '--player', /^--player=\w+$/
           player = current.include?("=") ? current.match(/=(.*)/)[1] : ARGV.shift
-          player = player.to_sym
         when '-c', '--count', /^--count=\d+$/
           value = current.include?("=") ? current.match(/=(.*)/)[1] : ARGV.shift
           params["count"]  = value
@@ -80,29 +79,17 @@ module Vkpd
       response = response.shuffle if random
 
       case player
-      when :mpd
+      when 'mpd'
         mpd.clear if do_clear
         response.each do |song|
           puts song if @verbose
           mpd.add song["url"]
         end
         mpd.play if do_play
-      when :mplayer, :mpv
-        catch :stop do
-          response.each do |song|
-            ap song
-            system "#{player} -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
+      when 'mplayer', 'mpv'
+        with_playlist(response){|pls| system "#{player} -cache 8192 -cache-min 2 -playlist #{pls}" }
+      else # e.g. "vlc -I ncurses"
+        with_playlist(response){|pls| system "#{player} #{pls}" }
       end
     end
 
@@ -133,5 +120,23 @@ module Vkpd
       data["response"]
     end
 
+    def with_playlist(response)
+      file = Tempfile.new(['vkpd','.pls'])
+      write_playlist(file, response)
+      file.close
+      yield file.path
+    ensure
+      file.unlink
+    end
+
+    def write_playlist(f, response)
+      f.puts '[playlist]'
+      f.puts "NumberOfEntries=#{response.size}"
+      response.each_with_index do |song,i|
+        f.puts "File#{i+1}=#{song['url']}"
+        f.puts "Title#{i+1}=#{song['artist']} - #{song['title']}"
+        f.puts "Length#{i+1}=#{song['duration']}"
+      end
+    end
   end
 end

data/lib/vkpd/version.rb

@@ -1,3 +1,3 @@
 module Vkpd
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vkpd
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Ales Guzik