muzak 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d298ab0d509e9b3cbf82b012a282ab8fe9fe7713
-  data.tar.gz: 1128e587b3f0d81ba2c0cbbd641dfb1e47cd9755
+  metadata.gz: dde0b299d121d7389c4ffc2e24c5239a6320ba92
+  data.tar.gz: bab3a86df140ae8b470d5781fb075b189ba7bc14
 SHA512:
-  metadata.gz: b12d25d6fc3854b96926b49e78e9e57becd903987f2a4ff9438b91d7a0bb942fae43a7cc3b7b3cec08464672b4017803f20bcecc4f6028ae6f157ec7f637d230
-  data.tar.gz: 99a06151ac245f18e4a03fb9c12dc1dda1a57848c09487b4d7a27b5e7bebdf49bb88a98ecdc982e9fe2681e61a6408f3345c99b4dfdc5708717b3245171e56e8
+  metadata.gz: 9244e21c503e122501659f1dcc58531f4b1ccc4764ac52a075b68be8c155d8e54ca3ce7e0e83043a368112e8dd4d4ec8a51f39a177a0b58678dd52f6dd570b2e
+  data.tar.gz: 274799ee46ae741ec52a36e2ddeba7072469f3503f297c887844091a62ad347a96673d42cc3b9df51ba6fccc352748df24f73fb780bfc1a5a81312bb976d867a

data/bin/muzak-index

@@ -0,0 +1,106 @@
+#!/usr/bin/env ruby
+
+require "muzak"
+
+VERSION = 1
+
+OPTS = {
+  deep: ARGV.delete("--deep") || ARGV.delete("-d"),
+  verbose: ARGV.delete("--verbose") || ARGV.delete("-V"),
+  help: ARGV.delete("--help") || ARGV.delete("-h"),
+  version: ARGV.delete("--version") || ARGV.delete("-v")
+}
+
+def help
+  puts <<~EOS
+    Usage: #{$PROGRAM_NAME} [options] <tree> [index]
+
+    Options:
+      --deep, -d      Build a "deep" index (contains metadata)
+      --verbose, -V   Be verbose while indexing
+      --help, -h      Print this help message
+      --version, -v   Print version information
+
+    Arguments:
+      [tree]          The filesystem tree to index (default: ~/music)
+      [index]         The saved index (default: ~/.config/muzak/index.dat)
+  EOS
+
+  exit
+end
+
+def version
+  puts "muzak-index version #{VERSION}."
+
+  exit
+end
+
+def info(msg)
+  puts "[\e[32minfo\e[0m]: #{msg}" if OPTS[:verbose]
+end
+
+def bail(msg)
+  STDERR.puts "[\e[31merror\e[0m]: #{msg}"
+  exit 1
+end
+
+help if OPTS[:help]
+version if OPTS[:version]
+
+tree = ARGV.shift || Muzak::Config.music
+bail "missing or invalid tree: <tree>" unless tree && File.exist?(tree)
+
+index_file = ARGV.shift || Muzak::INDEX_FILE
+
+index_hash = {
+  "tree" => tree,
+  "timestamp" => Time.now.to_i,
+  "artists" => {},
+  "deep" => OPTS[:deep]
+}
+
+Dir.entries(tree).each do |artist|
+  next unless File.directory?(File.join(tree, artist))
+  next if artist.start_with?(".")
+
+  info "indexing '#{artist}'..."
+
+  index_hash["artists"][artist] = {}
+  index_hash["artists"][artist]["albums"] = {}
+
+  Dir.entries(File.join(tree, artist)).each do |album|
+    next if album.start_with?(".")
+
+    info "\tindexing '#{album}'..."
+
+    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 Muzak::Utils.album_art?(file)
+
+      if Muzak::Utils.music?(file)
+        index_hash["artists"][artist]["albums"][album]["songs"] << file
+        if OPTS[:deep]
+          index_hash["artists"][artist]["albums"][album]["deep-songs"] << Muzak::Song.new(file)
+        end
+      end
+    end
+
+    index_hash["artists"][artist]["albums"][album]["songs"].sort!
+
+    # 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
+
+File.open(index_file, "w") { |io| io.write Marshal.dump index_hash }
+
+info "all done."

data/lib/muzak/const.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - William Woodruff
@@ -30,6 +30,7 @@ executables:
 - muzakd
 - muzak-cmd
 - muzak-dmenu
+- muzak-index
 extensions: []
 extra_rdoc_files: []
 files:
@@ -40,6 +41,7 @@ files:
 - README.md
 - bin/muzak-cmd
 - bin/muzak-dmenu
+- bin/muzak-index
 - bin/muzakd
 - lib/muzak.rb
 - lib/muzak/album.rb