muzak 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2004a69f30d2467efb106868ca1882dcc8adcd1c
-  data.tar.gz: a2af36014644a54b49d3756ca0cf7823442dbea1
+  metadata.gz: fea7658ba10597fe2e70ededc6e8b33e179f200c
+  data.tar.gz: b320dc1ef8a2b0aa715f336290d1e66fe0771a12
 SHA512:
-  metadata.gz: 61fff1242efdd7eccd57a999352c2a58a41cad230b7b29e65bac2cdd8560aae6494dd22078ff9cdb3129aab4b45ad4d241f3f3ae3234a3aa5cbc7fecf933f803
-  data.tar.gz: de3071c222e36d73e08bdb7f8119552ac92828ffaa90a5d92d8709d60cb3495411e62fb6763327b1fce73f2c483d72e750cc1e9800ff2b5f2268d5c9f44584e2
+  metadata.gz: 91fe7be79998568bb9b3727066561eb1fd9f82ce8d0a9be4829c45b13a13d59fb2ae2bce343fd9ab87202eb72862d192c402fe89438b84cf23efb9fd1f3df8e5
+  data.tar.gz: 1352f596a7e5a7df41027c62600524faf2352baf7a39d48c9671647e1d01e9c80ca3cdcb6278f7e71b1fa22dd866fe10c933b6f4f394ac66eae789619a9e6e80

data/lib/muzak/cmd/index.rb

@@ -1,76 +1,37 @@
 module Muzak
   module Cmd
-    def _index_available?
-      File.file?(INDEX_FILE)
-    end
-
-    def _index_loaded?
-      !!@index
-    end
-
-    def _index_outdated?
-      Time.now.to_i - @index.timestamp >= Config.index_autobuild
-    end
-
-    def _index_sync
-      debug "syncing index hash with #{INDEX_FILE}"
-      File.open(INDEX_FILE, "w") { |io| io.write @index.hash.to_yaml }
-    end
-
-    def index_load
-      verbose "loading index from #{INDEX_FILE}"
-
-      @index = Index.load_index(INDEX_FILE)
-
-      # the order is important here, since Config.index_autobuild
-      # will short-circuit if index-autobuild isn't set
-      if Config.index_autobuild && _index_outdated?
-        verbose "rebuilding outdated index"
-        index_build
-      end
-    end
-
     def index_build(*args)
       warn_arity(args, 0)
 
       verbose "building a new index, this may take a while"
 
-      @index = Index.new(Config.music, deep: Config.deep_index)
-      _index_sync
+      index.build!
     end
 
     def list_artists(*args)
-      return unless _index_loaded?
-
       warn_arity(args, 0)
 
-      puts @index.artists.join("\n")
+      puts index.artists.join("\n")
     end
 
     def list_albums(*args)
-      return unless _index_loaded?
-
       warn_arity(args, 0)
 
-      puts @index.album_names.join("\n")
+      puts index.album_names.join("\n")
     end
 
     def albums_by_artist(*args)
-      return unless _index_loaded?
-
       artist = args.join(" ")
       return if artist.nil?
 
-      puts @index.albums_by(artist).map(&:title)
+      puts index.albums_by(artist).map(&:title)
     end
 
     def songs_by_artist(*args)
-      return unless _index_loaded?
-
       artist = args.join(" ")
       return if artist.nil?
 
-      puts @index.songs_by(artist).map(&:title)
+      puts index.songs_by(artist).map(&:title)
     end
   end
 end

data/lib/muzak/cmd/meta.rb

@@ -11,8 +11,8 @@ module Muzak
     end
 
     def quit
-      debug "muzak is quitting..."
-      @player.deactivate!
+      verbose "muzak is quitting..."
+      player.deactivate!
     end
   end
 end

data/lib/muzak/cmd/player.rb

@@ -1,54 +1,54 @@
 module Muzak
   module Cmd
     def player_activate
-      if @player.running?
+      if player.running?
         warn "player is already running"
         return
       end
 
-      @player.activate!
+      player.activate!
     end
 
     def player_deactivate
-      warn "player is not running" unless @player.running?
+      warn "player is not running" unless player.running?
 
       # do cleanup even if the player isn't running, just in case
-      @player.deactivate!
+      player.deactivate!
     end
 
     def play
-      @player.play
+      player.play
     end
 
     def pause
-      @player.pause
+      player.pause
     end
 
     def toggle
-      if @player.playing?
-        @player.pause
+      if player.playing?
+        player.pause
       else
-        @player.play
+        player.play
       end
     end
 
     def next
-      @player.next_song
+      player.next_song
     end
 
     def previous
-      @player.previous_song
+      player.previous_song
     end
 
     def enqueue_artist(*args)
       artist = args.join(" ")
       return if artist.nil?
 
-      albums = @index.albums_by(artist)
+      albums = index.albums_by(artist)
       return if albums.empty?
 
       albums.each do |album|
-        @player.enqueue_album album
+        player.enqueue_album album
       end
     end
 
@@ -57,37 +57,37 @@ module Muzak
       return if album_name.nil?
 
       debug album_name
-      album = @index.albums[album_name]
+      album = index.albums[album_name]
       debug album.to_s
       return if album.nil?
 
-      @player.enqueue_album album
+      player.enqueue_album album
     end
 
     def jukebox(*args)
       count = args.shift || Config.jukebox_size
 
-      songs = @index.jukebox(count.to_i)
+      songs = index.jukebox(count.to_i)
 
-      songs.each { |s| @player.enqueue_song s }
+      songs.each { |s| player.enqueue_song s }
     end
 
     def list_queue
-      puts @player.list_queue.map(&:title)
+      puts player.list_queue.map(&:title)
     end
 
     def shuffle_queue
-      @player.shuffle_queue
+      player.shuffle_queue
     end
 
     def clear_queue
-      @player.clear_queue
+      player.clear_queue
     end
 
     def now_playing
-      return unless @player.playing?
+      return unless player.playing?
 
-      info @player.now_playing.full_title
+      info player.now_playing.full_title
     end
   end
 end

data/lib/muzak/cmd/playlist.rb

@@ -1,7 +1,7 @@
 module Muzak
   module Cmd
     def _playlists_loaded?
-      !!@playlists
+      !!playlists
     end
 
     def list_playlists(*args)
@@ -10,20 +10,6 @@ module Muzak
       end
     end
 
-    def playlists_load(*args)
-      # fail_arity(args, 1)
-      # pname = args.shift
-      @playlists = {}
-      @playlists.default_proc = proc { |h, k| h[k] = Playlist.new(k) }
-
-      Playlist.playlist_names.each do |pname|
-        debug "loading playlist '#{pname}'"
-        @playlists[pname] = Playlist.new(pname)
-      end
-
-      event :playlists_loaded, @playlist
-    end
-
     def playlist_delete(*args)
       fail_arity(args, 1)
       pname = args.shift
@@ -31,7 +17,7 @@ module Muzak
       debug "deleting playist '#{pname}'"
 
       Playlist.delete!(pname)
-      @playlist[pname] = nil
+      playlists[pname] = nil
     end
 
     def enqueue_playlist(*args)
@@ -39,8 +25,8 @@ module Muzak
       fail_arity(args, 1)
       pname = args.shift
 
-      @player.enqueue_playlist(@playlists[pname])
-      event :playlist_enqueued, @playlists[pname]
+      player.enqueue_playlist(playlists[pname])
+      event :playlist_enqueued, playlists[pname]
     end
 
     def playlist_add_album(*args)
@@ -52,10 +38,10 @@ module Muzak
       album_name = args.join(" ")
       return if album_name.nil?
 
-      album = @index.albums[album_name]
+      album = index.albums[album_name]
       return if album.nil?
 
-      @playlists[pname].add(album.songs)
+      playlists[pname].add(album.songs)
     end
 
     def playlist_add_artist(*args)
@@ -67,25 +53,25 @@ module Muzak
       artist = args.join(" ")
       return if artist.nil?
 
-      @playlists[pname].add(@index.songs_by(artist))
+      playlists[pname].add(index.songs_by(artist))
     end
 
     def playlist_add_current(*args)
-      return unless @player.running? && _playlists_loaded?
+      return unless player.running? && _playlists_loaded?
 
       pname = args.shift
       return if pname.nil?
 
-      @playlists[pname].add @player.now_playing
+      playlists[pname].add player.now_playing
     end
 
     def playlist_del_current(*args)
-      return unless @player.running? && _playlists_loaded?
+      return unless player.running? && _playlists_loaded?
 
       pname = args.shift
       return if pname.nil?
 
-      @playlists[pname].delete @player.now_playing
+      playlists[pname].delete player.now_playing
     end
 
     def playlist_shuffle(*args)
@@ -94,7 +80,7 @@ module Muzak
       pname = args.shift
       return if pname.nil?
 
-      @playlists[pname].shuffle!
+      playlists[pname].shuffle!
     end
   end
 end

data/lib/muzak/const.rb

@@ -1,5 +1,5 @@
 module Muzak
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.10".freeze
 
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze
   CONFIG_FILE = File.join(CONFIG_DIR, "muzak.yml").freeze
@@ -12,7 +12,6 @@ module Muzak
     :player_activated,
     :player_deactivated,
     :song_loaded,
-    :playlists_loaded,
     :playlist_enqueued
   ]
 end

data/lib/muzak/index.rb

@@ -1,59 +1,39 @@
 module Muzak
   class Index
     include Utils
-    attr_accessor :hash
-
-    def self.load_index(file)
-      instance = allocate
-      instance.hash = YAML::load_file(file)
-
-      instance
-    end
+    attr_accessor :tree, :deep, :hash
 
     def initialize(tree, deep: false)
-      @hash = {
-        "timestamp" => Time.now.to_i,
-        "artists" => {},
-        "deep" => deep
-      }
-
-      Dir.entries(tree).each do |artist|
-        next unless File.directory?(File.join(tree, artist))
-        next if artist.start_with?(".")
-
-        @hash["artists"][artist] = {}
-        @hash["artists"][artist]["albums"] = {}
-
-        Dir.entries(File.join(tree, artist)).each do |album|
-          next if album.start_with?(".")
+      @tree = tree
+      @deep = deep
 
-          @hash["artists"][artist]["albums"][album] = {}
-          @hash["artists"][artist]["albums"][album]["songs"] = []
-          @hash["artists"][artist]["albums"][album]["deep-songs"] = []
+      if File.exist?(INDEX_FILE)
+        verbose "loading index from #{INDEX_FILE}"
+        @hash = YAML::load_file(INDEX_FILE)
+        return unless outdated?
+      end
 
-          Dir.glob(File.join(tree, artist, album, "**")) do |file|
-            @hash["artists"][artist]["albums"][album]["cover"] = file if album_art?(file)
+      build!
+    end
 
-            if music?(file)
-              @hash["artists"][artist]["albums"][album]["songs"] << file
-              @hash["artists"][artist]["albums"][album]["deep-songs"] << Song.new(file)
-            end
-          end
+    def build!
+      @hash = build_index_hash!
 
-          @hash["artists"][artist]["albums"][album]["songs"].sort!
-          @hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:track)
-        end
-      end
+      File.open(INDEX_FILE, "w") { |io| io.write @hash.to_yaml }
     end
 
     def deep?
-      !!@hash["deep"]
+      deep
     end
 
     def timestamp
       @hash["timestamp"]
     end
 
+    def outdated?
+      Time.now.to_i - timestamp >= Config.index_autobuild
+    end
+
     def artists
       @hash["artists"].keys
     end
@@ -103,5 +83,45 @@ module Muzak
         []
       end
     end
+
+    private
+
+    def build_index_hash!
+      index_hash = {
+        "timestamp" => Time.now.to_i,
+        "artists" => {},
+        "deep" => deep
+      }
+
+      Dir.entries(tree).each do |artist|
+        next unless File.directory?(File.join(tree, artist))
+        next if artist.start_with?(".")
+
+        index_hash["artists"][artist] = {}
+        index_hash["artists"][artist]["albums"] = {}
+
+        Dir.entries(File.join(tree, artist)).each do |album|
+          next if album.start_with?(".")
+
+          index_hash["artists"][artist]["albums"][album] = {}
+          index_hash["artists"][artist]["albums"][album]["songs"] = []
+          index_hash["artists"][artist]["albums"][album]["deep-songs"] = []
+
+          Dir.glob(File.join(tree, artist, album, "**")) do |file|
+            index_hash["artists"][artist]["albums"][album]["cover"] = file if album_art?(file)
+
+            if music?(file)
+              index_hash["artists"][artist]["albums"][album]["songs"] << file
+              index_hash["artists"][artist]["albums"][album]["deep-songs"] << Song.new(file)
+            end
+          end
+
+          index_hash["artists"][artist]["albums"][album]["songs"].sort!
+          index_hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:track)
+        end
+      end
+
+      index_hash
+    end
   end
 end

data/lib/muzak/instance.rb

@@ -12,34 +12,29 @@ module Muzak
       help
     end
 
-    attr_reader :config, :player, :index, :playlist
+    attr_reader :index, :player, :plugins, :playlists
 
     def initialize(opts = {})
       $debug = opts[:debug]
       $verbose = opts[:verbose]
 
-      debug "muzak is starting..."
+      verbose "muzak is starting..."
 
-      index_build unless _index_available?
-      index_load
+      @index = Index.new(Config.music, deep: Config.deep_index)
 
       @player = Player::PLAYER_MAP[Config.player].new(self)
 
-      @plugins = initialize_plugins!
+      @plugins = Plugin.load_plugins!
 
-      playlists_load
-      enqueue_playlist Config.autoplay if Config.autoplay
-    end
+      @playlists = Playlist.load_playlists!
 
-    def initialize_plugins!
-      pks = Plugin.plugin_classes.select { |pk| Config.plugin? pk.plugin_name }
-      pks.map { |pk| pk.new(self) }
+      enqueue_playlist Config.autoplay if Config.autoplay
     end
 
     def event(type, *args)
       return unless PLUGIN_EVENTS.include?(type)
 
-      @plugins.each do |plugin|
+      plugins.each do |plugin|
         Thread.new do
           plugin.send(type, *args)
         end.join

data/lib/muzak/playlist.rb

@@ -22,6 +22,17 @@ module Muzak
       end
     end
 
+    def self.load_playlists!
+      playlists = {}
+      playlists.default_proc = proc { |h, k| h[k] = Playlist.new(k) }
+
+      playlist_names.each do |pname|
+        playlists[pname] = Playlist.new(pname)
+      end
+
+      playlists
+    end
+
     def initialize(pname)
       @filename = self.class.path_for pname
 

data/lib/muzak/plugin.rb

@@ -19,6 +19,11 @@ module Muzak
       end
     end
 
+    def self.load_plugins!
+      pks = Plugin.plugin_classes.select { |pk| Config.plugin? pk.plugin_name }
+      pks.map { |pk| pk.new(self) }
+    end
+
     PLUGIN_MAP = plugin_names.zip(plugin_classes).to_h.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: muzak - A metamusic player.