dacpclient 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75fdfc2a63bf7ff3c54194931d3a8475ad297f44
-  data.tar.gz: b3a5fe9f909c13a9ef96d7e8b6dd97d40db0d682
+  metadata.gz: d3655dc2c114e8a4aa0e4526ec54497b5369feb1
+  data.tar.gz: d0cba7a839a858361f9f6e253c03c129667bca1b
 SHA512:
-  metadata.gz: ca6dee63a426109a45be94fa670ef322d2f7623576157727fba03fb056829f94f0bc731c9b216dc4480552743d76ef2dc13dec8259582f6196ef1fef328440d2
-  data.tar.gz: e1a8d069672cd29e0546cdfb8c3b766244ac0880fc8e627f857a89667936c6cdb18821ceb6b38560d89d26fdc43987bbd092f3740a7901d80bcadd00e147efd6
+  metadata.gz: 99a79a86d06f1ff9594c4e97fd9ba77d9fba3432378a2a27315fc1e3d647af2eeba56751c3bd78740ef8e90482c33d1a438be7b667ec6c008389b6ce756f7a7d
+  data.tar.gz: e8b30bce34c24e55b82c78c4abad57b05aa0103b4f82202f7789f483f7962b04b7de82702b8675ed18c72c16ec47626f396093ca86c8bb6f298ce2d747cb7c22

data/Gemfile

@@ -2,5 +2,3 @@ gemspec
 
 source 'https://rubygems.org'
 
-gem 'minitest', '~> 5.4.0'
-gem 'rubocop', '~> 0.24.1'

data/bin/dacpclient

@@ -40,7 +40,7 @@ class CLIClient < Thor
       sleep 0.5
     end
 
-    pin = @config['pin'].to_s.chars.map { |num| num.to_i }
+    pin = @config['pin'].to_s.chars.map(&:to_i)
 
     unless database
       pin = 4.times.map { Random.rand(10) } if pin.empty?
@@ -131,6 +131,38 @@ class CLIClient < Thor
     puts
   end
 
+  desc :artists, 'Show the artists'
+  def artists
+    login
+    artists = @client.artists
+    puts 'Artists:'
+    puts '----------'
+    count = 0
+    num = Math.log10(artists.length).floor + 1
+    artists.each do |artist|
+      printf("%#{num}d. ", count += 1)
+
+      puts "#{artist.name} (#{artist.count} songs, #{artist.album_count} albums)"
+    end
+    puts
+  end
+
+  desc :albums, 'Show the albums'
+  def albums
+    login
+    albums = @client.albums
+    puts 'Albums:'
+    puts '----------'
+    count = 0
+    num = Math.log10(albums.length).floor + 1
+    albums.each do |album|
+      printf("%#{num}d. ", count += 1)
+
+      puts "#{album.name} [#{album.album_artist}] (#{album.count} songs)"
+    end
+    puts
+  end
+
   desc :play_playlist, 'Plays a playlist'
   def play_playlist(playlist)
     login

data/dacpclient.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'faraday', '~> 0.9.0'
   spec.add_runtime_dependency 'dnssd', '~> 2.0'
   spec.add_runtime_dependency 'plist', '~> 3.1.0'
-  spec.add_runtime_dependency 'dmapparser', '~> 0.1.0'
+  spec.add_runtime_dependency 'dmapparser', '~> 0.2.0'
   spec.add_runtime_dependency 'thor', '~> 0.19.1'
   spec.add_runtime_dependency 'fuzzy_match', '~> 2.1.0'
 
@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'github-markup'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop', '~> 0.27.1'
+  spec.add_development_dependency 'minitest', '~> 5.4.0'
 
   spec.required_ruby_version = '>= 2.0.0'
 end

data/lib/dacpclient/client.rb

@@ -15,6 +15,10 @@ require 'dacpclient/models/database'
 require 'dacpclient/models/databases'
 require 'dacpclient/models/playlist'
 require 'dacpclient/models/playlists'
+require 'dacpclient/models/artist'
+require 'dacpclient/models/artists'
+require 'dacpclient/models/album'
+require 'dacpclient/models/albums'
 require 'dacpclient/models/play_queue_item'
 require 'dacpclient/models/play_queue'
 
@@ -219,7 +223,7 @@ module DACPClient
     end
 
     def default_playlist(db = default_db)
-      playlists(db).find { |item| item.base_playlist? }
+      playlists(db).find(&:base_playlist?)
     end
 
     def artwork(database, id, width = 320, height = 320)
@@ -259,9 +263,23 @@ module DACPClient
                  com.apple.itunes.content-rating daap.songdatereleased
                  com.apple.itunes.movie-info-xml daap.songalbumartist
                  com.apple.itunes.extended-media-kind).join(',')
-      url = "databases/#{db.miid}/containers/#{container.miid}/items"
-      do_action(url, { query: q, type: 'music', sort: 'album', meta: meta,
-                       :'include-sort-headers' => 1 }, clean_url: true)
+      url = "databases/#{db.item_id}/containers/#{container.item_id}/items"
+      do_action(url, query: q, type: 'music', sort: 'album', meta: meta,
+                     :'include-sort-headers' => 1, clean_url: true)
+    end
+
+    def artists(db = default_db)
+      url = "databases/#{db.item_id}/groups"
+      meta = 'dmap.itemname,dmap.itemid,dmap.persistentid,daap.songartist,daap.groupalbumcount,daap.songartistid'
+      query = "('daap.songartist!:'+('com.apple.itunes.extended-media-kind:1','com.apple.itunes.extended-media-kind:32'))"
+      do_action(url, meta: meta, type: 'music', :'group-type' => 'artists', sort: 'album', :'include-sort-headers' => 1, query: query, clean_url: true, model: Artists).items
+    end
+
+    def albums(db = default_db)
+      url = "databases/#{db.item_id}/groups"
+      meta = 'dmap.itemname,dmap.itemid,dmap.persistentid,daap.songartist,daap.songalbumartist'
+      query = "('daap.songartist!:'+('com.apple.itunes.extended-media-kind:1','com.apple.itunes.extended-media-kind:32'))"
+      do_action(url, meta: meta, type: 'music', :'group-type' => 'albums', sort: 'artist', :'include-sort-headers' => 1, query: query, clean_url: true, model: Albums).items
     end
 
     private
@@ -286,6 +304,7 @@ module DACPClient
         params['session-id'] = @session_id.to_s
         action = '/ctrl-int/1' + action unless clean_url
       end
+
       params['hsgid'] = @hsgid unless @hsgid.nil?
       params = filter_param_keys(params)
       result = @client.get do |request|
@@ -299,13 +318,13 @@ module DACPClient
     end
 
     def filter_param_keys(params)
-      Hash[ params.map { |k, v| [k.to_s.tr('_', '-'), v] }]
+      Hash[params.map { |k, v| [k.to_s.tr('_', '-'), v] }]
     end
 
     def parse_result(result, model)
       if !result.success?
         fail DACPForbiddenError, result
-      elsif result.headers['Content-Type'] == 'application/x-dmap-tagged'
+      elsif result.headers['Content-Type'] == 'application/x-dmap-tagged' && result.body.length > 0
         res = DMAPParser::Parser.parse(result.body)
         model ? model.new(res) : res
       else

data/lib/dacpclient/models/album.rb

@@ -0,0 +1,10 @@
+module DACPClient
+  class Album < Model
+    dmap_tag :mlit
+    dmap_attribute :item_id, :miid
+    dmap_attribute :name, :minm
+    dmap_attribute :count, :mimc
+    dmap_attribute :album_artist, :asaa
+    dmap_attribute :persistent_id, :mper
+  end
+end

data/lib/dacpclient/models/albums.rb

@@ -0,0 +1,10 @@
+module DACPClient
+  class Albums < Model
+    dmap_tag :agal
+    dmap_attribute :status, :mstt
+    dmap_attribute :update_type, :muty
+    dmap_attribute :container_count, :mtco
+    dmap_attribute :returned_count, :mrco
+    dmap_container :items, :mlcl, DACPClient::Album
+  end
+end

data/lib/dacpclient/models/artist.rb

@@ -0,0 +1,11 @@
+module DACPClient
+  class Artist < Model
+    dmap_tag :mlit
+    dmap_attribute :item_id, :miid
+    dmap_attribute :name, :minm
+    dmap_attribute :count, :mimc
+    dmap_attribute :album_count, :agac
+    dmap_attribute :song_artist_id, :asri
+    dmap_attribute :persistent_id, :mper
+  end
+end

data/lib/dacpclient/models/artists.rb

@@ -0,0 +1,10 @@
+module DACPClient
+  class Artists < Model
+    dmap_tag :agar
+    dmap_attribute :status, :mstt
+    dmap_attribute :update_type, :muty
+    dmap_attribute :container_count, :mtco
+    dmap_attribute :returned_count, :mrco
+    dmap_container :items, :mlcl, DACPClient::Artist
+  end
+end

data/lib/dacpclient/version.rb

@@ -1,4 +1,4 @@
 # The DACPClient module
 module DACPClient
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dacpclient
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.27.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.27.1
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.4.0
 description: A DACP (iTunes Remote protocol) client
 email:
 - email@jurriaanpruis.nl
@@ -174,6 +202,10 @@ files:
 - lib/dacpclient/faraday/flatter_params_encoder.rb
 - lib/dacpclient/faraday/gzip.rb
 - lib/dacpclient/model.rb
+- lib/dacpclient/models/album.rb
+- lib/dacpclient/models/albums.rb
+- lib/dacpclient/models/artist.rb
+- lib/dacpclient/models/artists.rb
 - lib/dacpclient/models/database.rb
 - lib/dacpclient/models/databases.rb
 - lib/dacpclient/models/pair_info.rb
@@ -204,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A DACP (iTunes Remote protocol) client