muzak 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdbf4e0b472fdf7499bbd25915c178c00ea427f2
-  data.tar.gz: e0b39265673163d195dde538960beb7819e2ebbe
+  metadata.gz: b6895336a3fa06db40e63f71d227e36b11a18397
+  data.tar.gz: 32f2ad6998993b76b783d9e97d8d91db55db1be0
 SHA512:
-  metadata.gz: 18ae7d00640668f375390afc84d2ec0aec1fde26970d9e1636c943a7a29415267b97cf5c433efc2967ad630726525f617493a77e30cc2072646af95406078de1
-  data.tar.gz: 51f3a12b1e2018fb52c118cbd79afdc47a22a9a0a7feaf724960baffc9604b77042aafd60d3b0e7117e8b37bd9c12475c0653ffc71befc722c43c3289229b5f6
+  metadata.gz: bea81c7b13e504c158e9fb6d01beb3431d56b48c578b3f0c659dd059adad4c6cd87d1e3e975c58bf8be6fe1e412dad6508846cb5a98b603fa96a9948a3f0a4ed
+  data.tar.gz: 692b0d3ba74454f6c7669156f4cf472932c930bcb29e59399149371db188eaf01442062bd7a8be31af854bbc06f2636d2694505ab46edb1e9848c6e4ed7f78cb

data/lib/muzak/album.rb

@@ -16,7 +16,7 @@ module Muzak
       @title = title
       @cover_art = album_hash["cover"]
 
-      if album_hash["deep-songs"]
+      unless album_hash["deep-songs"].empty?
         @songs = album_hash["deep-songs"]
       else
         @songs = album_hash["songs"].map { |s| Song.new(s) }

data/lib/muzak/cmd/player.rb

@@ -85,9 +85,7 @@ module Muzak
       album_name = args.join(" ")
       return if album_name.nil?
 
-      debug album_name
       album = index.albums[album_name]
-      debug album.to_s
       return if album.nil?
 
       player.enqueue_album album

data/lib/muzak/config.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require "fileutils"
 
 module Muzak
   # Muzak's static configuration dumping ground.
@@ -13,7 +14,7 @@ module Muzak
     else
       @config = {
         "debug" => false,
-        "verbose" => false,
+        "verbose" => true,
         "music" => File.expand_path("~/music"),
         "player" => "mpv",
         "index-autobuild" => 86400,
@@ -21,12 +22,21 @@ module Muzak
         "jukebox-size" => 100
       }
 
-      File.open(CONFIG_FILE, "w") { |io| io.write @config.to_yaml }
+      [CONFIG_DIR, PLAYLIST_DIR, USER_PLUGIN_DIR, USER_COMMAND_DIR].each do |d|
+        FileUtils.mkdir_p d
+      end
+
+      sync!
     end
 
-    @config.each do |key, value|
+    @config.each do |key, _|
       define_singleton_method Utils.resolve_command(key) do
-        value
+        @config[key]
+      end
+
+      define_singleton_method "#{Utils.resolve_command(key)}=" do |value|
+        @config[key] = value
+        sync!
       end
     end
 
@@ -36,6 +46,10 @@ module Muzak
       false
     end
 
+    def self.sync!
+      File.open(CONFIG_FILE, "w") { |io| io.write @config.to_yaml }
+    end
+
     # @return [Boolean] whether or not the given plugin is configured
     # @note the truth-value of this method is used to determine which
     #   plugins should be loaded.

data/lib/muzak/const.rb

@@ -1,6 +1,6 @@
 module Muzak
   # Muzak's current version
-  VERSION = "0.0.12".freeze
+  VERSION = "0.0.13".freeze
 
   # The root directory for all user configuration, data, etc
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze

data/lib/muzak/index.rb

@@ -3,6 +3,10 @@ module Muzak
   class Index
     include Utils
 
+    def self.load_index!
+      Index.new(Config.music, deep: Config.deep_index)
+    end
+
     # @return [String] the path of the root of the music tree
     attr_accessor :tree
 
@@ -54,6 +58,7 @@ module Muzak
     # @note The behavior of this method is affected by the value of
     #   {Muzak::Config.index_autobuild}.
     def outdated?
+      return false unless Config.index_autobuild
       Time.now.to_i - timestamp >= Config.index_autobuild
     end
 
@@ -155,12 +160,22 @@ module Muzak
 
             if music?(file)
               index_hash["artists"][artist]["albums"][album]["songs"] << file
-              index_hash["artists"][artist]["albums"][album]["deep-songs"] << Song.new(file)
+              if deep?
+                index_hash["artists"][artist]["albums"][album]["deep-songs"] << Song.new(file)
+              end
             end
           end
 
           index_hash["artists"][artist]["albums"][album]["songs"].sort!
-          index_hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:track)
+
+          # if any of the track numbers in the album are > 0 (the fallback),
+          # sort by ID3 track numbers. otherwise, hope that the song
+          # paths contain track numbers (e.g, "01 song.mp3").
+          if index_hash["artists"][artist]["albums"][album]["deep-songs"].any? { |s| s.track > 0 }
+            index_hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:track)
+          else
+            index_hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:path)
+          end
         end
       end
 

data/lib/muzak/instance.rb

@@ -34,7 +34,9 @@ module Muzak
     def initialize(opts = {})
       verbose "muzak is starting..."
 
-      @index = Index.new(Config.music, deep: Config.deep_index)
+      error! "#{Config.music} doesn't exist" unless File.exist?(Config.music)
+
+      @index = Index.load_index!
 
       @player = Player.load_player!(self)
 

data/lib/muzak/utils.rb

@@ -89,6 +89,14 @@ module Muzak
       output pretty(:red, "error"), "[#{self.class.name}]", args
     end
 
+    # Outputs a boxed error message and then exits.
+    # @param args [Array<String>] the message(s)
+    # @return [void]
+    def error!(*args)
+      error *args
+      exit 1
+    end
+
     # Outputs a boxed debugging message.
     # @param args [Array<String>] the message(s)
     # @return [void]

metadata

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