muzak 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66effe9b1b141471424f8fb07923b88ecf87da80
-  data.tar.gz: a79283a7dd22bbb754ba3a7ed5b9db7ba32aa99b
+  metadata.gz: 9a2a198cce10bc3f66a9c3c532433f30c4264b30
+  data.tar.gz: 2e021ffbcbc1d2b16696f010690389c1854b5890
 SHA512:
-  metadata.gz: 80990917d255f3dc96570cf9389ed1238701382b9c096ceac2de8ee6cfce606b90808ebe253ce1764dda18b880eed4b05c11b75d244008ff855f20643c22fca9
-  data.tar.gz: 4f1bf3964aef17d1a060590162bf5ca16cfcef1f733423c20116e7b3b972bb7df363d12f38b0ada0cb31286ba49c0933823d98de704c9f845e8def882bbdfba2
+  metadata.gz: 6fe05e1fb8c85576a9b270144447f45e6c03d7b499f6569290f42c047a878d58c637ae36b8adcad3c8176c048136670ecf1079c6ccc4fa0dd2b09e67c77f17e2
+  data.tar.gz: cb384c8a927cd5ef336f6eb113c115d7a1d5a7f6e1adf66c16de2fe1559b056192b51d7f63f23478a01ffcf55b9cc67a57cb05981b272b2564906a71cabaadff

data/bin/muzak

@@ -45,5 +45,7 @@ trap("INT", "SIG_IGN")
 while line = Readline.readline("muzak> ", true)
   cmd_argv = Shellwords.split(line) rescue next
   next if cmd_argv.empty? || cmd_argv.any?(&:empty?)
-  muzak.command cmd_argv.shift, *cmd_argv
+  cmd = cmd_argv.shift
+  muzak.command cmd, *cmd_argv
+  break if cmd == "quit"
 end

data/bin/muzakd

@@ -17,15 +17,14 @@ fifo_path = File.join(Muzak::CONFIG_DIR, "muzak.fifo")
 File.delete(fifo_path) if File.exist?(fifo_path) # just in case a previous session died
 File.mkfifo(fifo_path)
 
-File.open(fifo_path, "r") do |fifo|
+File.open(fifo_path, "r+") do |fifo|
   loop do
     cmd_argv = Shellwords.split(fifo.readline) rescue next
     next if cmd_argv.empty? || cmd_argv.any?(&:empty?)
-    muzak.command cmd_argv.shift, *cmd_argv
+    cmd = cmd_argv.shift
+    muzak.command cmd, *cmd_argv
+    break if cmd == "quit"
   end
 end
 
-# there is definitely a cleaner way to do this.
-at_exit do
-  File.delete(fifo_path) if File.exist?(fifo_path)
-end
+File.delete(fifo_path) if File.exist?(fifo_path)

data/lib/muzak/cmd/config.rb

@@ -22,7 +22,8 @@ module Muzak
         "music" => File.expand_path("~/music"),
         "player" => "mpv",
         "index-autobuild" => 86400,
-        "deep-index" => false
+        "deep-index" => false,
+        "jukebox-size" => 100
       }
 
       Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)

data/lib/muzak/cmd/meta.rb

@@ -13,7 +13,6 @@ module Muzak
     def quit
       debug "muzak is quitting..."
       @player.deactivate!
-      exit
     end
   end
 end

data/lib/muzak/cmd/playlist.rb

@@ -1,18 +1,10 @@
 module Muzak
   module Cmd
-    def _playlist_file(pname)
-      File.join(PLAYLIST_DIR, pname) + ".yml"
-    end
-
-    def _playlist_available?(pname)
-      File.exist?(_playlist_file(pname))
-    end
-
     def _playlist_loaded?
       !!@playlist
     end
 
-    def list_playlists
+    def list_playlists(*args)
       Playlist.playlist_names.each do |playlist|
         info playlist
       end
@@ -22,14 +14,8 @@ module Muzak
       fail_arity(args, 1)
       pname = args.shift
 
-      if _playlist_available?(pname)
-        info "loading playlist '#{pname}'"
-        @playlist = Playlist.load_playlist(_playlist_file(pname))
-      else
-        info "creating playlist '#{pname}'"
-        @playlist = Playlist.new(pname, [])
-        playlist_sync
-      end
+      info "loading playlist '#{pname}'"
+      @playlist = Playlist.new(pname)
 
       event :playlist_loaded, @playlist
     end
@@ -40,21 +26,11 @@ module Muzak
 
       debug "deleting playist '#{pname}'"
 
-      File.delete(_playlist_file(pname)) if _playlist_available?(pname)
+      Playlist.delete!(pname)
       @playlist = nil
     end
 
-    def playlist_sync(*args)
-      return unless _playlist_loaded?
-      fail_arity(args, 0)
-
-      debug "syncing playlist '#{@playlist.name}'"
-
-      Dir.mkdir(PLAYLIST_DIR) unless Dir.exist?(PLAYLIST_DIR)
-      File.open(_playlist_file(@playlist.name), "w") { |io| io.write @playlist.to_hash.to_yaml }
-    end
-
-    def enqueue_playlist
+    def enqueue_playlist(*args)
       return unless _playlist_loaded?
 
       @player.enqueue_playlist(@playlist)
@@ -70,33 +46,34 @@ module Muzak
       album = @index.albums[album_name]
       return if album.nil?
 
-      album.songs.each { |song| @playlist.add song }
+      @playlist.add(album.songs)
+    end
+
+    def playlist_add_artist(*args)
+      return unless _playlist_loaded?
+
+      artist = args.join(" ")
+      return if artist.nil?
 
-      playlist_sync
+      @playlist.add(@index.songs_by(artist))
     end
 
-    def playlist_add_current
+    def playlist_add_current(*args)
       return unless @player.running? && _playlist_loaded?
 
       @playlist.add @player.now_playing
-
-      playlist_sync
     end
 
-    def playlist_del_current
+    def playlist_del_current(*args)
       return unless @player.running? && _playlist_loaded?
 
-      @playlist.delete(@player.now_playing)
-
-      playlist_sync
+      @playlist.delete @player.now_playing
     end
 
-    def playlist_shuffle
+    def playlist_shuffle(*args)
       return unless _playlist_loaded?
 
       @playlist.shuffle!
-
-      playlist_sync
     end
   end
 end

data/lib/muzak/const.rb

@@ -1,5 +1,5 @@
 module Muzak
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.7".freeze
 
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze
   CONFIG_FILE = File.join(CONFIG_DIR, "muzak.yml").freeze

data/lib/muzak/player/mpv.rb

@@ -22,6 +22,10 @@ module Muzak
         @sock_path = Dir::Tmpname.make_tmpname("/tmp/mpv", ".sock")
         mpv_args = [
           "--idle",
+          # if i get around to separating album art from playback,
+          # these two flags disable mpv's video output entirely
+          # "--no-force-window",
+          # "--no-video",
           "--no-osc",
           "--no-osd-bar",
           "--no-input-default-bindings",
@@ -151,7 +155,7 @@ module Muzak
 
       def load_song(song, art)
         cmds = ["loadfile", song.path, "append-play"]
-        cmds << "external-file=#{art}" if art
+        cmds << "external-file=\"#{art}\"" if art
         command *cmds
       end
 

data/lib/muzak/playlist.rb

@@ -1,6 +1,18 @@
 module Muzak
   class Playlist
-    attr_accessor :name, :songs
+    attr_accessor :filename, :songs
+
+    def self.path_for(pname)
+      File.join(PLAYLIST_DIR, pname) + ".yml"
+    end
+
+    def self.exist?(pname)
+      File.exist?(path_for(pname))
+    end
+
+    def self.delete!(pname)
+      File.delete(path_for(pname)) if exist? pname
+    end
 
     def self.playlist_names
       Dir.entries(PLAYLIST_DIR).reject do |ent|
@@ -10,36 +22,47 @@ module Muzak
       end
     end
 
-    def self.load_playlist(path)
-      instance = allocate
-      playlist_hash = YAML.load_file(path)
-
-      instance.name = File.basename(path, File.extname(path))
-      instance.songs = playlist_hash["songs"]
+    def initialize(pname)
+      @filename = self.class.path_for pname
 
-      instance
+      if File.exist?(@filename)
+        phash = YAML.load_file(@filename)
+        @songs = phash["songs"]
+      else
+        @songs = []
+      end
     end
 
-    def initialize(name, songs)
-      @name = name
-      @songs = songs
+    def name
+      File.basename(@filename, File.extname(@filename))
     end
 
-    def add(song)
-      return if @songs.include?(song)
-      @songs << song
+    def add(songs)
+      # coerce a single song into an array
+      [*songs].each do |song|
+        next if @songs.include?(song)
+        @songs << song
+      end
+
+      sync!
     end
 
-    def delete(song)
-      @songs.delete(song)
+    def delete(songs)
+      [*songs].each { |song| @songs.delete(song) }
+
+      sync!
     end
 
     def shuffle!
       @songs.shuffle!
     end
 
+    def sync!
+      File.open(@filename, "w") { |io| io.write to_hash.to_yaml }
+    end
+
     def to_hash
-      { "songs" => songs }
+      { "songs" => @songs }
     end
   end
 end

data/lib/muzak/song.rb

@@ -22,7 +22,7 @@ module Muzak
       end
 
       # provide some sane fallbacks
-      @title ||= File.basename(path, File.extname(path))
+      @title ||= File.basename(path, File.extname(path)) rescue ""
       @track ||= 0 # we'll need to sort by track number
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby