vlcraptor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18dde28c420aa7dc5fb8c6860d6e8d27d1ccc33bcb58373bc75183fee76f95f8
-  data.tar.gz: e16ae43b48b13443efc10d48a3abaa78cfc7f787161f4b6865d99f257e4372ce
+  metadata.gz: 62d27be7a5541a19d3e2f69cf98ee1506b8b65560deffa547c9e621f860977b9
+  data.tar.gz: af56137e7d23b949a5ba94453f9d3bb4e0c45020722b3d0456393b7c7bfed4b5
 SHA512:
-  metadata.gz: 1058cbc603c80fbc5b19d105fc590e0a4b0b05baab659cbdb07fe3a03d5c4e409f02a9bebc367e2c76d46bbae88cdf0f8fe534357069d7dcbfd9e69fe554ef42
-  data.tar.gz: e4a699a72240b67fbf66c92893e8b62641425c0faa39625bb4e7ce7ebfd9460308571d3a36994188adeab450723ca2d2ebf925fe7cc4294b801864a751b7e704
+  metadata.gz: 03d0920671d6dfa40dd866c70a915fe7ac6c13a5d84dd0507cdaa6104d0fc2352b2d4b4ab6af10957b7b3ad078f673a2ceda91552134c0b32172186fcafcb75d
+  data.tar.gz: 8519f300d25106c8138cf4921c03f2394191f28f853220203b09079d39d9f972cf40331f6e30a2a9f8549028014a9d1542f6c1b841fef9a1f772fffa1d86c910

data/Gemfile.lock

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

data/README.md

@@ -37,11 +37,19 @@ You can quit with 'q', pause with ' ', stop with 's', play (resume) with 'p' and
 `vlcraptor queue folder_containing_audio_files audio_file.mp3` will place any number of audio files in the
 queue and the player should immediately start playing the first track.
 
-### Listing queue contents
+### Viewing queue contents
 
 `vlcraptor list` will list currently queued tracks with an estimated start time if the player is currently
 running and playing a track.
 
+### Managing queue
+
+`vlcraptor clear` will clear all queued tracks.
+
+`vlcraptor remove 2` will remove queued track at index position 2.
+
+`vlcraptor swap 2 4` will swap the tracks at index positions 2 and 4.
+
 ### Media controls
 
 `vlcraptor pause` will pause, `vlcraptor stop` will stop and `vlcraptor play` will resume.

data/exe/vlcraptor

@@ -11,6 +11,8 @@ command = ARGV.shift
 case command
 when "autoplay"
   Vlcraptor.autoplay(ARGV.shift)
+when "clear"
+  Vlcraptor.clear
 when "crossfade"
   Vlcraptor.crossfade(ARGV.shift)
 when "history"
@@ -23,6 +25,8 @@ when "play"
   Vlcraptor.play
 when "player"
   Vlcraptor.player
+when "remove"
+  Vlcraptor.remove(ARGV.shift)
 when "queue"
   Vlcraptor.queue(ARGV)
 when "scrobble"
@@ -31,9 +35,12 @@ when "skip"
   Vlcraptor.skip
 when "stop"
   Vlcraptor.stop
+when "swap"
+  Vlcraptor.swap(ARGV)
 else
   puts "Unknown command \"#{command}\":"
   puts "  autoplay on/off: continue playing tracks or stop at the end of current track"
+  puts "  clear: clear queue"
   puts "  crossfade on/off: 5 second crossfade when changing tracks"
   puts "  history: display play history"
   puts "  list: list current queue"
@@ -41,7 +48,9 @@ else
   puts "  play: resume after pause/stop"
   puts "  player: start the player"
   puts "  queue paths: queue folders or files containing music tracks"
+  puts "  remove a: remove track from queue at index position a"
   puts "  scrobble on/off: send track information to last.fm (requires an api key)"
   puts "  skip: skip the current track"
   puts "  stop: stop the player (resume with play)"
+  puts "  swap a b: swap tracks in queue at index positions a and b"
 end

data/lib/vlcraptor/notifiers.rb

@@ -53,6 +53,8 @@ module Vlcraptor
     end
 
     def track_finished(track)
+      @preferences[:started] = nil
+
       return unless track
 
       scrobbler&.scrobble(track[:artist], track[:title], timestamp: track[:start_time].to_i)

data/lib/vlcraptor/player_controller.rb

@@ -20,7 +20,7 @@ module Vlcraptor
       return on_pause if @preferences.pause?
       return on_stop if @preferences.stop?
       return on_play if @preferences.play?
-      return when_suspended if @suspended
+      return on_suspended if @suspended
       return when_playing if @player.playing?
       return when_auto if @preferences.continue?
 
@@ -28,41 +28,45 @@ module Vlcraptor
     end
 
     def cleanup
+      @notifiers.track_suspended
+      @player.fadeout
       @player.cleanup
     end
 
     private
 
     def on_pause
-      @player.fadeout
-      @player.pause
-      @suspended = true
-      @status = "Now Paused"
-      @notifiers.track_suspended
-      when_suspended
+      when_suspended("Now Paused", :pause)
     end
 
     def on_stop
-      @player.fadeout
-      @player.stop
+      when_suspended("Now Stopped", :stop)
+    end
+
+    def when_suspended(status, method)
+      if @player.playing?
+        @player.fadeout
+        @player.send(method)
+      end
+      @status = status
       @suspended = true
-      @status = "Now Stopped"
       @notifiers.track_suspended
-      when_suspended
+      on_suspended
+    end
+
+    def on_suspended
+      build
     end
 
     def on_play
-      @player.fadein
+      unless @player.playing?
+        @player.fadein
+      end
       @suspended = false
-      @status = ""
       @notifiers.track_resumed(@track, @player.time)
       when_playing_track(@player.remaining)
     end
 
-    def when_suspended
-      build
-    end
-
     def when_playing
       return on_skip if @preferences.skip?
       return on_crossfade if @preferences.crossfade? && @player.remaining < 5
@@ -72,6 +76,7 @@ module Vlcraptor
 
     def on_skip
       @track = @queue.next
+      @notifiers.track_suspended
       if @track
         @notifiers.track_started(@track)
         @player.crossfade(@track[:path])

data/lib/vlcraptor/queue.rb

@@ -18,6 +18,10 @@ module Vlcraptor
       File.exist?(result[:path]) ? result : self.next
     end
 
+    def self.clear
+      `rm -rf /tmp/queue`
+    end
+
     def self.length
       Dir["/tmp/queue/*.yml"].length
     end
@@ -28,6 +32,31 @@ module Vlcraptor
       end
     end
 
+    def self.remove(index)
+      path = Dir["/tmp/queue/*.yml"].sort[index.to_i]
+      if path
+        `rm #{path}`
+        yield
+      else
+        puts "Could not find track at position #{index}"
+      end
+    end
+
+    def self.swap(a, b)
+      all = Dir["/tmp/queue/*.yml"].sort
+      path_a = all[a.to_i]
+      path_b = all[b.to_i]
+
+      if path_a && path_b
+        `mv #{path_a} #{path_a}.tmp`
+        `mv #{path_b} #{path_a}`
+        `mv #{path_a}.tmp #{path_b}`
+        yield
+      else
+        puts "Could not find tracks at positions #{a} and #{b}"
+      end
+    end
+
     def self.add(path)
       unless %w[.mp3 .m4a].include?(File.extname(path))
         puts "skipping #{path}"

data/lib/vlcraptor/scrobbler.rb

@@ -16,24 +16,26 @@ module Vlcraptor
 
     def self.ask(prompt)
       puts prompt
-      gets.chomp
+      gets.chomp.strip
+    end
+
+    def self.blank(attribute)
+      (attribute || "").length.zero?
     end
 
     def self.load
-      conf = Vlcraptor::Settings.new("~/lastfm.yaml")
+      conf = Vlcraptor::Settings.new("~/.lastfm.yml")
 
-      unless conf["api_key"] && conf["secret"]
-        puts "You will need an api key and secret for last fm integration"
-        conf["api_key"] = ask("What is the api key? ")
-        conf["secret"] = ask("What is the secret ")
-      end
+      conf[:api_key] = ask("What is the api key? ") if blank(conf[:api_key])
+      conf[:secret] = ask("What is the secret? ") if blank(conf[:secret])
+      conf[:user] = ask("What is your lastfm username? ") if blank(conf[:user])
 
-      conf["user"] = ask("What is your lastfm username? ") unless conf["user"]
+      return nil if blank(conf[:api_key]) || blank(conf[:secret]) || blank(conf[:user])
 
-      scrobbler = Vlcraptor::Scrobbler.new(conf["api_key"], conf["secret"], conf["user"], conf["session"])
+      scrobbler = Vlcraptor::Scrobbler.new(conf[:api_key], conf[:secret], conf[:user], conf[:session])
 
-      unless conf["session"]
-        conf["session"] = scrobbler.fetch_session_key do |url|
+      unless conf[:session]
+        conf[:session] = scrobbler.fetch_session_key do |url|
           puts "A browser will now launch to allow to authorise this application to access your lastfm account"
           `open '#{url}'`
           puts "Press enter when you have authorised the application"
@@ -41,6 +43,8 @@ module Vlcraptor
         end
       end
 
+      return nil if blank(conf[:session])
+
       scrobbler
     end
 

data/lib/vlcraptor/version.rb

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

data/lib/vlcraptor.rb

@@ -7,12 +7,17 @@ require_relative "vlcraptor/player_controller"
 require_relative "vlcraptor/preferences"
 require_relative "vlcraptor/queue"
 require_relative "vlcraptor/notifiers"
+require_relative "vlcraptor/scrobbler"
 
 module Vlcraptor
   def self.autoplay(value)
     Vlcraptor::Preferences.new[:autoplay] = value == "on"
   end
 
+  def self.clear
+    Vlcraptor::Queue.clear
+  end
+
   def self.crossfade(value)
     Vlcraptor::Preferences.new[:crossfade] = value == "on"
   end
@@ -24,8 +29,9 @@ module Vlcraptor
   def self.list
     started = Vlcraptor::Preferences.new[:started]
     offset = 0
+    index = 0
     Vlcraptor::Queue.each do |track|
-      array = []
+      array = [Rainbow(index.to_s).magenta]
       array << Time.at(started + offset).strftime("%I:%M:%S") if started
       array += [Rainbow(track[:title]).green, "by", Rainbow(track[:artist]).yellow]
       array += ["from", Rainbow(track[:album]).cyan] if (track[:album] || "").length.positive?
@@ -36,6 +42,7 @@ module Vlcraptor
       end
       puts array.join(" ")
       offset += track[:length]
+      index += 1
     end
   end
 
@@ -96,6 +103,10 @@ module Vlcraptor
     Curses.close_screen
   end
 
+  def self.remove(index)
+    Vlcraptor::Queue.remove(index) { list }
+  end
+
   def self.queue(paths)
     paths.each do |path|
       if File.file?(path)
@@ -109,7 +120,10 @@ module Vlcraptor
   end
 
   def self.scrobble(value)
-    Vlcraptor::Preferences.new[:scrobble] = value == "on"
+    preferences = Vlcraptor::Preferences.new
+    preferences[:scrobble] = value == "on"
+    scrobbler = Vlcraptor::Scrobbler.load if preferences.scrobble?
+    preferences[:scrobble] = false unless scrobbler
   end
 
   def self.skip
@@ -119,4 +133,9 @@ module Vlcraptor
   def self.stop
     Vlcraptor::Preferences.new[:stop] = true
   end
+
+  def self.swap(args)
+    a, b = *args
+    Vlcraptor::Queue.swap(a, b) { list }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vlcraptor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Ryall