muzak 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea7658ba10597fe2e70ededc6e8b33e179f200c
-  data.tar.gz: b320dc1ef8a2b0aa715f336290d1e66fe0771a12
+  metadata.gz: bfec18a0835cc1c148e9bf4c1ee3c9770143ba46
+  data.tar.gz: 44f5b96244563e8161d6c9950079551b4554d80a
 SHA512:
-  metadata.gz: 91fe7be79998568bb9b3727066561eb1fd9f82ce8d0a9be4829c45b13a13d59fb2ae2bce343fd9ab87202eb72862d192c402fe89438b84cf23efb9fd1f3df8e5
-  data.tar.gz: 1352f596a7e5a7df41027c62600524faf2352baf7a39d48c9671647e1d01e9c80ca3cdcb6278f7e71b1fa22dd866fe10c933b6f4f394ac66eae789619a9e6e80
+  metadata.gz: 4c8c79d444285e835e753fe1582147a30de11bf96a9d3d18f2af54b116ff315937000a88ab1a2a8b1c89de767ac0692d95125bbbc01557cd42ed808c96173d68
+  data.tar.gz: bbe8db2c4bdbe6f0df3eea079de83795ef4638437268ef779d5231ea8c3afde337e437335ff30a6899ab92d1defb8760f384f02b72c59524b842beefcd67b151

data/README.md

@@ -18,7 +18,7 @@ Muzak is still a work in process. Don't expect stability or pleasant output.
 On the command-line:
 
 ```shell
-$ ruby -Ilib bin/muzak.rb # flags: --verbose, --debug
+$ ruby -Ilib bin/muzak.rb
 muzak> help
 ```
 
@@ -37,4 +37,3 @@ $ ruby -Ilib bin/muzak-cmd "command"
 * current indexing/sorting logic is terrible
 * all the documentation
 * readline's tab complete is terrible with spaces (maybe use `bond`?)
-* replace YAML index with a more space/time efficient format (JSON, msgpack, Marshal?)

data/bin/muzak

@@ -4,14 +4,9 @@ require "muzak"
 require "readline"
 require "shellwords"
 
-opts = {
-  debug: ARGV.include?("--debug") || ARGV.include?("-d"),
-  verbose: ARGV.include?("--verbose") || ARGV.include?("-v"),
-}
+Thread.abort_on_exception = Muzak::Config.debug
 
-Thread.abort_on_exception = opts[:debug]
-
-muzak = Muzak::Instance.new(opts)
+muzak = Muzak::Instance.new
 
 COMMANDS = Muzak::Cmd.commands
 

data/bin/muzakd

@@ -3,15 +3,10 @@
 require "muzak"
 require "shellwords"
 
-opts = {
-  debug: ARGV.include?("--debug") || ARGV.include?("-d"),
-  verbose: ARGV.include?("--verbose") || ARGV.include?("-v"),
-}
+Process.daemon unless Muzak::Config.debug || Muzak::Config.verbose
+Thread.abort_on_exception = Muzak::Config.debug
 
-Process.daemon unless opts[:debug] || opts[:verbose]
-Thread.abort_on_exception = opts[:debug]
-
-muzak = Muzak::Instance.new(opts)
+muzak = Muzak::Instance.new
 
 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

data/lib/muzak/config.rb

@@ -6,6 +6,8 @@ module Muzak
       @config = YAML::load_file(CONFIG_FILE)
     else
       @config = {
+        "debug" => false,
+        "verbose" => false,
         "music" => File.expand_path("~/music"),
         "player" => "mpv",
         "index-autobuild" => 86400,

data/lib/muzak/const.rb

@@ -1,9 +1,9 @@
 module Muzak
-  VERSION = "0.0.10".freeze
+  VERSION = "0.0.11".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
+  INDEX_FILE = File.join(CONFIG_DIR, "index.dat").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

data/lib/muzak/index.rb

@@ -9,7 +9,7 @@ module Muzak
 
       if File.exist?(INDEX_FILE)
         verbose "loading index from #{INDEX_FILE}"
-        @hash = YAML::load_file(INDEX_FILE)
+        @hash = Marshal::load(File.read INDEX_FILE)
         return unless outdated?
       end
 
@@ -19,7 +19,9 @@ module Muzak
     def build!
       @hash = build_index_hash!
 
-      File.open(INDEX_FILE, "w") { |io| io.write @hash.to_yaml }
+      debug "indexed #{albums.length} albums by #{artists.length} artists"
+
+      File.open(INDEX_FILE, "w") { |io| io.write Marshal::dump @hash }
     end
 
     def deep?
@@ -35,19 +37,21 @@ module Muzak
     end
 
     def artists
-      @hash["artists"].keys
+      @artists ||= @hash["artists"].keys
     end
 
     def albums
-      albums_hash = {}
+      @albums_hash ||= begin
+        albums_hash = {}
 
-      artists.each do |a|
-        @hash["artists"][a]["albums"].each do |title, album_hash|
-          albums_hash[title] = Album.new(title, album_hash)
+        artists.each do |a|
+          @hash["artists"][a]["albums"].each do |title, album_hash|
+            albums_hash[title] = Album.new(title, album_hash)
+          end
         end
-      end
 
-      albums_hash
+        albums_hash
+      end
     end
 
     def album_names
@@ -55,9 +59,12 @@ module Muzak
     end
 
     def albums_by(artist)
-      error "no such artist: '#{artist}'" unless @hash["artists"].key?(artist)
-
-      @hash["artists"][artist]["albums"].map { |title, album| Album.new(title, album) }
+      if artists.include?(artist)
+        @hash["artists"][artist]["albums"].map { |title, album| Album.new(title, album) }
+      else
+        error "no such artist: '#{artist}'" unless @hash["artists"].key?(artist)
+        []
+      end
     end
 
     def jukebox(count = 50)

data/lib/muzak/instance.rb

@@ -15,9 +15,6 @@ module Muzak
     attr_reader :index, :player, :plugins, :playlists
 
     def initialize(opts = {})
-      $debug = opts[:debug]
-      $verbose = opts[:verbose]
-
       verbose "muzak is starting..."
 
       @index = Index.new(Config.music, deep: Config.deep_index)
@@ -37,7 +34,7 @@ module Muzak
       plugins.each do |plugin|
         Thread.new do
           plugin.send(type, *args)
-        end.join
+        end
       end
     end
   end

data/lib/muzak/utils.rb

@@ -9,7 +9,7 @@ module Muzak
     end
 
     def music?(filename)
-      [".mp3", ".flac", ".m4a", ".wav", ".ogg", ".oga", ".opus"].include?(File.extname(filename))
+      [".mp3", ".flac", ".m4a", ".wav", ".ogg", ".oga", ".opus"].include?(File.extname(filename.downcase))
     end
 
     def album_art?(filename)
@@ -17,11 +17,11 @@ module Muzak
     end
 
     def debug?
-      !!$debug
+      Config.debug
     end
 
     def verbose?
-      !!$verbose
+      Config.verbose
     end
 
     def pretty(color = :none, str)

metadata

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