muzak 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a2a198cce10bc3f66a9c3c532433f30c4264b30
-  data.tar.gz: 2e021ffbcbc1d2b16696f010690389c1854b5890
+  metadata.gz: b6b8176c9db706a3a44a3bcdd0531cbf4f4bfc06
+  data.tar.gz: cc31f821a39863d88a98e3605102e4720e091609
 SHA512:
-  metadata.gz: 6fe05e1fb8c85576a9b270144447f45e6c03d7b499f6569290f42c047a878d58c637ae36b8adcad3c8176c048136670ecf1079c6ccc4fa0dd2b09e67c77f17e2
-  data.tar.gz: cb384c8a927cd5ef336f6eb113c115d7a1d5a7f6e1adf66c16de2fe1559b056192b51d7f63f23478a01ffcf55b9cc67a57cb05981b272b2564906a71cabaadff
+  metadata.gz: b2713fafa4ebd9f793c32a33040d021dd78aa475c283b101a141032de2865ca36423832b19432562bddc64f7699e55b489be40e8d7af4a4faad713d4eb163685
+  data.tar.gz: 177e33819737a1e629640b721f0540cc9ff7d7f44ebce31bda4acf42d30abaf697b862d2a8afc079c392b1d4b08f79529b631a405f8d5d90a7409c08cf9c3133

data/bin/muzak

@@ -18,7 +18,7 @@ COMMANDS = Muzak::Cmd.commands
 CONFIG_REGEX = /^config-(get)|(set)|(del)/
 ARTIST_REGEX = Regexp.union COMMANDS.select{ |c| c =~ /artist/ }.map { |c| /^#{c}/ }
 ALBUM_REGEX = Regexp.union COMMANDS.select{ |c| c =~ /album/ }.map { |c| /^#{c}/ }
-PLAYLIST_REGEX = /^playlist-(load)|(delete)/
+PLAYLIST_REGEX = /^playlist-delete/
 
 comp = proc do |s|
   case Readline.line_buffer

data/lib/muzak/cmd.rb

@@ -2,6 +2,9 @@ Dir.glob(File.join(__dir__, "cmd/*")) { |f| require_relative f }
 
 module Muzak
   module Cmd
+    # load commands included by the user
+    Dir.glob(File.join(USER_COMMAND_DIR, "*")) { |file| require file }
+
     def self.resolve_command(cmd)
       cmd.tr "-", "_"
     end

data/lib/muzak/cmd/playlist.rb

@@ -1,7 +1,7 @@
 module Muzak
   module Cmd
-    def _playlist_loaded?
-      !!@playlist
+    def _playlists_loaded?
+      !!@playlists
     end
 
     def list_playlists(*args)
@@ -10,14 +10,18 @@ module Muzak
       end
     end
 
-    def playlist_load(*args)
-      fail_arity(args, 1)
-      pname = args.shift
+    def playlists_load(*args)
+      # fail_arity(args, 1)
+      # pname = args.shift
+      @playlists = {}
+      @playlists.default_proc = proc { |h, k| h[k] = Playlist.new(k) }
 
-      info "loading playlist '#{pname}'"
-      @playlist = Playlist.new(pname)
+      Playlist.playlist_names.each do |pname|
+        debug "loading playlist '#{pname}'"
+        @playlists[pname] = Playlist.new(pname)
+      end
 
-      event :playlist_loaded, @playlist
+      event :playlists_loaded, @playlist
     end
 
     def playlist_delete(*args)
@@ -27,18 +31,23 @@ module Muzak
       debug "deleting playist '#{pname}'"
 
       Playlist.delete!(pname)
-      @playlist = nil
+      @playlist[pname] = nil
     end
 
     def enqueue_playlist(*args)
-      return unless _playlist_loaded?
+      return unless _playlists_loaded?
+      fail_arity(args, 1)
+      pname = args.shift
 
-      @player.enqueue_playlist(@playlist)
-      event :playlist_enqueued, @playlist
+      @player.enqueue_playlist(@playlists[pname])
+      event :playlist_enqueued, @playlists[pname]
     end
 
     def playlist_add_album(*args)
-      return unless _playlist_loaded?
+      return unless _playlists_loaded?
+
+      pname = args.shift
+      return if pname.nil?
 
       album_name = args.join(" ")
       return if album_name.nil?
@@ -46,34 +55,46 @@ module Muzak
       album = @index.albums[album_name]
       return if album.nil?
 
-      @playlist.add(album.songs)
+      @playlists[pname].add(album.songs)
     end
 
     def playlist_add_artist(*args)
-      return unless _playlist_loaded?
+      return unless _playlists_loaded?
+
+      pname = args.shift
+      return if pname.nil?
 
       artist = args.join(" ")
       return if artist.nil?
 
-      @playlist.add(@index.songs_by(artist))
+      @playlists[pname].add(@index.songs_by(artist))
     end
 
     def playlist_add_current(*args)
-      return unless @player.running? && _playlist_loaded?
+      return unless @player.running? && _playlists_loaded?
+
+      pname = args.shift
+      return if pname.nil?
 
-      @playlist.add @player.now_playing
+      @playlists[pname].add @player.now_playing
     end
 
     def playlist_del_current(*args)
-      return unless @player.running? && _playlist_loaded?
+      return unless @player.running? && _playlists_loaded?
 
-      @playlist.delete @player.now_playing
+      pname = args.shift
+      return if pname.nil?
+
+      @playlists[pname].delete @player.now_playing
     end
 
     def playlist_shuffle(*args)
-      return unless _playlist_loaded?
+      return unless _playlists_loaded?
+
+      pname = args.shift
+      return if pname.nil?
 
-      @playlist.shuffle!
+      @playlists[pname].shuffle!
     end
   end
 end

data/lib/muzak/const.rb

@@ -1,17 +1,18 @@
 module Muzak
-  VERSION = "0.0.7".freeze
+  VERSION = "0.0.8".freeze
 
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze
   CONFIG_FILE = File.join(CONFIG_DIR, "muzak.yml").freeze
   INDEX_FILE = File.join(CONFIG_DIR, "index.yml").freeze
   PLAYLIST_DIR = File.join(CONFIG_DIR, "playlists").freeze
   USER_PLUGIN_DIR = File.join(CONFIG_DIR, "plugins").freeze
+  USER_COMMAND_DIR = File.join(CONFIG_DIR, "commands").freeze
 
   PLUGIN_EVENTS = [
     :player_activated,
     :player_deactivated,
     :song_loaded,
-    :playlist_loaded,
+    :playlists_loaded,
     :playlist_enqueued
   ]
 end

data/lib/muzak/instance.rb

@@ -30,8 +30,8 @@ module Muzak
 
       @plugins = initialize_plugins!
 
-      playlist_load @config["default-playlist"] if @config["default-playlist"]
-      enqueue_playlist if _playlist_loaded? && @config["autoplay"]
+      playlists_load
+      enqueue_playlist @config["autoplay"] if @config["autoplay"]
     end
 
     def initialize_plugins!

data/lib/muzak/playlist.rb

@@ -31,6 +31,8 @@ module Muzak
       else
         @songs = []
       end
+
+      sync!
     end
 
     def name

metadata

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