kodi_client 0.6.3 → 0.6.4

data/lib/kodi_client/types/video/video_resume_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module KodiClient
+  module Types
+    module Video
+      # Video.Resume https://kodi.wiki/view/JSON-RPC_API/v12#Video.Resume
+      class VideoResume
+        include Extensions::Comparable
+        extend Extensions::Creatable
+
+        attr_reader :position, :total
+
+        def initialize(position, total)
+          @position = position
+          @total = total
+        end
+      end
+    end
+  end
+end

data/lib/kodi_client.rb

@@ -3,70 +3,158 @@
 require 'http'
 require 'json'
 
-require 'kodi_client/Chainable'
-
-require 'kodi_client/util/comparable'
-require 'kodi_client/util/creatable'
-require 'kodi_client/util/iterable'
-
-require 'kodi_client/kodi_module'
-require 'kodi_client/options'
-
-require 'kodi_client/method/addons'
-require 'kodi_client/method/audio_library'
-require 'kodi_client/method/application'
-require 'kodi_client/method/favourites'
-require 'kodi_client/method/files'
-require 'kodi_client/method/gui'
-require 'kodi_client/method/input'
-require 'kodi_client/method/player'
-require 'kodi_client/method/profiles'
-require 'kodi_client/method/system'
-
-require 'kodi_client/types/global_types'
-require 'kodi_client/types/item_types'
-require 'kodi_client/types/media_types'
-require 'kodi_client/types/player_type'
-require 'kodi_client/types/pvr_type'
-require 'kodi_client/types/audio_types'
-require 'kodi_client/types/video_types'
-require 'kodi_client/types/system_types'
-require 'kodi_client/types/list_types'
-require 'kodi_client/types/application_types'
-require 'kodi_client/types/addon_types'
-require 'kodi_client/types/gui_types'
-require 'kodi_client/types/favourites_types'
-require 'kodi_client/types/profiles_types'
-require 'kodi_client/types/input_types'
-require 'kodi_client/types/files_types'
+require 'kodi_client/extensions/chainable'
+require 'kodi_client/extensions/comparable'
+require 'kodi_client/extensions/creatable'
+require 'kodi_client/extensions/iterable'
+
+require 'kodi_client/kodi_error'
+require 'kodi_client/kodi_request'
+require 'kodi_client/kodi_response'
+require 'kodi_client/kodi_method'
+require 'kodi_client/kodi_options'
+
+require 'kodi_client/types/items/item_details_base_type'
+
+require 'kodi_client/types/global/toggle_type'
+require 'kodi_client/types/global/rotate_type'
+require 'kodi_client/types/global/direction_type'
+require 'kodi_client/types/global/next_prev_type'
+require 'kodi_client/types/global/increment_decrement_type'
+require 'kodi_client/types/global/id_label_type'
+require 'kodi_client/types/global/id_name_type'
+require 'kodi_client/types/global/global_time_type'
+require 'kodi_client/types/global/password_encryption_type'
+
+require 'kodi_client/types/application/property_name_type'
+require 'kodi_client/types/application/version_type'
+require 'kodi_client/types/application/property_value_type'
+
+require 'kodi_client/types/pvr/channel_type_type'
+
+require 'kodi_client/types/input/input_action_type'
+
+require 'kodi_client/types/system/property_name_type'
+require 'kodi_client/types/system/property_value_type'
+
+require 'kodi_client/types/media/media_type_type'
+require 'kodi_client/types/media/media_details_base_type'
+require 'kodi_client/types/media/media_artwork_type'
+
+require 'kodi_client/types/list/list_limits_type'
+require 'kodi_client/types/list/list_limits_returned_type'
+require 'kodi_client/types/list/sort_order_type'
+require 'kodi_client/types/list/list_sort_type'
+require 'kodi_client/types/list/list_fields_all_type'
+require 'kodi_client/types/list/list_field_files_type'
+
+require 'kodi_client/types/favourites/type_type'
+require 'kodi_client/types/favourites/fields_favourite_type'
+require 'kodi_client/types/favourites/details_favourite_type'
+require 'kodi_client/types/favourites/get_favourite_returned_type'
+
+require 'kodi_client/types/player/zoom_type'
+require 'kodi_client/types/player/view_mode_type'
+require 'kodi_client/types/player/player_visibility_type'
+require 'kodi_client/types/player/player_type_type'
+require 'kodi_client/types/player/player_repeat_type'
+require 'kodi_client/types/player/player_speed_type'
+require 'kodi_client/types/player/player_type'
+require 'kodi_client/types/player/subtitle_type'
+require 'kodi_client/types/player/audio_stream_type'
+require 'kodi_client/types/player/video_stream_type'
+require 'kodi_client/types/player/property_name_type'
+require 'kodi_client/types/player/property_value_type'
+require 'kodi_client/types/player/player_view_mode_type'
+require 'kodi_client/types/player/player_position_time_type'
+require 'kodi_client/types/player/seek_jump_type'
+require 'kodi_client/types/player/seek_returned_type'
+
+require 'kodi_client/types/audio/audio_contributor_type'
+require 'kodi_client/types/audio/audio_album_release_type_type'
+require 'kodi_client/types/audio/audio_details_base_type'
+require 'kodi_client/types/audio/audio_details_media_type'
+require 'kodi_client/types/audio/audio_fields_album_type'
+require 'kodi_client/types/audio/genre_type'
+require 'kodi_client/types/audio/details_album_type'
+require 'kodi_client/types/audio/get_albums_returned_type'
+
+require 'kodi_client/types/video/video_details_base_type'
+require 'kodi_client/types/video/video_cast_type'
+require 'kodi_client/types/video/video_details_media_type'
+require 'kodi_client/types/video/video_details_item_type'
+require 'kodi_client/types/video/video_details_file_type'
+require 'kodi_client/types/video/video_resume_type'
+require 'kodi_client/types/video/stream_details_type'
+
+require 'kodi_client/types/list/list_item_base_type'
+require 'kodi_client/types/list/list_item_all_type'
+require 'kodi_client/types/list/list_item_file_type'
+require 'kodi_client/types/list/list_sort_method_type'
+
+require 'kodi_client/types/files/file_label_type'
+require 'kodi_client/types/files/media_type'
+require 'kodi_client/types/files/get_directory_returned_type'
+require 'kodi_client/types/files/get_sources_returned_type'
+require 'kodi_client/types/files/prepare_download_returned_type'
+
+require 'kodi_client/types/profiles/fields_profile_type'
+require 'kodi_client/types/profiles/details_profile_type'
+require 'kodi_client/types/profiles/get_profiles_returned_type'
+require 'kodi_client/types/profiles/profile_password_type'
+
+require 'kodi_client/types/gui/gui_window_type'
+require 'kodi_client/types/gui/property_name_type'
+require 'kodi_client/types/gui/stereoscopy_mode_type'
+require 'kodi_client/types/gui/property_value_type'
+
+require 'kodi_client/types/addons/addon_dependency_type'
+require 'kodi_client/types/addons/addon_fields_type'
+require 'kodi_client/types/addons/addon_extra_info_type'
+require 'kodi_client/types/addons/addon_content_type'
+require 'kodi_client/types/addons/addon_types_type'
+require 'kodi_client/types/addons/addon_details_type'
+require 'kodi_client/types/addons/get_addon_returned_type'
+require 'kodi_client/types/addons/get_addons_returned_type'
+
+require 'kodi_client/methods/addons'
+require 'kodi_client/methods/audio_library'
+require 'kodi_client/methods/application'
+require 'kodi_client/methods/favourites'
+require 'kodi_client/methods/files'
+require 'kodi_client/methods/gui'
+require 'kodi_client/methods/input'
+require 'kodi_client/methods/player'
+require 'kodi_client/methods/profiles'
+require 'kodi_client/methods/system'
 
 # client for Kodi rest api https://kodi.wiki/view/JSON-RPC_API/v12
 module KodiClient
-  extend Chainable
+  extend Extensions::Chainable
 
   # client that holds all methods such as application, gui etc.
   class Client
-    include Chainable
+    include Extensions::Chainable
 
     attr_reader :audio_library, :addons, :application, :favourites, :files, :gui, :input, :player, :profiles, :system
 
     def initialize
-      @addons = KodiClient::Method::Addons.new
-      @audio_library = KodiClient::Method::AudioLibrary.new
-      @application = KodiClient::Method::Application.new
-      @favourites = KodiClient::Method::Favourites.new
-      @files = KodiClient::Method::Files.new
-      @gui = KodiClient::Method::GUI.new
-      @input = KodiClient::Method::Input.new
-      @player = KodiClient::Method::Player.new
-      @profiles = KodiClient::Method::Profiles.new
-      @system = KodiClient::Method::System.new
+      @addons = Methods::Addons.new
+      @audio_library = Methods::AudioLibrary.new
+      @application = Methods::Application.new
+      @favourites = Methods::Favourites.new
+      @files = Methods::Files.new
+      @gui = Methods::GUI.new
+      @input = Methods::Input.new
+      @player = Methods::Player.new
+      @profiles = Methods::Profiles.new
+      @system = Methods::System.new
     end
 
     def apply_options_to_methods(options)
       instance_variables.each do |it|
         mod = instance_variable_get(it)
-        mod.apply_options(options) if mod.is_a?(KodiClient::KodiModule)
+        mod.apply_options(options) if mod.is_a?(KodiMethod)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kodi_client
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Christian Feier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -42,38 +42,111 @@ files:
 - Rakefile
 - kodi_client.gemspec
 - lib/kodi_client.rb
-- lib/kodi_client/Chainable.rb
-- lib/kodi_client/kodi_module.rb
-- lib/kodi_client/method/addons.rb
-- lib/kodi_client/method/application.rb
-- lib/kodi_client/method/audio_library.rb
-- lib/kodi_client/method/favourites.rb
-- lib/kodi_client/method/files.rb
-- lib/kodi_client/method/gui.rb
-- lib/kodi_client/method/input.rb
-- lib/kodi_client/method/player.rb
-- lib/kodi_client/method/profiles.rb
-- lib/kodi_client/method/system.rb
-- lib/kodi_client/options.rb
-- lib/kodi_client/types/addon_types.rb
-- lib/kodi_client/types/application_types.rb
-- lib/kodi_client/types/audio_types.rb
-- lib/kodi_client/types/favourites_types.rb
-- lib/kodi_client/types/files_types.rb
-- lib/kodi_client/types/global_types.rb
-- lib/kodi_client/types/gui_types.rb
-- lib/kodi_client/types/input_types.rb
-- lib/kodi_client/types/item_types.rb
-- lib/kodi_client/types/list_types.rb
-- lib/kodi_client/types/media_types.rb
-- lib/kodi_client/types/player_type.rb
-- lib/kodi_client/types/profiles_types.rb
-- lib/kodi_client/types/pvr_type.rb
-- lib/kodi_client/types/system_types.rb
-- lib/kodi_client/types/video_types.rb
-- lib/kodi_client/util/comparable.rb
-- lib/kodi_client/util/creatable.rb
-- lib/kodi_client/util/iterable.rb
+- lib/kodi_client/extensions/chainable.rb
+- lib/kodi_client/extensions/comparable.rb
+- lib/kodi_client/extensions/creatable.rb
+- lib/kodi_client/extensions/iterable.rb
+- lib/kodi_client/kodi_error.rb
+- lib/kodi_client/kodi_method.rb
+- lib/kodi_client/kodi_options.rb
+- lib/kodi_client/kodi_request.rb
+- lib/kodi_client/kodi_response.rb
+- lib/kodi_client/methods/addons.rb
+- lib/kodi_client/methods/application.rb
+- lib/kodi_client/methods/audio_library.rb
+- lib/kodi_client/methods/favourites.rb
+- lib/kodi_client/methods/files.rb
+- lib/kodi_client/methods/gui.rb
+- lib/kodi_client/methods/input.rb
+- lib/kodi_client/methods/player.rb
+- lib/kodi_client/methods/profiles.rb
+- lib/kodi_client/methods/system.rb
+- lib/kodi_client/types/addons/addon_content_type.rb
+- lib/kodi_client/types/addons/addon_dependency_type.rb
+- lib/kodi_client/types/addons/addon_details_type.rb
+- lib/kodi_client/types/addons/addon_extra_info_type.rb
+- lib/kodi_client/types/addons/addon_fields_type.rb
+- lib/kodi_client/types/addons/addon_types_type.rb
+- lib/kodi_client/types/addons/get_addon_returned_type.rb
+- lib/kodi_client/types/addons/get_addons_returned_type.rb
+- lib/kodi_client/types/application/property_name_type.rb
+- lib/kodi_client/types/application/property_value_type.rb
+- lib/kodi_client/types/application/version_type.rb
+- lib/kodi_client/types/audio/audio_album_release_type_type.rb
+- lib/kodi_client/types/audio/audio_contributor_type.rb
+- lib/kodi_client/types/audio/audio_details_base_type.rb
+- lib/kodi_client/types/audio/audio_details_media_type.rb
+- lib/kodi_client/types/audio/audio_fields_album_type.rb
+- lib/kodi_client/types/audio/details_album_type.rb
+- lib/kodi_client/types/audio/genre_type.rb
+- lib/kodi_client/types/audio/get_albums_returned_type.rb
+- lib/kodi_client/types/favourites/details_favourite_type.rb
+- lib/kodi_client/types/favourites/fields_favourite_type.rb
+- lib/kodi_client/types/favourites/get_favourite_returned_type.rb
+- lib/kodi_client/types/favourites/type_type.rb
+- lib/kodi_client/types/files/file_label_type.rb
+- lib/kodi_client/types/files/get_directory_returned_type.rb
+- lib/kodi_client/types/files/get_sources_returned_type.rb
+- lib/kodi_client/types/files/media_type.rb
+- lib/kodi_client/types/files/prepare_download_returned_type.rb
+- lib/kodi_client/types/global/direction_type.rb
+- lib/kodi_client/types/global/global_time_type.rb
+- lib/kodi_client/types/global/id_label_type.rb
+- lib/kodi_client/types/global/id_name_type.rb
+- lib/kodi_client/types/global/increment_decrement_type.rb
+- lib/kodi_client/types/global/next_prev_type.rb
+- lib/kodi_client/types/global/password_encryption_type.rb
+- lib/kodi_client/types/global/rotate_type.rb
+- lib/kodi_client/types/global/toggle_type.rb
+- lib/kodi_client/types/gui/gui_window_type.rb
+- lib/kodi_client/types/gui/property_name_type.rb
+- lib/kodi_client/types/gui/property_value_type.rb
+- lib/kodi_client/types/gui/stereoscopy_mode_type.rb
+- lib/kodi_client/types/input/input_action_type.rb
+- lib/kodi_client/types/items/item_details_base_type.rb
+- lib/kodi_client/types/list/list_field_files_type.rb
+- lib/kodi_client/types/list/list_fields_all_type.rb
+- lib/kodi_client/types/list/list_item_all_type.rb
+- lib/kodi_client/types/list/list_item_base_type.rb
+- lib/kodi_client/types/list/list_item_file_type.rb
+- lib/kodi_client/types/list/list_limits_returned_type.rb
+- lib/kodi_client/types/list/list_limits_type.rb
+- lib/kodi_client/types/list/list_sort_method_type.rb
+- lib/kodi_client/types/list/list_sort_type.rb
+- lib/kodi_client/types/list/sort_order_type.rb
+- lib/kodi_client/types/media/media_artwork_type.rb
+- lib/kodi_client/types/media/media_details_base_type.rb
+- lib/kodi_client/types/media/media_type_type.rb
+- lib/kodi_client/types/player/audio_stream_type.rb
+- lib/kodi_client/types/player/player_position_time_type.rb
+- lib/kodi_client/types/player/player_repeat_type.rb
+- lib/kodi_client/types/player/player_speed_type.rb
+- lib/kodi_client/types/player/player_type.rb
+- lib/kodi_client/types/player/player_type_type.rb
+- lib/kodi_client/types/player/player_view_mode_type.rb
+- lib/kodi_client/types/player/player_visibility_type.rb
+- lib/kodi_client/types/player/property_name_type.rb
+- lib/kodi_client/types/player/property_value_type.rb
+- lib/kodi_client/types/player/seek_jump_type.rb
+- lib/kodi_client/types/player/seek_returned_type.rb
+- lib/kodi_client/types/player/subtitle_type.rb
+- lib/kodi_client/types/player/video_stream_type.rb
+- lib/kodi_client/types/player/view_mode_type.rb
+- lib/kodi_client/types/player/zoom_type.rb
+- lib/kodi_client/types/profiles/details_profile_type.rb
+- lib/kodi_client/types/profiles/fields_profile_type.rb
+- lib/kodi_client/types/profiles/get_profiles_returned_type.rb
+- lib/kodi_client/types/profiles/profile_password_type.rb
+- lib/kodi_client/types/pvr/channel_type_type.rb
+- lib/kodi_client/types/system/property_name_type.rb
+- lib/kodi_client/types/system/property_value_type.rb
+- lib/kodi_client/types/video/stream_details_type.rb
+- lib/kodi_client/types/video/video_cast_type.rb
+- lib/kodi_client/types/video/video_details_base_type.rb
+- lib/kodi_client/types/video/video_details_file_type.rb
+- lib/kodi_client/types/video/video_details_item_type.rb
+- lib/kodi_client/types/video/video_details_media_type.rb
+- lib/kodi_client/types/video/video_resume_type.rb
 homepage: https://github.com/cfe86/RubyKodiClient
 licenses:
 - MIT

data/lib/kodi_client/Chainable.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module KodiClient
-  # Offers methods like connect, auth and tls to be chained together
-  module Chainable
-
-    attr_accessor :options, :client
-
-    def connect(ip, port)
-      @client = KodiClient::Client.new
-      merge_options(->(options) { options.with_connection(ip, port) })
-    end
-
-    def auth(username, password)
-      merge_options(->(options) { options.with_auth(username, password) })
-    end
-
-    def use_tls(enabled: true)
-      merge_options(->(options) { options.with_tls(enabled) })
-    end
-
-    def merge_options(set_command)
-      client = def_client
-      options = def_options
-      set_command.call(options)
-      client.apply_options_to_methods(options)
-      client
-    end
-
-    def def_client
-      if @client.nil?
-        @client = KodiClient::Client.new
-        @client.client = @client
-      end
-      @client
-    end
-
-    def def_options
-      if @options.nil?
-        @options ||= KodiClient::Options.new
-        @client.options = @options
-      end
-      @options
-    end
-
-    private :def_client, :def_options, :merge_options
-  end
-end

data/lib/kodi_client/kodi_module.rb

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-module KodiClient
-
-  # the client that stores
-  class KodiModule
-
-    def apply_options(options)
-      @endpoint_url = "#{options.tls ? 'https://' : 'http://'}#{options.ip}:#{options.port}/jsonrpc"
-      @options = options
-    end
-
-    def invoke_api(request)
-      h = request.instance_variables.each_with_object({}) do |var, hash|
-        hash[var.to_s.delete('@')] = request.instance_variable_get(var)
-      end
-
-      @http_client ||= build_client
-      response = @http_client.post(@endpoint_url, json: h).to_s
-      JSON.parse(response)
-    end
-
-    def build_client
-      client = HTTP.headers(Content_Type: 'application/json')
-      if !@options.username.nil? && !@options.password.nil?
-        client = client.basic_auth({ user: @options.username, pass: @options.password })
-      end
-
-      client
-    end
-
-    private :build_client
-  end
-
-  # represents an error response
-  class KodiError
-
-    attr_reader :code, :message
-
-    def initialize(hash)
-      @code = hash['code']
-      @message = hash['message']
-    end
-
-    def ==(other)
-      @code == other.code && @message == other.message
-    end
-  end
-
-  # represents a kodi requests
-  class KodiRequest
-
-    attr_accessor :id, :jsonrpc, :method, :params
-
-    def initialize(kodi_id, method, params = {}, jsonrpc = '2.0')
-      @id = kodi_id
-      @jsonrpc = jsonrpc
-      @method = method
-      @params = params
-    end
-  end
-
-  # represents a kodi response
-  class KodiResponse
-    include Comparable
-
-    attr_reader :id, :jsonrpc, :result, :error
-
-    def initialize(hash)
-      @id = hash['id']
-      @jsonrpc = hash['jsonrpc']
-      @result = hash['result']
-      @error = KodiError.new(hash['error']) unless hash['error'].nil?
-    end
-
-    def error?
-      !@error.nil?
-    end
-  end
-end