muzak 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2083f3ba445039c9dea5b52f8bd2383238eb4ea7
-  data.tar.gz: c3b1aaca1e968d7da6c104549c63cd8adfb23a3c
+  metadata.gz: 66effe9b1b141471424f8fb07923b88ecf87da80
+  data.tar.gz: a79283a7dd22bbb754ba3a7ed5b9db7ba32aa99b
 SHA512:
-  metadata.gz: 62a18069ad690e2c07fe3a87840a32b3d02c0f82f041c05dca890db1a0637c0d5c935d06665c03276f2878f2eadbda1fec7bd0a2db0173cfa1fc94cde522fda6
-  data.tar.gz: 7f147ea2f6002c33e3e8fd6a996b0d4a136408e7dc556ca8d44510befd67514cbdae541bd98f5c64142d3ede5370d0fe5e38a72e74d4f0b7d1fa238c9a8c125e
+  metadata.gz: 80990917d255f3dc96570cf9389ed1238701382b9c096ceac2de8ee6cfce606b90808ebe253ce1764dda18b880eed4b05c11b75d244008ff855f20643c22fca9
+  data.tar.gz: 4f1bf3964aef17d1a060590162bf5ca16cfcef1f733423c20116e7b3b972bb7df363d12f38b0ada0cb31286ba49c0933823d98de704c9f845e8def882bbdfba2

data/README.md

@@ -33,8 +33,8 @@ $ ruby -Ilib bin/muzak-cmd "command"
 ### TODO
 
 * GUI "frontend"?
-* optional "deep" index containing ID3 tags
 * isolation of art and music output (`Muzak::ArtProvider`?)
 * 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-dmenu

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require "muzak"
+
+def fatal(msg)
+  puts "Fatal: #{msg}"
+  exit 1
+end
+
+def dmenu(options)
+	opts = options.join("\n")
+	`printf "#{opts}" | dmenu`
+end
+
+fifo_path = File.join(Muzak::CONFIG_DIR, "muzak.fifo")
+
+fatal "Is muzakd running?" unless File.exist?(fifo_path)
+
+command = dmenu Muzak::Cmd.commands
+
+File.open(fifo_path, "w") do |io|
+  io.puts command unless command.empty?
+end

data/lib/muzak/album.rb

@@ -2,10 +2,18 @@ module Muzak
   class Album
     attr_reader :title, :songs, :cover_art
 
+    # instead of passing an album hash directly from the index,
+    # this should really just take a title and an array of Song
+    # objects.
     def initialize(title, album_hash)
       @title = title
-      @songs = album_hash["songs"].map { |s| Song.new(s) }
       @cover_art = album_hash["cover"]
+
+      if album_hash["deep-songs"]
+        @songs = album_hash["deep-songs"]
+      else
+        @songs = album_hash["songs"].map { |s| Song.new(s) }
+      end
     end
   end
 end

data/lib/muzak/cmd/config.rb

@@ -21,7 +21,8 @@ module Muzak
       @config = {
         "music" => File.expand_path("~/music"),
         "player" => "mpv",
-        "index-autobuild" => 86400
+        "index-autobuild" => 86400,
+        "deep-index" => false
       }
 
       Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)

data/lib/muzak/cmd/index.rb

@@ -18,7 +18,7 @@ module Muzak
     end
 
     def index_load
-      debug "loading index from #{INDEX_FILE}"
+      verbose "loading index from #{INDEX_FILE}"
 
       @index = Index.load_index(INDEX_FILE)
 
@@ -33,7 +33,9 @@ module Muzak
     def index_build(*args)
       warn_arity(args, 0)
 
-      @index = Index.new(@config["music"])
+      verbose "building a new index, this may take a while"
+
+      @index = Index.new(@config["music"], deep: !!@config["deep-index"])
       _index_sync
     end
 
@@ -59,7 +61,7 @@ module Muzak
       artist = args.join(" ")
       return if artist.nil?
 
-      puts @index.albums_by(artist).keys
+      puts @index.albums_by(artist).map(&:title)
     end
 
     def songs_by_artist(*args)
@@ -68,7 +70,7 @@ module Muzak
       artist = args.join(" ")
       return if artist.nil?
 
-      puts @index.songs_by(artist)
+      puts @index.songs_by(artist).map(&:title)
     end
   end
 end

data/lib/muzak/cmd/player.rb

@@ -44,12 +44,8 @@ module Muzak
       artist = args.join(" ")
       return if artist.nil?
 
-      album_hashes = @index.albums_by(artist)
-      return if album_hashes.empty?
-
-      albums = album_hashes.map do |album_name, album_hash|
-        Album.new(album_name, album_hash)
-      end
+      albums = @index.albums_by(artist)
+      return if albums.empty?
 
       albums.each do |album|
         @player.enqueue_album album
@@ -60,10 +56,10 @@ module Muzak
       album_name = args.join(" ")
       return if album_name.nil?
 
-      album_hash = @index.albums[album_name]
-      return if album_hash.nil?
-
-      album = Album.new(album_name, album_hash)
+      debug album_name
+      album = @index.albums[album_name]
+      debug album.to_s
+      return if album.nil?
 
       @player.enqueue_album album
     end
@@ -71,7 +67,7 @@ module Muzak
     def jukebox(*args)
       count = args.shift || @config["jukebox-size"]
 
-      songs = @index.jukebox(count.to_i).map { |s| Song.new(s) }
+      songs = @index.jukebox(count.to_i)
 
       songs.each { |s| @player.enqueue_song s }
     end

data/lib/muzak/cmd/playlist.rb

@@ -67,10 +67,8 @@ module Muzak
       album_name = args.join(" ")
       return if album_name.nil?
 
-      album_hash = @index.albums[album_name]
-      return if album_hash.nil?
-
-      album = Album.new(album_name, album_hash)
+      album = @index.albums[album_name]
+      return if album.nil?
 
       album.songs.each { |song| @playlist.add song }
 

data/lib/muzak/const.rb

@@ -1,5 +1,5 @@
 module Muzak
-  VERSION = "0.0.5".freeze
+  VERSION = "0.0.6".freeze
 
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze
   CONFIG_FILE = File.join(CONFIG_DIR, "muzak.yml").freeze

data/lib/muzak/index.rb

@@ -10,10 +10,11 @@ module Muzak
       instance
     end
 
-    def initialize(tree)
+    def initialize(tree, deep: false)
       @hash = {
         "timestamp" => Time.now.to_i,
-        "artists" => {}
+        "artists" => {},
+        "deep" => deep
       }
 
       Dir.entries(tree).each do |artist|
@@ -28,17 +29,27 @@ module Muzak
 
           @hash["artists"][artist]["albums"][album] = {}
           @hash["artists"][artist]["albums"][album]["songs"] = []
+          @hash["artists"][artist]["albums"][album]["deep-songs"] = []
 
           Dir.glob(File.join(tree, artist, album, "**")) do |file|
             @hash["artists"][artist]["albums"][album]["cover"] = file if album_art?(file)
-            @hash["artists"][artist]["albums"][album]["songs"] << file if music?(file)
+
+            if music?(file)
+              @hash["artists"][artist]["albums"][album]["songs"] << file
+              @hash["artists"][artist]["albums"][album]["deep-songs"] << Song.new(file)
+            end
           end
 
           @hash["artists"][artist]["albums"][album]["songs"].sort!
+          @hash["artists"][artist]["albums"][album]["deep-songs"].sort_by!(&:track)
         end
       end
     end
 
+    def deep?
+      !!@hash["deep"]
+    end
+
     def artists
       @hash["artists"].keys
     end
@@ -47,8 +58,8 @@ module Muzak
       albums_hash = {}
 
       artists.each do |a|
-        @hash["artists"][a]["albums"].keys.each do |ak|
-          albums_hash[ak] = @hash["artists"][a]["albums"][ak]
+        @hash["artists"][a]["albums"].each do |title, album_hash|
+          albums_hash[title] = Album.new(title, album_hash)
         end
       end
 
@@ -62,25 +73,27 @@ module Muzak
     def albums_by(artist)
       error "no such artist: '#{artist}'" unless @hash["artists"].key?(artist)
 
-      begin
-        @hash["artists"][artist]["albums"]
-      rescue Exception => e
-        {}
-      end
+      @hash["artists"][artist]["albums"].map { |title, album| Album.new(title, album) }
     end
 
     def jukebox(count = 50)
       @all_albums ||= @hash["artists"].map { |_, a| a["albums"] }.flatten
-      @all_songs ||= @all_albums.map { |aa| aa.map { |_, a| a["songs"] } }.flatten
-      @all_songs.sample(count)
+
+      if deep?
+        @all_deep_songs ||= @all_albums.map { |aa| aa.map { |_, a| a["deep-songs"] } }.flatten
+        @all_deep_songs.sample(count)
+      else
+        @all_songs ||= @all_albums.map { |aa| aa.map { |_, a| a["songs"] } }.flatten
+        @all_songs.sample(count).map { |s| Song.new(s) }
+      end
     end
 
     def songs_by(artist)
       error "no such artist: '#{artist}'" unless @hash["artists"].key?(artist)
 
       begin
-        albums_by(artist).map do |_, album|
-          album["songs"].map { |s| File.basename(s) }.sort
+        albums_by(artist).map do |album|
+          album.songs
         end.flatten
       rescue Exception => e
         []

data/lib/muzak/song.rb

@@ -11,7 +11,7 @@ module Muzak
 
       TagLib::FileRef.open(path) do |ref|
         break if ref.null?
-        @title = ref.tag.title || File.basename(path, File.extname(path))
+        @title = ref.tag.title
         @artist = ref.tag.artist
         @album = ref.tag.album
         @year = ref.tag.year
@@ -20,6 +20,10 @@ module Muzak
         @comment = ref.tag.comment
         @length = ref.audio_properties.length
       end
+
+      # provide some sane fallbacks
+      @title ||= File.basename(path, File.extname(path))
+      @track ||= 0 # we'll need to sort by track number
     end
 
     def best_guess_album_art

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby
@@ -30,6 +30,7 @@ executables:
 - muzak
 - muzakd
 - muzak-cmd
+- muzak-dmenu
 extensions: []
 extra_rdoc_files: []
 files:
@@ -37,6 +38,7 @@ files:
 - README.md
 - bin/muzak
 - bin/muzak-cmd
+- bin/muzak-dmenu
 - bin/muzakd
 - lib/muzak.rb
 - lib/muzak/album.rb