rumu 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce3ca00e1302fb06489bdc6cc1bdba2b7ae0b63e7f708cda2bd5f44b703ac7b
-  data.tar.gz: 3863590d73009b330208e26393785958221e8c0bbb278fa69b5c4a98141949d1
+  metadata.gz: d06d25705c6b4da13ff00b1825e53739188fd5e2412c3135d0ce4a6586d4a7cb
+  data.tar.gz: 31c076843b5894506d1e706277309933ed13e2e70f9c9170225f5ddec58269ba
 SHA512:
-  metadata.gz: 9f0cf8ec4200de7b176b1fd1d94f64ecc8ef5ee013e5f1ad05d44770b41637e7ca1eb8339a05621541d2089c2fb7a1dc0e06ab327947c020c0d09f73f0828e72
-  data.tar.gz: b9d3550542d9854ec5ac8cbe003fb2c75c617a10152025ad1bed3c04fc8866cd3a131dd3c3b6763e7a106a3f829a77fcdbc3143d470b7ff9a38bda776dd6deda
+  metadata.gz: fdcda38fa11055f5edea07c3bb83dad0a518ba6c97add5f281413b650451ed84c73e1354ed48248ab0d6a2837649a16aa94892b0a7b80d4da342a4ec183a8cc2
+  data.tar.gz: 6345879a1a65267e661cd755d1241d40c1f8ef297a6e8505ec675d14847cb3ab72ac761c1cb232487225bf2500f8ccfd93555b60fe0c11b6cdea45cf8761c6ca

data/bin/rumu

@@ -5,22 +5,17 @@ require 'io/console'
 require 'pathname'
 
 pkg='rumu'
-ver='0.3'
+ver='0.3.5'
 pkgd="#{Dir.home}/.config/#{pkg}"
 
-word=4
-rate=44100
-chan=2
-cycle=0
-
-ff_exe="ffmpeg -hide_banner"
+chan,rate,word=2,44100,4
 ff_fmt="-ac #{chan} -ar #{rate} -f f#{word*8}le"
-ff_out="-f pulse default"
 
-list=[]
-list_i=0
-mode=:load
-toff=''
+Dir.mkdir(pkgd) unless File.directory?(pkgd)
+File.write(pkgd+"/dev","-f pulse default") unless File.file?("#{pkgd}/dev")
+ff_out=File.read(pkgd+"/dev")
+
+list,list_i,cycle,mode,ssoff,help=[],0,0,:load,'',''
 if ARGV.length==0
   if File.file?("#{pkgd}/list")
     list=File.read("#{pkgd}/list").split("\n")
@@ -39,10 +34,11 @@ else
   list=ARGV.map{|x|Pathname(x).realpath.to_s}
 end
 prefix=/\A(.*).*(\n\1.*)*\Z/.match(list.join("\n"))[1]
+puts prefix
 
 ii,io,ie,it=nil,nil,nil,nil
-oi,oo,oe,ot=Open3.popen3("#{ff_exe} #{ff_fmt} -i - #{ff_out}")
-[oo,oe].each{|x|x.close}
+oi,oo,oe,ot=Open3.popen3("ffmpeg -loglevel -8 #{ff_fmt} -i - #{ff_out}")
+oo.close
 
 pt=Thread.new{
   until :quit == mode
@@ -52,42 +48,51 @@ pt=Thread.new{
     end
     case mode
     when :load #load new track
-      io.close unless !io or io.closed?
-      ii,io,ie,it = Open3.popen3 "#{ff_exe} -i #{Shellwords.escape(list[list_i])} #{ssoff} #{ff_fmt} -"
-      [ii,ie].each{|x|x.close}
+      [io,ie].each{|x|x.close} unless !io or io.closed?
+      ii,io,ie,it = Open3.popen3 "ffmpeg -loglevel -8 -i #{Shellwords.escape(list[list_i])} #{ssoff} #{ff_fmt} -"
+      ii.close
       cycle=0 unless ssoff.length > 0
-      puts
+      puts "#{' '*help.length}\r#{list[list_i][prefix.length..-1]}"
+      ssoff=''
+      help=''
       mode=:play
     when :play
       oi.write(io.read(word*chan*rate))
       cycle+=1
     end
   end
+  [oi,oe].each{|x|x.close}
 }
 
 until :quit == mode
-  print "\r#{list[list_i][prefix.length..-1]} [#{cycle/60}:#{"%02d"%(cycle%60)}] [N]ext #{list_i>0?"[P]rev ":""}[Q]uit > "
-  case IO.console.raw{|c|c.read_nonblock(1) rescue ''}
+  print "\r#{cycle/60}:#{"%02d"%(cycle%60)} > "
+  case ch=IO.console.raw{|c|c.read_nonblock(1) rescue ''}.downcase
   when 'n'
     list_i+=1
     mode= list_i<list.count ? :load : :quit
+  when 'r'
+    mode=:load
   when 'p'
     if list_i>0
       list_i-=1
       mode=:load
     end 
+  when 's'
+    print "Seek to: "
+    ti=(ts=IO.console.readline.chomp).split(':')
+    ssoff="-ss #{ts}"
+    cycle=(ti[-1].to_f + ti[-2].to_f*60 + ti[-3].to_f*60*60).to_i
+    mode=:load
   when 'q'
     mode=:quit
-  else
+    File.write(pkgd+"/list",list.join("\n"))
+    File.write(pkgd+"/pos",list_i.to_s+"\n"+cycle.to_s)
+  when ''
     sleep rand
+  else
+    print (help="#{ch} < #{list_i>0?"[P]rev ":""}[R]estart [S]eek [N]ext [Q]uit")
   end
 end
 
-if list_i<list.count
-  Dir.mkdir(pkgd) unless File.directory?(pkgd)
-  File.write(pkgd+"/list",list.join("\n"))
-  File.write(pkgd+"/pos",list_i.to_s+"\n"+cycle.to_s)
-end
-
-puts "        ]  #{pkg} ✝ v#{ver}  [        "
+puts "\r    ]  #{pkg} ✝ v#{ver}  [    "
 pt.join

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rumu
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Benjamin Cook
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies: []
-description: rum is an aggressively minimized audio player that plays a playlist gaplessly
-  leveraging command-line ffmpeg and pipes. After a quit, it will return to where
-  it left off when run next.
+description: rumu is an aggressively minimized audio player that plays a playlist
+  gaplessly leveraging command-line ffmpeg and pipes. After a quit, it will return
+  to where it left off when run next.
 email: root@baryon.it
 executables:
 - rumu