druzy-protocol-plugin-upnp 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751e1986eae403b671a3c1f26f3eb897e2defd90
-  data.tar.gz: fe4b7c3d1b39aac7c85589ab8f21a935bfcd1850
+  metadata.gz: 12bfde020b1c1459f480e2fdb040df24f0f1a494
+  data.tar.gz: 27ead9847637fceb7481627847b06b4425f7056b
 SHA512:
-  metadata.gz: 4f850c0059b9efb9c1367deb93dfb9ba3fd7f043d27d603b1839d30639dc2de39ed4f0c63e01a4dd999eabea135584106e51cc40606b8f6304cd5b4b27f632b8
-  data.tar.gz: b47b0283e4253da3dd1cde8b1fe7f3320acf95a723f3b45d2362750d28607b09bb405aee16c296492f623e5ced9d6756ccec181b0b20893cf41269496a1fd35a
+  metadata.gz: 1f21e48242a26aee06021d4bae205851dd8b5ac778f2254ef93dafbd26c73ca923c95a5755ed3278b7ac14d44db6266697d654f3eb314814652ca2ca2ce90d28
+  data.tar.gz: 4f1e6890821e754284048e1d92942e913865092892269a4b6a1c9e7d1a6bd10bd1927a1e8077a1f0f5cc46eb277109a78b8aa806723aa32467f2c0419626b936

data/lib/druzy/protocol/plugin/upnp.rb

@@ -1,8 +1,10 @@
-require 'druzy/protocol/plugin/upnp/version'
+require_relative 'upnp/version'
+
 require 'druzy/server'
-require 'easy_upnp/ssdp_searcher'
+require 'druzy/upnp/ssdp'
 require 'filemagic'
-require 'nokogiri'
+
+require 'druzy/protocol' if $0 == __FILE__
 
 module Druzy
   module Protocol
@@ -13,21 +15,14 @@ module Druzy
         
         class UpnpDiscoverer < Druzy::Protocol::Discoverer
           
-          @@urn_connection_manager='urn:schemas-upnp-org:service:ConnectionManager:1'
-          @@urn_rendering_control='urn:schemas-upnp-org:service:RenderingControl:1'
-          
-          def start_discoverer(delay=10, identifier=nil)
-            searcher = EasyUpnp::SsdpSearcher.new
-            devices = searcher.search('upnp:rootdevice')
-            for device in devices
-              begin
-                if device.all_services.include?(@@urn_connection_manager) && device.all_services.include?(@@urn_rendering_control) 
-                  if block_given?
-                    yield(UpnpRenderer.new(device))
-                  end
-                end             
-              rescue
-              
+          @@urn_media_renderer = "urn:schemas-upnp-org:device:MediaRenderer:1"
+                    
+          def start_discoverer(args={})
+            args[:delay] ||=10
+            args[:identifier] ||=@@urn_media_renderer
+            searcher = Druzy::Upnp::Ssdp.new.search(args[:identifier], args[:delay]) do |device|
+              if block_given?
+                yield UpnpRenderer.new(device)
               end
             end
           end
@@ -41,51 +36,41 @@ module Druzy
         
         class UpnpRenderer < Druzy::Protocol::Renderer
           
-          def initialize(easy_upnp)
-            @av_transport = easy_upnp.service('urn:schemas-upnp-org:service:AVTransport:1')
-            @rendering_control = easy_upnp.service('urn:schemas-upnp-org:service:RenderingControl:1')
-            @connection_manager = easy_upnp.service('urn:schemas-upnp-org:service:ConnectionManager:1')
+          def initialize(druzy_device)
+            @druzy_device =  druzy_device
+
             @av_transport_id=nil
             @connection_id=nil
             @rcs_id=nil
             
-            document = open(easy_upnp.service_definition(easy_upnp.all_services.first)[:location]) { |f| f.read }
-            xml = Nokogiri::XML(document)
-            xml.remove_namespaces!
-            url_base=xml.xpath("//URLBase").text
-            url_icon=url_base+xml.xpath("//device/iconList/icon/url").first.text
-            
-            super(easy_upnp.uuid,"upnp",easy_upnp.device_name,url_icon)
+            super(@druzy_device.udn,"upnp",@druzy_device.friendly_name,@druzy_device.icon_list.first)
             
           end
           
           def play
-            @av_transport.Play({:InstanceID => @av_transport_id, :Speed => "1"})
+            @druzy_device.AVTransport.Play("InstanceID" => @av_transport_id, "Speed" => 1)
           end
           
           def pause
-            @av_transport.Pause({:InstanceID => @av_transport_id})
+            @druzy_device.AVTransport.Pause("InstanceID" => @av_transport_id)
           end
           
           def stop
-            puts "dans stop"
-            puts @av_transport.Stop({:InstanceID => @av_transport_id})
-            puts "apres"
+            @druzy_device.AVTransport.Stop("InstanceID" => @av_transport_id)
           end
           
           def send(file)
             #vérification du protocol
-            protocols = @connection_manager.GetProtocolInfo[:Sink]
+            protocols = @druzy_device.ConnectionManager.GetProtocolInfo["Sink"]
             mimetype=FileMagic.new(FileMagic::MAGIC_MIME_TYPE).file(file)
             ask_protocol="http-get:*:"+mimetype+":*"
             if protocols[ask_protocol] != nil
-              if @connection_id == nil || @av_transport_id == nil || rcs_id == nil
-                ids=@connection_manager.PrepareForConnection({:RemoteProtocolInfo => ask_protocol, :PeerConnectionManager => "/", :PeerConnectionID => -1, :Direction => "Output"})
-                @connection_id = ids[:ConnectionID]
-                @av_transport_id = ids[:AVTransportID]
-                @rcs_id = ids[:RcsID] 
+              if @connection_id == nil || @av_transport_id == nil || @rcs_id == nil
+                ids=@druzy_device.ConnectionManager.PrepareForConnection("RemoteProtocolInfo" => ask_protocol, "PeerConnectionManager" => "/", "PeerConnectionID" => -1, "Direction" => "Output")
+                @connection_id = ids["ConnectionID"]
+                @av_transport_id = ids["AVTransportID"]
+                @rcs_id = ids["RcsID"] 
               end
-              
               #ajout du fichier au serveur
               r=Druzy::Server::RestrictedFileServer.instance(PORT)
               r.add_file(file)
@@ -104,7 +89,7 @@ module Druzy
   </item>
 </DIDL-Lite>)
               #envoie de l'url au renderer
-              @av_transport.SetAVTransportURI({:InstanceID => @av_transport_id, :CurrentURI => r.get_address(file), :CurrentURIMetaData => xml})
+              @druzy_device.AVTransport.SetAVTransportURI("InstanceID" => @av_transport_id, "CurrentURI" => r.get_address(file), "CurrentURIMetaData" => xml)
             end
               
           end
@@ -120,16 +105,10 @@ if __FILE__ == $0
  
   
   up=Druzy::Protocol::Plugin::Upnp::UpnpDiscoverer.new
-  up.start_discoverer{ |device|
-    device.send("/home/druzy/elliot.mp4")
-    device.play
-    sleep(10)
-    device.pause
-    sleep(5)
-    device.play
-    sleep(5)
-    device.stop
-  }
+  up.start_discoverer(:delay => 10, :identifier => "uuid:aad2b343-11c8-346d-dd41-065160c19d82") do |device|
+    puts device.identifier
+    puts device.name
+  end
   
   Thread.list.each{|t| t.join if t!=Thread.main}
 end

data/lib/druzy/protocol/plugin/upnp/version.rb

@@ -2,7 +2,7 @@ module Druzy
   module Protocol
     module Plugin
       module Upnp
-        VERSION = "0.1.0"
+        VERSION = "0.2.0"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: druzy-protocol-plugin-upnp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Le Greneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: druzy-protocol
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: druzy-server
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: easy_upnp
+  name: druzy-upnp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: ruby-filemagic
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.6.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Plugin to discover a upnp media renderer