vlcraptor 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d27be7a5541a19d3e2f69cf98ee1506b8b65560deffa547c9e621f860977b9
-  data.tar.gz: af56137e7d23b949a5ba94453f9d3bb4e0c45020722b3d0456393b7c7bfed4b5
+  metadata.gz: e68bc937ca2016f17771ea0b7db19729f0b91eb3a7cd94e8dae305e5d5feff9b
+  data.tar.gz: 3197d9195b81187bf3109e99440c61c906e5007095da0466098a15ad8d3b5fed
 SHA512:
-  metadata.gz: 03d0920671d6dfa40dd866c70a915fe7ac6c13a5d84dd0507cdaa6104d0fc2352b2d4b4ab6af10957b7b3ad078f673a2ceda91552134c0b32172186fcafcb75d
-  data.tar.gz: 8519f300d25106c8138cf4921c03f2394191f28f853220203b09079d39d9f972cf40331f6e30a2a9f8549028014a9d1542f6c1b841fef9a1f772fffa1d86c910
+  metadata.gz: b64e6b465e12a323b47ef33cbc3132f0f3256cb7c87f2b56c514f70bb8254f901f8e4e581b5873d1d0d328fc5ddfa589a0c4c585e75ee45315356856fcab6d86
+  data.tar.gz: 7b32b59ca121f4e35a10cacf7766dcb5c6e76a1cf0f47f0522e91425d476645d24f415943b864aee295534f579285903ad53ab47ae0cfeeb60adeb50d659c637

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vlcraptor (0.4.0)
+    vlcraptor (0.5.0)
       curses
       rainbow
       vlc-client

data/lib/vlcraptor/player_controller.rb

@@ -17,11 +17,11 @@ module Vlcraptor
     end
 
     def next
-      return on_pause if @preferences.pause?
-      return on_stop if @preferences.stop?
-      return on_play if @preferences.play?
-      return on_suspended if @suspended
-      return when_playing if @player.playing?
+      return on_play if @preferences.play? && @suspended
+      return on_pause if @preferences.pause? && !@suspended
+      return on_stop if @preferences.stop? && !@suspended
+      return build if @suspended
+      return when_playing if @track && @player.playing?
       return when_auto if @preferences.continue?
 
       when_manual
@@ -36,32 +36,24 @@ module Vlcraptor
     private
 
     def on_pause
-      when_suspended("Now Paused", :pause)
+      suspend("Now Paused", :pause)
     end
 
     def on_stop
-      when_suspended("Now Stopped", :stop)
+      suspend("Now Stopped", :stop)
     end
 
-    def when_suspended(status, method)
-      if @player.playing?
-        @player.fadeout
-        @player.send(method)
-      end
+    def suspend(status, method)
+      @player.fadeout
+      @player.send(method)
       @status = status
       @suspended = true
       @notifiers.track_suspended
-      on_suspended
-    end
-
-    def on_suspended
       build
     end
 
     def on_play
-      unless @player.playing?
-        @player.fadein
-      end
+      @player.fadein
       @suspended = false
       @notifiers.track_resumed(@track, @player.time)
       when_playing_track(@player.remaining)
@@ -115,12 +107,17 @@ module Vlcraptor
       remaining_color = remaining < 30 ? 9 : 5
       build(
         [2, @track[:title]],
-        [0, "by"],
+        [0, "\n"],
+        [0, "by "],
         [11, @track[:artist]],
-        [0, "from"],
+        [0, "\n"],
+        [0, "from "],
         [6, @track[:album]],
-        [0, "(#{duration(@track[:length])})"],
-        [remaining_color, "#{duration(remaining)} remaining"],
+        [0, "\n"],
+        [remaining_color, duration(remaining)],
+        [0, " of "],
+        [0, duration(@track[:length])],
+        [0, " remaining\n"],
       )
     end
 
@@ -152,9 +149,13 @@ module Vlcraptor
       scrobble = @preferences[:scrobble] ? "+" : "-"
       [
         [0, display_time(Time.now)],
+        [0, "\n"],
         [0, @status],
-        [0, "#{Vlcraptor::Queue.length} items in queue"],
+        [0, "\n"],
+        [0, "#{Vlcraptor::Queue.length} queued tracks"],
+        [0, "\n"],
         [8, "#{autoplay}autoplay #{crossfade}crossfade #{scrobble}scrobble"],
+        [0, "\n"],
       ] + extra
     end
   end

data/lib/vlcraptor/queue.rb

@@ -65,15 +65,20 @@ module Vlcraptor
 
       puts "adding #{path}"
       tags = Vlcraptor::Ffmpeg.new(path)
-      meta = {
+      enqueue(
         title: tags.title,
         artist: tags.artist,
         album: tags.album,
         length: tags.time,
-        path: File.expand_path(path),
-      }
+        path: File.expand_path(path)
+      )
+    end
+
+    def self.enqueue(track)
       `mkdir -p /tmp/queue`
-      File.open("/tmp/queue/#{(Time.now.to_f * 1000).to_i}.yml", "w") { |f| f.puts meta.to_yaml }
+      File.open("/tmp/queue/#{(Time.now.to_f * 1000).to_i}.yml", "w") do |file|
+        file.puts track.to_yaml
+      end
     end
   end
 end

data/lib/vlcraptor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vlcraptor
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/vlcraptor.rb

@@ -23,7 +23,9 @@ module Vlcraptor
   end
 
   def self.history
-    system("cat #{File.expand_path("~")}/.player_history")
+    history_path = "#{File.expand_path("~")}/.player_history"
+    `touch #{history_path}`
+    system("cat #{history_path}")
   end
 
   def self.list
@@ -78,7 +80,6 @@ module Vlcraptor
       player_controller.next.each do |pair|
         window.attron(Curses.color_pair(pair.first)) { window << pair.last }
         Curses.clrtoeol
-        window << "\n"
       end
       (window.maxy - window.cury).times { window.deleteln }
       window.refresh
@@ -96,7 +97,7 @@ module Vlcraptor
         break
       end
 
-      sleep 0.1
+      sleep 0.2
     end
   ensure
     player_controller.cleanup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vlcraptor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mark Ryall
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses