dacpclient 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cff4d4d1619ceb0c95d8b580555e2e52654a5d0
-  data.tar.gz: 9386ed35980f41b0c13d4a7984cc8e8380bc8dff
+  metadata.gz: ff09ad7307bbe342d0806c38c576a60b281845fe
+  data.tar.gz: 2672d25061e9704982a95969c3b91a4f22af53f2
 SHA512:
-  metadata.gz: 9c3b18e11267e973a749e6914cdc49d208272320b9f3894e00a2a2ec47d681ecd740a34ef01d690f9dd30034142d680232f37865afa230d81415fdfb8fedbcba
-  data.tar.gz: 89f07f9edb793880e2c04da6aafa0dd780457499abfa2251cb95cb33df644982e0bc5f91f5cd284119ce97e8e980cc6dee220aaa46db7091725103be7967e9eb
+  metadata.gz: 6e82b67093b1adc96ad84c80b8187e0f21a2906835553ee926c7eb49e3badb8f49c1b6432aeb88f91fba1a68af035b8a4d357a3bd4280ea42c336543381ab804
+  data.tar.gz: 190209f628221d59e98d534b1937bd4cb8381034ef941d00e6098fbac91943c69e953061fd7c7c7a745fd37e563ef264e5c0de395d713f10fd8b8da36663bcf7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2013, Jurriaan Pruis <email@jurriaanpruis.nl>
+Copyright (c) 2011-2014, Jurriaan Pruis <email@jurriaanpruis.nl>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -11,6 +11,8 @@ Look at the [bin/dacpclient](https://github.com/jurriaan/ruby-dacpclient/blob/ma
 
 ## Installation
 
+On Linux you need the avahi-dnssd-compat package (`libavahi-compat-libdnssd-dev` on Debian/Ubuntu).
+
 Add this line to your application's Gemfile:
 
     gem 'dacpclient'
@@ -28,7 +30,7 @@ Or install it yourself using:
 See [bin/dacpclient](https://github.com/jurriaan/ruby-dacpclient/blob/master/bin/dacpclient)
 
     Usage: dacpclient [command]
-    (c) 2013 Jurriaan Pruis <email@jurriaanpruis.nl>
+    (c) 2014 Jurriaan Pruis <email@jurriaanpruis.nl>
 
     Where command is one of the following:
     status

data/bin/dacpclient

@@ -11,10 +11,11 @@ class CLIClient
   def initialize
     @config = {}
     @config['client_name'] ||= "DACPClient (#{Socket.gethostname})"
+    @config['host'] ||= 'localhost'
     load_config
 
-    @client = DACPClient::Client.new(@config['client_name'], 'localhost', 3689)
-    if @config['guid'].nil? || @config['guid'] !~ /^[a-f0-9]{16}$/
+    @client = DACPClient::Client.new(@config['client_name'], @config['host'], 3689)
+    if @config['guid'].nil? || @config['guid'] !~ /^[A-F0-9]{16}$/
       @config['guid'] = @client.guid
       save_config
     end
@@ -42,9 +43,13 @@ class CLIClient
       artist = status.cana
       album = status.canl
       playstatus = status.caps != 4 ? '❙❙' : '▶ '
-      remaining = status.cant
-      total = status.cast
-      current = total - remaining
+      current = 0
+      total = 0
+      if status.cast? && status.cant?
+        remaining = status.cant
+        total = status.cast
+        current = total - remaining
+      end
       puts "[#{format_time(current)}/#{format_time(total)}] #{playstatus} #{name} - #{artist} (#{album})"
     end
   end
@@ -62,9 +67,13 @@ class CLIClient
           artist = status.cana
           album = status.canl
           playstatus = status.caps != 4 ? '❙❙' : '▶ '
-          total = status.cast
-          remaining = status.cant
-          current = total - remaining + [((Time.now.to_f * 1000.0) - status_time), 0].max
+          current = 0
+          total = 0
+          if status.cast? && status.cant?
+            remaining = status.cant
+            total = status.cast
+            current = total - remaining + [((Time.now.to_f * 1000.0) - status_time), 0].max
+          end
           print "\r\033[K[#{format_time(current)}/#{format_time(total)}] #{playstatus} #{name} - #{artist} (#{album})"
         end
       end
@@ -91,6 +100,14 @@ class CLIClient
     puts "Got your Home Sharing GUID (#{guid}). Logging in.."
     login
   end
+  
+  def hostname
+    puts "Please enter a new hostname to connect to:"
+    @config['host'] = $stdin.gets.strip
+    save_config
+    @client = DACPClient::Client.new(@config['client_name'], @config['host'], 3689)
+    status
+  end
 
   def play
     login

data/lib/dacpclient/client.rb

@@ -22,7 +22,7 @@ module DACPClient
       'Viewer-Only-Client' => '1',
       # 'Accept-Encoding' => 'gzip',
       'Connection' => 'keep-alive',
-      'User-Agent' => 'Remote/2.0'
+      'User-Agent' => 'RubyDACPClient/' + VERSION
     }.freeze
 
     def initialize(name, host = 'localhost', port = 3689)
@@ -38,6 +38,18 @@ module DACPClient
       @client = Faraday.new(url: @uri.to_s)
     end
 
+    [:play, :playpause, :stop, :pause, 
+     :nextitem, :previtem, :getspeakers].each do |action_name|
+      define_method action_name do 
+        do_action action_name
+      end
+    end
+    
+    alias_method :previous, :previtem
+    alias_method :prev, :previtem
+    alias_method :next, :nextitem
+    alias_method :speakers, :getspeakers
+
     def setup_home_sharing(user, password)
       hs_client = Faraday.new(url: HOME_SHARING_HOST)
       result = hs_client.post do |request|
@@ -54,7 +66,7 @@ module DACPClient
     def guid
       return @guid unless @guid.nil?
       d = Digest::SHA2.hexdigest(@name)
-      d[0..15]
+      d[0..15].upcase
     end
 
     def pair(pin)
@@ -93,25 +105,9 @@ module DACPClient
       do_action('content-codes', {}, true)
     end
 
-    def play
-      do_action(:play)
-    end
-
-    def playpause
-      do_action(:playpause)
-    end
-
-    def stop
-      do_action(:stop)
-    end
-
-    def pause
-      do_action(:pause)
-    end
-
     def track_length
       response = do_action(:getproperty, properties: 'dacp.playingtime')
-      response['cast']
+      response.cast? ? response['cast'] : 0
     end
 
     def seek(ms)
@@ -120,7 +116,7 @@ module DACPClient
 
     def position
       response = do_action(:getproperty, properties: 'dacp.playingtime')
-      response['cast'] - response['cant']
+      response.cast? ? (response['cast'] - response['cant']) : 0
     end
 
     alias_method :position=, :seek
@@ -138,16 +134,6 @@ module DACPClient
       end
     end
 
-    def next
-      do_action(:nextitem)
-    end
-
-    def prev
-      do_action(:previtem)
-    end
-
-    alias_method :previous, :prev
-
     def volume
       response = do_action(:getproperty, properties: 'dmcp.volume')
       response[:cmvo]
@@ -175,10 +161,6 @@ module DACPClient
       do_action(:setproperty, 'dmcp.shufflestate' => shufflestate)
     end
 
-    def speakers
-      do_action(:getspeakers)
-    end
-
     def ctrl_int
       do_action('ctrl-int', {}, true)
     end
@@ -271,7 +253,7 @@ module DACPClient
 
       parse_result result
     end
-
+    
     def parse_result(result)
       if !result.success?
         fail DACPForbiddenError, result

data/lib/dacpclient/pairingserver.rb

@@ -34,7 +34,7 @@ module DACPClient
 
     def self.generate_pin_challenge(pair, pin)
       pin_string = pin.map { |i| "#{i}\x00" }.join
-      Digest::MD5.hexdigest(pair + pin_string)
+      Digest::MD5.hexdigest(pair.upcase + pin_string)
     end
 
     def serve(client)
@@ -59,7 +59,7 @@ module DACPClient
         'DvTy' => @device_type,
         'RemN' => 'Remote',
         'txtvers' => '1',
-        'Pair' => @pair
+        'Pair' => @pair.upcase
       )
     end
 

data/lib/dacpclient/tag_container.rb

@@ -35,7 +35,9 @@ module DACPClient
     end
 
     def method_missing(method, *arguments, &block)
-      if has?(method)
+      if method =~ /(.*)\?$/
+        has?($1)
+      elsif has?(method)
         get_value(method)
       else
         super

data/lib/dacpclient/version.rb

@@ -1,4 +1,4 @@
 # The DACPClient module
 module DACPClient
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dacpclient
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jurriaan Pruis