sonycam 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517e4d28a7d968b7c3211a8607ec8120e25d8221
-  data.tar.gz: 195ecb3e7bbf72add185dbd2c584ad7f722f86bb
+  metadata.gz: 267685466ea2942f1aaeb2de7a06390c6755a25a
+  data.tar.gz: 6324ddf7763fe498cf7a574a243fb7dffa8eab20
 SHA512:
-  metadata.gz: bebebc883f013e9477e2a3848aae5b0c5141f4197eedfa15ee3140b1e13caf5f4723edb46653d64390896a3c1a4ea429a44c466df7467e459817c86c3b674055
-  data.tar.gz: c1d7afd13daaabde61354ddc06fef294defd0d7deb08f3aaa9a9cae002ba7130a08c7c2de712ed51877b202b405bd871439199a6c7e965923225bcfed69031de
+  metadata.gz: db15ae7fe31a6432daf7ecdfe2369903ac0a26233fead4e5cc8abdda1a892553c6e55802e4c2ca6f396e22d50464d9d2eed64d1d738581b3b65e8744c7fdaae4
+  data.tar.gz: 9b2e817e2e67beea7f2691ecf773f295214077e398156cba48aac6ab47e0142e31c86f937bbba0661bdf3db7464fd4c94c133eaf20aac57104106e620d8a9b41

data/lib/sonycam/device_description.rb

@@ -1,32 +1,34 @@
 require 'nokogiri'
 require 'open-uri'
 
-class DeviceDescription
-  attr_reader :doc
+module Sonycam
+  class DeviceDescription
+    attr_reader :doc
 
-  # document: String or Nokogiri::XML::Node
-  def initialize document
-    @doc = Nokogiri::XML(open(document))
-    @camera_name = @doc.at_xpath('//xmlns:friendlyName').content
-    @api_url_hash = {}
-    @doc.xpath('//av:X_ScalarWebAPI_Service', av: 'urn:schemas-sony-com:av').each do |node|
-      type = node.at_xpath('av:X_ScalarWebAPI_ServiceType', av: 'urn:schemas-sony-com:av').content
-      url = node.at_xpath('av:X_ScalarWebAPI_ActionList_URL', av: 'urn:schemas-sony-com:av').content
-      @api_url_hash[type.to_sym] = url
+    # document: String or Nokogiri::XML::Node
+    def initialize document
+      @doc = Nokogiri::XML(open(document))
+      @camera_name = @doc.at_xpath('//xmlns:friendlyName').content
+      @api_url_hash = {}
+      @doc.xpath('//av:X_ScalarWebAPI_Service', av: 'urn:schemas-sony-com:av').each do |node|
+        type = node.at_xpath('av:X_ScalarWebAPI_ServiceType', av: 'urn:schemas-sony-com:av').content
+        url = node.at_xpath('av:X_ScalarWebAPI_ActionList_URL', av: 'urn:schemas-sony-com:av').content
+        @api_url_hash[type.to_sym] = url
+      end
     end
-  end
 
-  # type: :camera, :system, :guide
-  def api_url type = :camera
-    # Hush, it's a secret, don't tell anyone.
-    if @camera_name == 'DSC-RX100M2'
-      url = @api_url_hash[type].sub('sony', 'camera')
-      puts "DSC-RX100M2 detected, API URL \"#{url}\" was used insteadly."
-      return url
-    end
+    # type: :camera, :system, :guide
+    def api_url type = :camera
+      # Hush, it's a secret, don't tell anyone.
+      if @camera_name == 'DSC-RX100M2'
+        url = @api_url_hash[type].sub('sony', 'camera')
+        puts "DSC-RX100M2 detected, API URL \"#{url}\" was used insteadly."
+        return url
+      end
 
-    if action_list_url = @api_url_hash[type] then "#{action_list_url}/#{type}"
-    else raise "Can't not find service type \"#{type}\"."
+      if action_list_url = @api_url_hash[type] then "#{action_list_url}/#{type}"
+      else raise "Can't not find service type \"#{type}\"."
+      end
     end
   end
 end

data/lib/sonycam/liveview.rb

@@ -1,42 +1,44 @@
 require 'net/http'
 require 'sonycam/packet'
 
-module Liveview
-  extend self
-  def stream liveview_url
-    uri = URI(liveview_url)
-    Net::HTTP.start(uri.host, uri.port) do |http|
-      request = Net::HTTP::Get.new uri
-      http.request request do |response|
-        state = :commen_header
-        buf = ''.force_encoding('BINARY')
-        commen_header = nil
-        payload_header = nil
-          response.read_body do |chunk|
-          buf += chunk
-          until buf.empty?
-            case state
-            when :commen_header # 8 bytes
-              break if buf.size < 8
-              commen_header = buf.slice!(0, 8).unpack('H2CnN')
-              state = :payload_header
-            when :payload_header # 128 bytes
-              break if buf.size < 128
-              payload_header = buf.slice!(0, 128).unpack('H8H6CH8CH*')
-              state = :payload_data
-            when :payload_data
-              jpeg_data_size = payload_header[1].to_i(16)
-              padding_size = payload_header[2]
-              break if buf.size < jpeg_data_size + padding_size
-              jpeg_data = buf.slice!(0, jpeg_data_size)
-              padding_data = buf.slice!(0, padding_size)
-              state = :commen_header
-              yield Packet.new(commen_header, payload_header, jpeg_data, padding_data)
-            end # case state
-            # gets
-          end # until buf.empty?
-        end # response.read_body do |chunk|
-      end # http.request request do |response|
-    end rescue retry # Net::HTTP.start(uri.host, uri.port) do |http|
-  end # def stream
-end # class Liveview
+module Sonycam
+  module Liveview
+    extend self
+    def stream liveview_url
+      uri = URI(liveview_url)
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        request = Net::HTTP::Get.new uri
+        http.request request do |response|
+          state = :commen_header
+          buf = ''.force_encoding('BINARY')
+          commen_header = nil
+          payload_header = nil
+            response.read_body do |chunk|
+            buf += chunk
+            until buf.empty?
+              case state
+              when :commen_header # 8 bytes
+                break if buf.size < 8
+                commen_header = buf.slice!(0, 8).unpack('H2CnN')
+                state = :payload_header
+              when :payload_header # 128 bytes
+                break if buf.size < 128
+                payload_header = buf.slice!(0, 128).unpack('H8H6CH8CH*')
+                state = :payload_data
+              when :payload_data
+                jpeg_data_size = payload_header[1].to_i(16)
+                padding_size = payload_header[2]
+                break if buf.size < jpeg_data_size + padding_size
+                jpeg_data = buf.slice!(0, jpeg_data_size)
+                padding_data = buf.slice!(0, padding_size)
+                state = :commen_header
+                yield Packet.new(commen_header, payload_header, jpeg_data, padding_data)
+              end # case state
+              # gets
+            end # until buf.empty?
+          end # response.read_body do |chunk|
+        end # http.request request do |response|
+      end rescue retry # Net::HTTP.start(uri.host, uri.port) do |http|
+    end # def stream
+  end # class Liveview
+end

data/lib/sonycam/packet.rb

@@ -1,28 +1,30 @@
-class Packet
-  def initialize commen_header, payload_header, jpeg_data, padding_data
-    @packet = {
-      commen_header: {
-        start_byte: commen_header[0], # hex, fixed "FF"
-        payload_type: commen_header[1], # int
-        sequence_number: commen_header[2], # int
-        time_stamp: commen_header[3] # int
-      },
-      payload_header: {
-        star_code: payload_header[0], # hex, fixed "24356879"
-        jpeg_data_size: payload_header[1].to_i(16), # int
-        padding_size: payload_header[2], # int
-        reserved: payload_header[3], # hex
-        flag: payload_header[4], # int, fixed "00"
-        reserved_2: payload_header[5]
+module Sonycam
+  class Packet
+    def initialize commen_header, payload_header, jpeg_data, padding_data
+      @packet = {
+        commen_header: {
+          start_byte: commen_header[0], # hex, fixed "FF"
+          payload_type: commen_header[1], # int
+          sequence_number: commen_header[2], # int
+          time_stamp: commen_header[3] # int
+        },
+        payload_header: {
+          star_code: payload_header[0], # hex, fixed "24356879"
+          jpeg_data_size: payload_header[1].to_i(16), # int
+          padding_size: payload_header[2], # int
+          reserved: payload_header[3], # hex
+          flag: payload_header[4], # int, fixed "00"
+          reserved_2: payload_header[5]
 
-      },
-      payload_data: {
-        jpeg_data: jpeg_data,
-        padding_data: padding_data
-      },
-    }
-  end
-  def [] key
-    @packet[key]
+        },
+        payload_data: {
+          jpeg_data: jpeg_data,
+          padding_data: padding_data
+        },
+      }
+    end
+    def [] key
+      @packet[key]
+    end
   end
 end

data/lib/sonycam/version.rb

@@ -1,3 +1,3 @@
 module Sonycam
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonycam
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Tony Jian