upnp_content_explorer 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0079ca531ced3769fca89db2ad2929ba259f0ed
-  data.tar.gz: 0212adfceb533d5268059877c41cc9e3e493a5d3
+  metadata.gz: ab6a03172ad6faf495e4a04e7759640aea563d1f
+  data.tar.gz: c3511a497b1dcb9c1eb1d595fc27acd6c77f5336
 SHA512:
-  metadata.gz: c09b1d5d091861d1b749a92780ebbdc3990f3b4047ea7cb57c887c6eefe069bfa5c60b6413d5b50f6376644156b8a21d554d0eee51ca5f85c0cbc2c30ac8c4aa
-  data.tar.gz: 6e899e7d992baefed1db717d47dc49735a162384727fc57ba4ff5a37a38d6cdccd55d326aee57d868305a6d8f2aad0c605b1b60a3b30f26b925d1e516e03a833
+  metadata.gz: 06ea6df8eabc42005accde92cfd74bf276784bdbb374d2b14cd159b69cb7304403d2b0d0710ce6c585f40446c826aa235fd6a53bd6e90f21c84a0a1ee4becb9d
+  data.tar.gz: fb640564b9274545fe4497d942d8e7280345df1dd3d798b39296d4ae187f8f8722c7380a160b78fd1b147d80d3df000cb71452c89ae7861bed408e494cfc93f9

data/lib/upnp_content_explorer/explorer.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 require 'nokogiri'
 require 'nori'
 
@@ -8,21 +10,32 @@ module UpnpContentExplorer
   class PathNotFoundError < StandardError; end
 
   class Explorer
-    def initialize(service)
+    attr_accessor :root
+
+    DEFAULT_OPTIONS = {
+      root_id: 0
+    }
+
+    def initialize(service, options = {})
+      @options = DEFAULT_OPTIONS.merge(options)
       @service = service
-      @root = Node.new({title: 'Root', id: 0})
+      @root = load_root_node(@options[:root_id])
     end
 
-    def node_at(path)
+    def get(path)
       find_terminal_node(prepare_path(path))
     end
 
-    def children_of(path)
-      node_at(path).children
-    end
+    def root_path
+      path = []
+      current = @root
 
-    def items_of(path)
-      node_at(path).items
+      while !current.nil? && current.id != Node::ROOT_ID
+        path << current.title
+        current = load_root_node(current.parent_id)
+      end
+
+      '/' << path.reverse.join('/')
     end
 
     def scrape(path)
@@ -57,6 +70,24 @@ module UpnpContentExplorer
         find_terminal_node(path, child, next_traversed_path)
       end
 
+      def load_root_node(id)
+        node = Node.new(id: id)
+        response = @service.Browse(
+            ObjectID: id,
+            BrowseFlag: 'BrowseMetadata',
+            Filter: '*',
+            StartingIndex: '0',
+            RequestedCount: '0'
+        )
+
+        node_xml = Nokogiri::XML(response[:Result])
+        node_xml.remove_namespaces!
+        node_data = parse_nori_node(node_xml.xpath('//DIDL-Lite/container'))
+
+        node.load!(node_data, false)
+        node
+      end
+
       def get_node(node_id)
         response = @service.Browse(
             ObjectID: node_id,
@@ -66,7 +97,6 @@ module UpnpContentExplorer
             RequestedCount: '0'
         )
 
-        # Some UPnP servers (i.e., MediaTomb) screw up the namespacing
         node_data = response[:Result].gsub('xmlns=', 'xmlns:didl=')
         content   = Nokogiri::XML(node_data)
 

data/lib/upnp_content_explorer/node.rb

@@ -1,5 +1,7 @@
 module UpnpContentExplorer
   class Node
+    ROOT_ID = '0'
+
     def initialize(data)
       @data = data
     end
@@ -14,13 +16,17 @@ module UpnpContentExplorer
       super
     end
 
-    def load!(data)
+    def load!(data, mark_loaded = true)
       merged_data = @data.merge(data)
-      merged_data[:loaded?] = true
+      merged_data[:loaded?] ||= mark_loaded
 
       @data = merged_data
     end
 
+    def parent_id
+      @data[:parentID] || nil
+    end
+
     def children
       @data[:children].values || []
     end

data/lib/upnp_content_explorer/version.rb

@@ -1,3 +1,3 @@
 module UpnpContentExplorer
-  VERSION = '0.1.3'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upnp_content_explorer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori