dacpclient 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c56df86793fd1624160851a47545719c55b087
-  data.tar.gz: a62913732101151597a1f8d3d3243e545c7c375a
+  metadata.gz: 75fdfc2a63bf7ff3c54194931d3a8475ad297f44
+  data.tar.gz: b3a5fe9f909c13a9ef96d7e8b6dd97d40db0d682
 SHA512:
-  metadata.gz: 0ec5d69af7e39d2ed18dd4ba99c8104c5943aa79e5dc5e4210242a049719b8c2c60cf5c1503437d161426fa238f664f96c05de37996198d129e1655733f61239
-  data.tar.gz: 87c00eeb87f5e09919fe4a4c3bd3e964e2e916cf34c4320ec0f145dfe18a274a401dc2632523aec05ca2d4a45ceffd43c614e5111b6756e85b965f708e3f834d
+  metadata.gz: ca6dee63a426109a45be94fa670ef322d2f7623576157727fba03fb056829f94f0bc731c9b216dc4480552743d76ef2dc13dec8259582f6196ef1fef328440d2
+  data.tar.gz: e1a8d069672cd29e0546cdfb8c3b766244ac0880fc8e627f857a89667936c6cdb18821ceb6b38560d89d26fdc43987bbd092f3740a7901d80bcadd00e147efd6

data/README.md

@@ -29,7 +29,7 @@ Or install it yourself using:
 
 See [bin/dacpclient](https://github.com/jurriaan/ruby-dacpclient/blob/master/bin/dacpclient)
 
-    DACPClient v0.3.0
+    DACPClient v0.3.1
     (c) 2014 Jurriaan Pruis <email@jurriaanpruis.nl>
 
     DACPClient commands:
@@ -37,11 +37,11 @@ See [bin/dacpclient](https://github.com/jurriaan/ruby-dacpclient/blob/master/bin
       dacpclient help [COMMAND]  # Describe available commands or one specific command
       dacpclient hostname        # Set the hostname
       dacpclient next            # Go to next item
-      dacpclient pause           # Pause Playing
+      dacpclient pause           # Pause playing
       dacpclient play            # Start playing
       dacpclient play_playlist   # Plays a playlist
       dacpclient playlists       # Show the playlists
-      dacpclient playpause       # Toggle Playing
+      dacpclient playpause       # Toggle playing
       dacpclient prev            # Go to previous item
       dacpclient status          # Shows the status of the DACP server
       dacpclient stop            # Stop playing
@@ -59,6 +59,7 @@ See [bin/dacpclient](https://github.com/jurriaan/ruby-dacpclient/blob/master/bin
 
 ## Contributors
 
+- [Daisuke Shimamoto](https://github.com/diskshima)
 - [Jurriaan Pruis](https://github.com/jurriaan)
 
 ## Thanks

data/bin/dacpclient

@@ -18,8 +18,7 @@ class CLIClient < Thor
     @config = {}
     @config['client_name'] ||= "DACPClient (#{Socket.gethostname})"
     @config['host'] ||= 'localhost'
-    @config['known_databases'] ||= []
-
+    @config['known_services'] ||= []
     load_config
 
     if @config['guid'].nil? || @config['guid'] !~ /^[A-F0-9]{16}$/
@@ -34,24 +33,27 @@ class CLIClient < Thor
 
     3.times do
       browser.browse
-      database = browser.devices.find do |device|
-        @config['known_databases'].include? device.database_id
+      database = browser.services.find do |service|
+        @config['known_services'].include? service.name
       end
       break if database
       sleep 0.5
     end
 
+    pin = @config['pin'].to_s.chars.map { |num| num.to_i }
+
     unless database
-      pin = 4.times.map { Random.rand(10) } if pin.nil?
+      pin = 4.times.map { Random.rand(10) } if pin.empty?
       puts 'Cannot find paired Libraries, waiting for a pair request..'
       puts "Pincode: #{pin}"
       pairserver = DACPClient::PairingServer.new(@config['client_name'],
                                                  @config['guid'])
       pairserver.pin = pin
       database = pairserver.start
-      @config['known_databases'] << database.database_id
+      @config['known_services'] << database.name
       save_config
     end
+
     @client = DACPClient::Client.new(@config['client_name'], database.host,
                                      database.port)
     @client.guid = @config['guid']
@@ -237,6 +239,7 @@ class CLIClient < Thor
         end
       end
     end
+
     loop do
       status = @client.status true
       start_time = Time.now.to_f * 1000.0
@@ -252,10 +255,11 @@ class CLIClient < Thor
       @client.login
     end
     @login = true
-    if @client.host != @config['host']
-      @config['host'] = @client.host
-      save_config
-    end
+
+    return if @client.host == @config['host']
+
+    @config['host'] = @client.host
+    save_config
   end
 
   def format_time(millis)
@@ -299,8 +303,8 @@ class CLIClient < Thor
   end
 
   def clean_config
-    @config['known_databases'].delete('')
-    @config['known_databases'].uniq!
+    @config['known_services'].delete('')
+    @config['known_services'].uniq!
   end
 
   def save_config

data/lib/dacpclient/browser.rb

@@ -4,34 +4,34 @@ require 'ostruct'
 module DACPClient
   # The Client class handles communication with the server
   class Browser
-    class Device < Struct.new(:host, :port, :text_records)
-      def name
-        text_records['Machine Name'] || text_records['CtlN']
+    class Service < Struct.new(:name, :host, :port, :text_records)
+      def library_name
+        text_records['CtlN'] || text_records['Machine Name']
       end
 
       def database_id
-        text_records['Database ID'] || text_records['DbId']
+        text_records['DbId'] || text_records['Database ID']
       end
     end
 
     DAAP_SERVICE = '_daap._tcp'.freeze
     TOUCHABLE_SERVICE = '_touch-able._tcp'.freeze
 
-    attr_reader :devices
+    attr_reader :services
 
     def initialize
-      @devices = []
+      @services = []
     end
 
     def browse
-      @devices = []
+      @services = []
       timeout(5) do
         DNSSD.browse!(TOUCHABLE_SERVICE) do |node|
           resolve(node)
           break unless node.flags.more_coming?
         end
       end
-      devices
+      services
     rescue Timeout::Error # => e
       []
     end
@@ -39,8 +39,8 @@ module DACPClient
     private
 
     def node_resolver(_node, resolved)
-      devices << Device.new(get_device_host(resolved), resolved.port,
-                            resolved.text_record)
+      services << Service.new(resolved.name, get_device_host(resolved),
+                              resolved.port, resolved.text_record)
 
       resolved.flags.more_coming?
     end

data/lib/dacpclient/pairingserver.rb

@@ -29,7 +29,6 @@ module DACPClient
       @browser = DACPClient::Browser.new
       @browser.browse
 
-      PairInfo.new(DMAPParser::Parser.parse(@pairing_string))
       super
       join
 
@@ -46,10 +45,11 @@ module DACPClient
 
     def serve(client)
       data = client.gets
-      peer_addr = client.peeraddr[2]
-      @peer = @browser.devices.find do |device|
-        device.host == peer_addr
+
+      @peer = @browser.services.find do |service|
+        data =~ /servicename=#{service.name}/i
       end
+
       if data =~ /pairingcode=#{@expected}/i && @peer
         client.print "HTTP/1.1 200 OK\n" \
                      "Content-Length: #{@pairing_string.length}\n\n"

data/lib/dacpclient/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dacpclient
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday