sony_camera_remote_api 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22147c515ca8ec69ab26b0eaf6c244c04030e5e
-  data.tar.gz: b6f7dd99685957579340411cda11133e29c3ebf6
+  metadata.gz: 6cffaf29bb654037c1468ab6ef14e78cbd966979
+  data.tar.gz: 71d002fd2b81d58c40bd4a1602c5434cdd2aa8dc
 SHA512:
-  metadata.gz: fc07a67d20bdad6c13d02b6c3bd6fb763882fc40c540ecc734329ee7cf8cd868aa2e871e74347df9800aa3bb54431b75617fccb7181fb11c0cb2d185d9e8e68c
-  data.tar.gz: e1f1e9047a6d92284207f5f73b00ba5a66d58fb8ddfaa4ca1151292b1144076771a24b12f7984f4096e0ed85dcc87f5d404b1e565d145febab206d7849f33970
+  metadata.gz: d354a41277b0ca16ebb1a861958c545ceb66f3c8d4b8fb8b208867a02038340b873a00e21f9343706b8a2cfd853d64c7111865a752e5e3c9efa3c454c4ebfce5
+  data.tar.gz: 848e7169aff5e97ba6a95c4d6360a3160a227cc0e890cc585dac5d7f9637c1331f053fed5ff7984b5ace0fa8ebdb60a5ef80c9ffaccd672f5f7c79b605e4673e

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sony_camera_remote_api.gemspec
 gemspec
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
+  # NOTE: activesupport 5.x supports only ruby 2.2.2+
+  gem "activesupport", ">= 4.0.0", "< 5.0.0"
+end

data/README.md

@@ -1,5 +1,7 @@
 # Sony Camera Remote API Wrapper
 
+[![Gem Version](https://badge.fury.io/rb/sony_camera_remote_api.svg)](https://badge.fury.io/rb/sony_camera_remote_api)
+
 A Ruby Gem that facilitates the use of Sony Camera Remote API.
 
 - [Backgrounds](#backgrounds)
@@ -21,12 +23,12 @@ This gem is a wrapper library that make it easy to use Sony camera functions for
 
 ## Features
 
+* Easy connection to camera
 * Streaming live-view images by one method
 * Simplified contents transfer
 * Consistent interface for changing parameters safely
 * Auto reconnection
-* Also supports the low-level APIs call
-* Client application bundled
+* CLI application bundled (like [Raspberry Pi camera application](https://www.raspberrypi.org/documentation/raspbian/applications/camera.md))
 
 
 ## Supported version
@@ -52,28 +54,28 @@ Or install it yourself as:
 
 ## Usage
 
-1. Connect your PC (or device) to the camera with Direct Wi-Fi. If you are using Linux, it is recommended to use
-   Shelf class like the following example.
+1. Connect your PC (or device) to the camera with Direct Wi-Fi. If your PC is **Linux** or **MacOS** machine, you can easiy do it by using `Shelf` class like following example.
 2. Create SonyCameraRemoteAPI::Camera instance with Shelf instance.
 3. Now you can access all of camera APIs and useful wrapper methods!
 
-This is an example code of capturing single still image.
+This is an example code that takes a picture and transfer it to your PC.
 
 ```ruby
 require 'sony_camera_remote_api'
 
-interface = "wlan0"
-ssid = "DIRECT-xxxx:ILCE-QX1"
-pass = "xxxxxxxx"
+ssid = "DIRECT-xxxx:ILCE-QX1"   # SSID of camera
+pass = "xxxxxxxx"               # passphrase
+interface = "wlan0"             # interface by which you connect to the camera
 
+# Connect to the camera
 shelf = SonyCameraRemoteAPI::Shelf.new 'sonycam.shelf'
 shelf.add_and_select ssid, pass, interface
 shelf.connect
 
+# Initialize Camera class instance, with which you can access all camera functions.
 cam = SonyCameraRemoteAPI::Camera.new shelf
 cam.change_function_to_shoot 'still', 'Single'
 cam.capture_still
-# => Captured jpeg file is transferred to your PC
 ```
 
 For more information, see project's [Wiki](https://github.com/kota65535/sony_camera_remote_api/wiki).

data/lib/sony_camera_remote_api/camera_api.rb

@@ -1,5 +1,6 @@
 require 'sony_camera_remote_api/raw_api'
 require 'sony_camera_remote_api/camera_api_group'
+require 'sony_camera_remote_api/retrying'
 require 'forwardable'
 
 module SonyCameraRemoteAPI
@@ -26,9 +27,18 @@ module SonyCameraRemoteAPI
     # @param [Hash] endpoints
     # @param [Proc] reconnect_by
     def initialize(endpoints, reconnect_by: nil)
-      @raw_api_manager = RawAPIManager.new endpoints
+      @http = HTTPClient.new
+      @http.connect_timeout  = @http.send_timeout = @http.receive_timeout = 30
+
+      Retrying.new(reconnect_by, @http).reconnect_and_retry do
+        @raw_api_manager = RawAPIManager.new endpoints, @http
+      end
+
       @api_group_manager = CameraAPIGroupManager.new self
-      @reconnect_by = reconnect_by
+
+      @retrying = Retrying.new(reconnect_by, @http).add_common_hook do
+        startRecMode! timeout: 0
+      end
     end
 
 
@@ -40,7 +50,7 @@ module SonyCameraRemoteAPI
       params = [params] unless params.is_a? Array
       name, service, id, version = @raw_api_manager.search_method(__method__, **opts)
       response = nil
-      reconnect_and_retry do
+      @retrying.reconnect_and_retry do
         if params[0]
           response = @raw_api_manager.call_api_async(service, name, params, id, version, opts[:timeout])
         else
@@ -55,7 +65,8 @@ module SonyCameraRemoteAPI
     # @return [Hash]  Response of API
     def getAvailableApiList(params = [], **opts)
       name, service, id, version = @raw_api_manager.search_method(__method__, **opts)
-      reconnect_and_retry do
+      log.debug "calling: #{name}"
+      @retrying.reconnect_and_retry do
         @raw_api_manager.call_api(service, name, params, id, version)
       end
     end
@@ -130,9 +141,10 @@ module SonyCameraRemoteAPI
       method = method.to_s.delete('!').to_sym
       params = [params] unless params.is_a? Array
       response = nil
-      reconnect_and_retry do
+      @retrying.reconnect_and_retry do
         begin
           name, service, id, version = @raw_api_manager.search_method(method, **opts)
+          log.debug "calling: #{name}"
           if service == 'camera' || name == ''
             if opts[:timeout]
               response = call_api_safe(service, name, params, id, version, opts[:timeout], **opts)
@@ -202,37 +214,5 @@ module SonyCameraRemoteAPI
       getEvent(false)
     end
 
-
-    # Execute given block. And if the block raises Error caused by Wi-Fi disconnection,
-    # Reconnect by @reconnect_by Proc and retry the given block.
-    # @param [Boolean] retrying If true, retry given block. If false, return immediately after reconnection.
-    # @param [Fixnum] num       Number of retry.
-    # @param [Proc] hook        Hook method called after reconnection.
-    def reconnect_and_retry(retrying: true, num: 1, hook: nil)
-      yield
-    rescue HTTPClient::TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED => e
-      retry_count ||= 0
-      retry_count += 1
-      raise e if @reconnect_by.nil? || retry_count > num
-      log.error "#{e.class}: #{e.message}"
-      log.error 'The camera seems to be disconnected! Reconnecting...'
-      unless @reconnect_by.call
-        log.error 'Failed to reconnect.'
-        raise e
-      end
-      log.error 'Reconnected.'
-      @raw_api_manager.reset_connection
-      # For cameras that use Smart Remote Control app.
-      startRecMode! timeout: 0
-      return unless retrying
-
-      if hook
-        unless hook.call
-          log.error 'Before-retry hook failed.'
-          raise e
-        end
-      end
-      retry
-    end
   end
 end

data/lib/sony_camera_remote_api/client/main.rb

@@ -442,13 +442,13 @@ module SonyCameraRemoteAPI
       end
 
 
-      desc 'intrec [options]', 'Do interval recording'
+      desc 'intstill [options]', 'Do interval recording'
       option :time, type: :numeric, desc: 'Recording time (sec)', banner: 'NSEC'
       option :interval, type: :string, desc: 'Interval (sec)', banner: 'NSEC'
       still_common_options
       common_options
       option :transfer, type: :boolean, desc: 'Transfer selected contents '
-      def intrec
+      def intstill
         init_camera
         @cam.change_function_to_shoot('intervalstill')
 

data/lib/sony_camera_remote_api/client/shelf.rb

@@ -187,9 +187,9 @@ module SonyCameraRemoteAPI
 
         # Connect to camera by external script
         if options[:restart]
-          result = Scripts.restart_and_connect(camera['interface'], camera['ssid'], camera['pass'])
+          result = @shelf.reconnect camera['ssid']
         else
-          result = Scripts.connect(camera['interface'], camera['ssid'], camera['pass'])
+          result = @shelf.connect camera['ssid']
         end
         unless result
           puts 'Failed to connect!'

data/lib/sony_camera_remote_api/raw_api.rb

@@ -30,10 +30,9 @@ module SonyCameraRemoteAPI
 
 
     # @param [Hash] endpoints Endpoint URIs
-    def initialize(endpoints)
+    def initialize(endpoints, httpclient)
       @endpoints = endpoints
-      @cli = HTTPClient.new
-      @cli.connect_timeout  = @cli.send_timeout = @cli.receive_timeout = 30
+      @http = httpclient
 
       unless call_api('camera', 'getApplicationInfo', [], 1, '1.0').result[1] >= '2.0.0'
         raise ServerNotCompatible, 'API version of the server < 2.0.0.'
@@ -83,7 +82,7 @@ module SonyCameraRemoteAPI
       }
       # log.debug request
       begin
-        raw_response = @cli.post_content(@endpoints[service_type], request.to_json)
+        raw_response = @http.post_content(@endpoints[service_type], request.to_json)
       rescue HTTPClient::BadResponseError => e
         if e.res.status_code == 403
           raise APIForbidden.new, "Method '#{method}' returned 403 Forbidden error. Maybe this method is not allowed to general users."
@@ -116,7 +115,7 @@ module SonyCameraRemoteAPI
         'id' => id,
         'version' => version
       }
-      conn = @cli.post_async(@endpoints[service_type], request.to_json)
+      conn = @http.post_async(@endpoints[service_type], request.to_json)
       start_time = Time.now if timeout
       loop do
         break if conn.finished?
@@ -184,13 +183,5 @@ module SonyCameraRemoteAPI
     def support?(method)
       @apis.key? method
     end
-
-
-    # Reset HTTPClient.
-    # @return [void]
-    def reset_connection
-      @cli.reset_all
-    end
-
   end
 end

data/lib/sony_camera_remote_api/retrying.rb

@@ -0,0 +1,105 @@
+require 'sony_camera_remote_api/logging'
+
+module SonyCameraRemoteAPI
+  class Retrying
+    include Logging
+
+    RECONNECTION_INTERVAL = 5
+    DEFAULT_RETRY_LIMIT = 2
+    DEFAULT_RECONNECTION_LIMIT = 2
+
+
+    def initialize(reconnect_by, httpclient)
+      @reconnect_by = reconnect_by
+      @http = httpclient
+    end
+
+
+    def reconnect_and_retry(retry_limit: DEFAULT_RETRY_LIMIT,
+                            reconnection_limit: DEFAULT_RECONNECTION_LIMIT,
+                            hook: nil, &block)
+      reconnect_and_retry_inner(retry_limit, reconnection_limit, hook, &block)
+    end
+
+
+    def reconnect_and_give_up(reconnection_limit: DEFAULT_RECONNECTION_LIMIT,
+                              hook: nil, &block)
+      reconnect_and_retry_inner(0, reconnection_limit, hook, &block)
+    end
+
+
+    def reconnect_and_retry_forever(hook: nil, &block)
+      reconnect_and_retry_inner(:forever, :forever, hook, &block)
+    end
+
+
+    def add_common_hook(&block)
+      @common_hook = block
+      self
+    end
+
+
+    private
+
+    # Execute given block with reconnection and retry.
+    # When the given block raises Error caused by Wi-Fi disconnection,
+    # Try to reconnect by @reconnect_by Proc, and then execute again the given block.
+    # @param [Fixnum] retry_limit         Limit number of retrying given block.
+    # @param [Fixnum] reconnection_limit  Limit number of retrying reconnection.
+    # @param [Proc]   one_off_hook        Hook method called after reconnection.
+    def reconnect_and_retry_inner(retry_limit, reconnection_limit, one_off_hook)
+      # Try to execute the given block by 'retry_limit' times.
+      yield
+    rescue HTTPClient::BadResponseError, HTTPClient::TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED => e
+      # Reraise immediately if reconnection is disabled
+      raise e if @reconnect_by.nil?
+
+      log.error "#{e.class}: #{e.message}"
+      # Init retry_count
+      retry_count ||= 0
+      if retry_count == 0
+        log.error 'The camera seems to be disconnected, starting retry sequence.'
+        forever = retry_limit.is_a?(Symbol) &&  retry_limit == :forever
+      else
+        if  forever || retry_count < retry_limit
+          log.error "Failed to execute the block! (#{retry_count}/#{retry_limit})"
+        else
+          log.error 'Execution failed! Finishing retry sequence...'
+          raise e
+        end
+      end
+
+      # Try to reconnect by 'reconnection_limit' times.
+      unless try_to_reconnect reconnection_limit
+        log.error 'Reconnection failed! Finishing retry sequence...'
+        raise e
+      end
+
+      # Call hooks
+      @common_hook.call if @common_hook
+      one_off_hook.call if one_off_hook
+
+      # Increment retry count
+      retry_count += 1
+      retry
+    end
+
+
+    def try_to_reconnect(limit)
+      log.error 'Reconnecting...'
+      forever = limit.is_a?(Symbol) &&  limit == :forever
+      reconnection_count = 0
+      loop do
+        reconnection_count += 1
+        return false unless forever || reconnection_count <= limit
+        break if @reconnect_by.call
+        log.error "Failed to reconnect! Retrying... (#{reconnection_count}/#{limit})"
+        sleep RECONNECTION_INTERVAL
+      end
+      @http.reset_all
+      log.error 'Reconnected.'
+      true
+    end
+
+  end
+end

data/lib/sony_camera_remote_api/scripts.rb

@@ -12,8 +12,8 @@ module SonyCameraRemoteAPI
     # @param [String] ssid SSID of the camera to connect
     # @param [String] pass Password of the camera to connect
     # @return [Boolean] +true+ if succeeded, +false+ otherwise.
-    def connect(interface, ssid, pass)
-      run_external_command "sudo bash #{connection_script} #{interface} #{ssid} #{pass}"
+    def connect(ssid, pass, interface)
+      run_external_command "sudo bash #{connection_script} #{ssid} #{pass} #{interface}"
     end
 
 
@@ -22,8 +22,8 @@ module SonyCameraRemoteAPI
     # @param [String] ssid SSID of the camera to connect
     # @param [String] pass Password of the camera to connect
     # @return [Boolean] +true+ if succeeded, +false+ otherwise.
-    def restart_and_connect(interface, ssid, pass)
-      run_external_command "sudo bash #{connection_script} -r #{interface} #{ssid} #{pass}"
+    def restart_and_connect(ssid, pass, interface)
+      run_external_command "sudo bash #{connection_script} -r #{ssid} #{pass} #{interface}"
     end
 
 

data/lib/sony_camera_remote_api/shelf.rb

@@ -169,7 +169,7 @@ module SonyCameraRemoteAPI
     def connect(ssid = nil)
       entry = get(ssid)
       if entry
-        Scripts.connect entry['interface'], entry['ssid'], entry['pass']
+        Scripts.connect entry['ssid'], entry['pass'], entry['interface']
       else
         false
       end
@@ -183,7 +183,7 @@ module SonyCameraRemoteAPI
     def reconnect(ssid = nil)
       entry = get(ssid)
       if entry
-        Scripts.restart_and_connect entry['interface'], entry['ssid'], entry['pass']
+        Scripts.restart_and_connect entry['ssid'], entry['pass'], entry['interface']
       else
         false
       end

data/lib/sony_camera_remote_api/version.rb

@@ -1,4 +1,4 @@
 module SonyCameraRemoteAPI
   # Version
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/sony_camera_remote_api.rb

@@ -5,6 +5,7 @@ require 'sony_camera_remote_api/utils'
 require 'sony_camera_remote_api/camera_api'
 require 'sony_camera_remote_api/packet'
 require 'sony_camera_remote_api/shelf'
+require 'sony_camera_remote_api/retrying'
 require 'core_ext/hash_patch'
 require 'httpclient'
 require 'active_support'
@@ -30,7 +31,7 @@ module SonyCameraRemoteAPI
 
     attr_reader :endpoints
 
-    # Timeout for saving images captured by continous shooting.
+    # Timeout for saving images captured by continuous shooting.
     CONT_SHOOT_SAVING_TIME = 25
     # Timeout for focusing by tracking focus.
     TRACKING_FOCUS_TIMEOUT = 4
@@ -57,8 +58,11 @@ module SonyCameraRemoteAPI
       @reconnect_by = reconnect_by if reconnect_by
 
       @api_manager = CameraAPIManager.new @endpoints, reconnect_by: @reconnect_by
-      @cli = HTTPClient.new
-      @cli.connect_timeout  = @cli.send_timeout = @cli.receive_timeout = 30
+      @http = HTTPClient.new
+      @http.connect_timeout  = @http.send_timeout = @http.receive_timeout = 10
+      @retrying = Retrying.new(@reconnect_by, @http).add_common_hook do
+        startRecMode! timeout: 0
+      end
 
       # Some cameras which use "Smart Remote Control" app must call this method before remote shooting.
       startRecMode! timeout: 0
@@ -498,7 +502,7 @@ module SonyCameraRemoteAPI
 
       x = [[x, 100].min, 0].max
       y = [[y, 100].min, 0].max
-      actTrackingFocus(['xPosition': x, 'yPosition': y]).result
+      actTrackingFocus(['xPosition' => x, 'yPosition' => y]).result
       begin
         wait_event(timeout: TRACKING_FOCUS_TIMEOUT) { |r| r[54]['trackingFocusStatus'] == 'Tracking' }
         log.info "Tracking focus (#{x}, #{y}) OK."
@@ -597,9 +601,9 @@ module SonyCameraRemoteAPI
           # Break from loop inside when timeout
           catch :finished do
             # For reconnection
-            reconnect_and_retry_forever do
+            @retrying.reconnect_and_retry_forever do
               # Retrieve streaming data
-              @cli.get_content(liveview_url) do |chunk|
+              @http.get_content(liveview_url) do |chunk|
                 loop_start = Time.now
                 received_sec = loop_start - loop_end
 
@@ -658,6 +662,8 @@ module SonyCameraRemoteAPI
               end
             end
           end
+        rescue StandardError => e
+            log.error e.backtrace.join "\n"
         ensure
           # Comes here when liveview finished or killed by signal
           puts 'Stopping Liveview...'
@@ -813,13 +819,14 @@ module SonyCameraRemoteAPI
     TRANSFER_SIZE_LIST = %w(original large small thumbnail).freeze
     # Transfer content(s) from the camera storage.
     # @note You have to set camera function to 'Contents Transfer' before calling this method.
-    # @param [Array<Hash>] contents     Array of content information, which can be obtained by get_content_list
-    # @param [Array<String>] filenames  Array of filename strings
-    # @param [String] size              Content size. available values are 'original', 'large', 'small', 'thumbnail'.
+    # @param [Array<Hash>] contents       Array of content information, which can be obtained by get_content_list
+    # @param [Array<String>] filenames    Array of filename strings
+    # @param [String, Array<String>] size Content size. available values are 'original', 'large', 'small', 'thumbnail'.
+    # @param [Boolean] add_postfix   If +true+, postfix is appended for 'large', 'small' and 'thumbnail' content size.
     # @see get_content_list
     # @see get_date_list
     # @todo If 'contents' is directory (date), get all contents of the directory.
-    def transfer_contents(contents, filenames=[], dir: nil, size: 'original')
+    def transfer_contents(contents, filenames=[], dir: nil, size: 'original', add_postfix: true)
       contents = [contents].compact unless contents.is_a? Array
       filenames = [filenames].compact unless filenames.is_a? Array
       size = [size].compact unless size.is_a? Array
@@ -838,7 +845,7 @@ module SonyCameraRemoteAPI
         end
       end
 
-      urls_filenames = get_content_url(contents, filenames, size)
+      urls_filenames = get_content_url(contents, filenames, size, add_postfix: add_postfix)
       if urls_filenames.empty?
         log.warn 'No contents to be transferred.'
         return []
@@ -889,9 +896,9 @@ module SonyCameraRemoteAPI
       FileUtils.mkdir_p dir if dir
       result = true
       time = Benchmark.realtime do
-        result = reconnect_and_give_up do
+        result = @retrying.reconnect_and_give_up do
           open(filepath, 'wb') do |file|
-            @cli.get_content(url) do |chunk|
+            @http.get_content(url) do |chunk|
               file.write chunk
             end
           end
@@ -936,7 +943,7 @@ module SonyCameraRemoteAPI
       else
         filenames = contents.map { |c| c['content']['original'][0]['fileName'] }
       end
-      transferred = transfer_contents contents, filenames, size: transfer_size, dir: dir
+      transferred = transfer_contents contents, filenames, size: transfer_size, dir: dir, add_postfix: false
       change_function_to_shoot 'still', 'Burst'
       transferred
     end
@@ -957,9 +964,9 @@ module SonyCameraRemoteAPI
       contents = get_content_list type: 'still', sort: 'descending', count: num_shots
       if prefix
         filenames = generate_sequencial_filenames prefix, 'JPG', num: contents.size
-        transferred = transfer_contents contents, filenames, dir: dir
+        transferred = transfer_contents contents, filenames, dir: dir, add_postfix: false
       else
-        transferred = transfer_contents contents, size: transfer_size, dir: dir
+        transferred = transfer_contents contents, size: transfer_size, dir: dir, add_postfix: false
       end
       change_function_to_shoot 'intervalstill'
       transferred
@@ -1090,7 +1097,7 @@ module SonyCameraRemoteAPI
     end
 
 
-    def get_content_list_sub(source, type: nil, target: 'all', view:, sort:, count: nil)
+    def get_content_list_sub(source, type: nil, target: 'all', view: nil, sort: nil, count: nil)
       max_count = getContentCount([{'uri' => source, 'type' => type, 'view' => view}]).result[0]['count']
       count = count ? [max_count, count].min : max_count
       contents = []
@@ -1113,9 +1120,9 @@ module SonyCameraRemoteAPI
         log.debug url
         log.info "Transferring #{filepath}..."
         time = Benchmark.realtime do
-          reconnect_and_retry(hook: method(:change_function_to_transfer)) do
+          @retrying.reconnect_and_retry(hook: method(:change_function_to_transfer)) do
             open(filepath, 'wb') do |file|
-              @cli.get_content(url) do |chunk|
+              @http.get_content(url) do |chunk|
                 file.write chunk
               end
             end
@@ -1128,13 +1135,14 @@ module SonyCameraRemoteAPI
     end
 
 
-    def get_content_url(contents, filenames, sizes)
+    def get_content_url(contents, filenames, sizes, add_postfix: true)
       urls_filenames = []
       contents.zip(filenames).product(sizes).map { |e| e.flatten }.each do |content, filename, size|
         next unless content
 
         filename ||= content['content']['original'][0]['fileName']
         base = File.basename filename, '.*'
+        postfix = add_postfix ? "_#{size}" : ''
         case size
           when 'original'
             raise StandardError if content['content']['original'].size > 1 # FIXME: When do we come here???
@@ -1151,13 +1159,13 @@ module SonyCameraRemoteAPI
             filename = "#{base}#{ext}"
           when 'large'
             url = content['content']['largeUrl']
-            filename = "#{base}_large.JPG"
+            filename = "#{base}#{postfix}.JPG"
           when 'small'
             url = content['content']['smallUrl']
-            filename = "#{base}_small.JPG"
+            filename = "#{base}#{postfix}.JPG"
           when 'thumbnail'
             url = content['content']['thumbnailUrl']
-            filename = "#{base}_thumbnail.JPG"
+            filename = "#{base}#{postfix}.JPG"
         end
         if url.empty?
           log.error "Skipping empty URL for file: #{filename}, size: #{size}"
@@ -1168,44 +1176,5 @@ module SonyCameraRemoteAPI
       urls_filenames
     end
 
-
-    # Try to run given block.
-    # If an error raised because of the Wi-Fi disconnection, try to reconnect and run the block again.
-    # If error still continues, give it up and raise the error.
-    def reconnect_and_retry(retrying: true, num: 1, hook: nil)
-      yield
-    rescue HTTPClient::BadResponseError, HTTPClient::TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED => e
-      retry_count ||= 0
-      retry_count += 1
-      raise e if @reconnect_by.nil? || retry_count > num
-      log.error "#{e.class}: #{e.message}"
-      log.error 'The camera seems to be disconnected! Reconnecting...'
-      unless @reconnect_by.call
-        log.error 'Failed to reconnect.'
-        raise e
-      end
-      log.error 'Reconnected.'
-      @cli.reset_all
-      # For cameras that use Smart Remote Control app.
-      startRecMode! timeout: 0
-
-      if hook
-        unless hook.call
-          log.error 'Before-retry hook failed.'
-          raise e
-        end
-      end
-      retry if retrying
-    end
-
-    def reconnect_and_retry_forever(&block)
-      reconnect_and_retry &block
-    rescue HTTPClient::BadResponseError, HTTPClient::TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED => e
-      retry
-    end
-
-    def reconnect_and_give_up(&block)
-      reconnect_and_retry(retrying: false, &block)
-    end
   end
 end

data/scripts/Darwin/add_ssdp_route.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+set -u
+export LANG="C"
+
+function usage() {
+  cat <<EOT
+Description:
+  *** For MacOS ***
+  Add a static route to the SSDP broadcast address via the specified interface.
+  If interface is not given, the internal Wi-Fi device is used.
+Usage:
+  bash ${0##*/} <interface-name>
+EOT
+}
+
+# Verify the number of arguments
+if [ $# -gt 1 ]; then usage && exit 1; fi
+
+if [ -z "${1+x}" ]; then
+    # Get the device name associated with Wi-Fi network service
+    WIFI_DEV_NAME=$(networksetup -listallhardwareports | grep -w Wi-Fi -A1 | awk '/^Device:/{ print $2 }')
+    if [ -z "${WIFI_DEV_NAME}" ]; then
+        echo "Internal Wi-Fi device not found!"
+        exit 2
+    fi
+else
+    # Verify the specified interface exists
+    WIFI_DEV_NAME=$(networksetup -listallhardwareports | awk "/^Device: $1/{ print \$2 }")
+    if [ -z "${WIFI_DEV_NAME}" ]; then
+        echo "Specified interface not found!"
+        exit 2
+    fi
+fi
+
+# The broadcast address for SSDP discover
+SSDP_ADDR=239.255.255.250
+
+
+# Verify the existence of the route
+route -n get ${SSDP_ADDR} | grep -q "interface: ${WIFI_DEV_NAME}"
+if [ $? -eq 0 ]; then
+  echo 'Route already configured.'
+  exit 0
+fi
+
+# Add the route via the internal Wi-Fi device
+route add -host ${SSDP_ADDR} -interface ${WIFI_DEV_NAME}
+if [ $? -ne 0 ]; then
+  echo "Failed to add route to ${SSDP_ADDR} via ${WIFI_DEV_NAME}"
+  exit 1
+fi
+
+# Confirm the addition of the route completes
+route -n get ${SSDP_ADDR} | grep -q "interface: ${WIFI_DEV_NAME}"
+if [ $? -ne 0 ]; then
+  echo "Something goes wrong!"
+  exit 2
+fi
+
+echo 'Route added successfully.'
+exit 0

data/scripts/Darwin/connect_wifi.sh

@@ -0,0 +1,108 @@
+#!/bin/bash
+set -u
+export LANG="C"
+
+function usage() {
+  cat <<EOT
+Description:
+  *** For Mac ***
+  Connect to the specified wireless network.
+  Cannot be used with a third-party Wi-Fi adapter.
+Usage:
+  bash ${0##*/} <network-SSID> <password>
+Option:
+  -r : restart interface even if already connected.
+EOT
+}
+
+# Options
+while getopts r OPT
+do
+    case $OPT in
+        r)  FLAG_RESTART=1
+            ;;
+        \?) usage && exit 1
+            ;;
+    esac
+done
+shift $((OPTIND - 1))
+
+# Verify the number of arguments
+if [ $# -ne 2 ]; then usage && exit 1; fi
+
+# Get the device name associated with Wi-Fi network service
+WIFI_DEV_NAME=$(networksetup -listallhardwareports | grep -w Wi-Fi -A1 | awk '/^Device:/{ print $2 }')
+if [ -z "${WIFI_DEV_NAME}" ]; then
+  echo "Internal Wi-Fi device not found!"
+  exit 2
+fi
+
+# If --restart option is not given, exit if already connected.
+if [ -z ${FLAG_RESTART+x} ]; then
+    networksetup -getairportnetwork ${WIFI_DEV_NAME} | grep -wq $1
+    if [ $? -eq 0 ]; then
+        echo 'Already connected.'
+        exit 0
+    fi
+fi
+
+# Power ON the interface if not.
+POWER_ON_WAIT=1
+networksetup -getairportpower ${WIFI_DEV_NAME} | grep -wiq 'off'
+if [ $? -eq 0 ]; then
+  networksetup -setairportpower ${WIFI_DEV_NAME} on
+  if [ $? -ne 0 ]; then
+    echo "Failed to power on ${WIFI_DEV_NAME}."
+    exit 3
+  fi
+  sleep ${POWER_ON_WAIT}
+fi
+
+# Full path of airport command
+AIRPORT_CMD='/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Resources/airport'
+
+# Scan networks with specified SSID
+SCAN_RETRY=4
+SCAN_INTERVAL=15
+try=1
+while true; do
+    ${AIRPORT_CMD} --scan=$1 | grep -wq $1
+    if [ $? -eq 0 ]; then
+        break
+    elif [ ${try} -eq ${SCAN_RETRY} ]; then
+        echo "The wi-fi network with SSID '$1' not found."
+        exit 4
+    fi
+    ((try++))
+    echo "Scan failed, retrying... (${try}/${SCAN_RETRY})"
+    sleep ${SCAN_INTERVAL}
+done
+
+# Try to connect
+CONNECTION_RETRY=3
+RETRY_INTERVAL=2
+remain=${CONNECTION_RETRY}
+while [ ${remain} -gt  0 ]
+do
+  # Judge from the output because 'networksetup -setairportnetwork' returns always 0.
+  networksetup -setairportnetwork ${WIFI_DEV_NAME} $1 $2 | grep -wq 'Error'
+  if [ $? -ne 0 ]; then
+    break
+  fi
+  ((remain--))
+  sleep ${RETRY_INTERVAL}
+done
+if [ ${remain} -eq 0 ]; then
+  echo "Failed to join the network. Password may be incorrect."
+  exit 5
+fi
+
+# Confirm the connection completes.
+networksetup -getairportnetwork ${WIFI_DEV_NAME} | grep -wq $1
+if [ $? -ne 0 ]; then
+  echo 'Something wrong occured!'
+  exit 6
+fi
+
+echo 'Connected successfully.'
+exit 0

data/scripts/Linux/connect_wifi.sh

@@ -4,12 +4,16 @@ export LANG="C"
 
 function usage() {
   cat <<EOT
-Usage:  bash ${0##*/} [options] <interface-name> <network-SSID> <password>
-Option: -r : restart interface even if already connected.
+Description:
+  Connect to the specified wireless network.
+Usage:
+  bash ${0##*/} [options] <network-SSID> <password> <interface-name>
+Option:
+  -r : restart interface even if already connected.
 EOT
 }
 
-# オプション解析
+# Options
 while getopts r OPT
 do
     case $OPT in
@@ -21,46 +25,46 @@ do
 done
 shift $((OPTIND - 1))
 
-# 引数チェック
+# Verify the number of arguments
 if [ $# -ne 3 ]; then usage && exit 1; fi
 
-# 指定されたインターフェースが存在するか調べる
-iwconfig $1 > /dev/null 2>&1
+# Verify the existence of specified interface
+iwconfig $3 > /dev/null 2>&1
 if [ $? -ne 0 ]; then
-    echo "Device named '$1' not found."
+    echo "Specified interface '$3' not found."
     exit 2
 fi
 
-# -rオプション有りなら接続済みでも再接続
+# If --restart option is not given, exit if already connected.
 if [ -z ${FLAG_RESTART+x} ]; then
-    # すでに接続されていれば終了
-    iwconfig $1 | grep -wq "ESSID:\"$2\"" && ifconfig $1 | grep -q 'inet addr'
+    # Exit if already connected
+    iwconfig $3 | grep -wq "ESSID:\"$1\"" && ifconfig $3 | grep -q 'inet addr'
     if [ $? -eq 0 ]; then
         echo "Already connected."
         exit 0
     fi
 fi
 
-# インターフェースを再起動
+# Restart the interface
 POWER_ON_WAIT=1
-ifconfig $1 down
-ifconfig $1 up
+ifconfig $3 down
+ifconfig $3 up
 if [ $? -ne 0 ]; then
-    echo "Failed to activate interface $1"
+    echo "Failed to activate interface '$3'"
     exit 3
 fi
 sleep ${POWER_ON_WAIT}
 
-# 指定のSSIDを持つアクセスポイントがあるか調べる
+# Scan networks with specified SSID
 SCAN_RETRY=4
-SCAN_INTERVAL=10
+SCAN_INTERVAL=15
 try=1
 while true; do
-    iwlist $1 scan | grep -wq "ESSID:\"$2\""
+    iwlist $3 scan | grep -wq "ESSID:\"$1\""
     if [ $? -eq 0 ]; then
         break
     elif [ ${try} -eq ${SCAN_RETRY} ]; then
-        echo "The wi-fi network with SSID '$2' not found."
+        echo "The wi-fi network with SSID '$1' not found."
         exit 4
     fi
     ((try++))
@@ -68,42 +72,43 @@ while true; do
     sleep ${SCAN_INTERVAL}
 done
 
-# wpa_supplicantが動いていたら殺す
-pkill -f "wpa_supplicant.+-i *$1 .*"
+# Kill if wpa_supplicant is alive
+pkill -f "wpa_supplicant.+-i *$3 .*"
 
-# SSIDを設定
-iwconfig $1 essid $2
+# Set SSID for the interface
+iwconfig $3 essid $1
 
-# WPA認証タイムアウト秒数
-WPA_AUTH_TIMEOUT=20
+# Try to connect
+WPA_AUTH_TIMEOUT=30
 is_connected=false
 current_time=$(date +%s)
-# wpa_supplicantをnohupで起動し接続。stdbufはバッファリングを防止するために必要
+# Run wpa_supplicant by nohup. stdbuf is introduced to prevent buffering.
 while read -t ${WPA_AUTH_TIMEOUT} line; do
     echo "  $line"
+    # Judge from the output log
     echo $line | grep -wq 'CTRL-EVENT-CONNECTED'
     if [ $? -eq 0 ]; then
         is_connected=true
         break
     fi
-    # タイムアウト判定
+    # Is timeout?
     if [ $(($(date +%s) - ${current_time})) -gt ${WPA_AUTH_TIMEOUT} ]; then
         echo "Timeout."
         break
     fi
-done < <(nohup bash -c "wpa_passphrase $2 $3 | stdbuf -oL wpa_supplicant -B -i $1 -D wext -c /dev/stdin -f /dev/stdout")
-# done < <(nohup bash -c "wpa_passphrase $2 $3 | stdbuf -oL wpa_supplicant -i $1 -D wext -c /dev/stdin 2>&1 | stdbuf -oL tee wpa.log &")
+done < <(nohup bash -c "wpa_passphrase $1 $2 | stdbuf -oL wpa_supplicant -B -i $3 -D wext -c /dev/stdin -f /dev/stdout")
+# done < <(nohup bash -c "wpa_passphrase $1 $2 | stdbuf -oL wpa_supplicant -i $3 -D wext -c /dev/stdin 2>&1 | stdbuf -oL tee wpa.log &")
 if ! $is_connected; then
     echo 'WPA authentication failed.'
-    pkill -f "wpa_supplicant.+-i *$1 .*"
+    pkill -f "wpa_supplicant.+-i *$3 .*"
     exit 5
 fi
 
-# IPアドレス割り当て
-ifconfig $1 | grep -q 'inet addr'
+# Assign IP address by DHCP
+ifconfig $3 | grep -q 'inet addr'
 if [ $? -ne 0 ]; then
-    dhclient $1
-    ifconfig $1 | grep -q 'inet addr'
+    dhclient $3
+    ifconfig $3 | grep -q 'inet addr'
     if [ $? -ne 0 ]; then
         echo 'IP address cannot not be assgined.'
         exit 6

data/scripts/connect.sh

@@ -2,13 +2,13 @@
 
 function usage() {
   cat <<EOT
-Usage: bash ${0##*/} <interface-name> <network-SSID> <password>
+Usage: bash ${0##*/} <network-SSID> <password> <interface-name>
 EOT
 }
 
 CONNECT_OPTION=''
 
-# オプション解析
+# Options
 while getopts r OPT
 do
     case $OPT in
@@ -20,17 +20,22 @@ do
 done
 shift $((OPTIND - 1))
 
+# Verify the number of arguments
 if [ $# -ne 3 ]; then usage && exit 1; fi
 
 cd $(dirname $0)
-arch=$(uname)
-case "${arch}" in
-    'Linux' | 'Darwin' )
-        bash ./${arch}/connect_wifi.sh ${CONNECT_OPTION} $1 $2 $3 && bash ./${arch}/add_ssdp_route.sh $1
+sysname=$(uname)
+case "${sysname}" in
+    'Linux')
+        bash ./${sysname}/connect_wifi.sh ${CONNECT_OPTION} $1 $2 $3 && bash ./${sysname}/add_ssdp_route.sh $3
+        exit $?
+        ;;
+    'Darwin')
+        bash ./${sysname}/connect_wifi.sh ${CONNECT_OPTION} $1 $2    && bash ./${sysname}/add_ssdp_route.sh
         exit $?
         ;;
     * )
-        echo "The platform '${arch}' is not supported!"
+        echo "The system '${sysname}' is not supported!"
         exit 1
         ;;
 esac

data/sony_camera_remote_api.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "simplecov"
 
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", ">= 4.0.0"
   spec.add_dependency "frisky"
   spec.add_dependency "httpclient"
   spec.add_dependency "nokogiri"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sony_camera_remote_api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - kota65535
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: frisky
   requirement: !ruby/object:Gem::Requirement
@@ -195,11 +195,14 @@ files:
 - lib/sony_camera_remote_api/logging.rb
 - lib/sony_camera_remote_api/packet.rb
 - lib/sony_camera_remote_api/raw_api.rb
+- lib/sony_camera_remote_api/retrying.rb
 - lib/sony_camera_remote_api/scripts.rb
 - lib/sony_camera_remote_api/shelf.rb
 - lib/sony_camera_remote_api/ssdp.rb
 - lib/sony_camera_remote_api/utils.rb
 - lib/sony_camera_remote_api/version.rb
+- scripts/Darwin/add_ssdp_route.sh
+- scripts/Darwin/connect_wifi.sh
 - scripts/Linux/add_ssdp_route.sh
 - scripts/Linux/connect_wifi.sh
 - scripts/connect.sh