kodi_client 0.5.6 → 0.5.7

data/lib/kodi_client/method/player.rb

@@ -41,7 +41,7 @@ module KodiClient
       def get_active_players(kodi_id = 1)
         request = KodiRequest.new(kodi_id, GET_ACTIVE_PLAYER, {})
         json = invoke_api(request)
-        result = json['result'].nil? ? nil : json['result'].map { |it| Types::Player::Player.new(it) }
+        result = Types::Player::Player.create_list(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end
@@ -57,7 +57,7 @@ module KodiClient
         request = KodiRequest.new(kodi_id, GET_ITEM, { 'playerid' => player_id,
                                                        'properties' => properties })
         json = invoke_api(request)
-        result = Types::List::ListItemAll.new(json['result']['item'])
+        result = Types::List::ListItemAll.create(json['result']['item'])
         json['result'] = result
         KodiResponse.new(json)
       end
@@ -65,7 +65,7 @@ module KodiClient
       def get_players(media = Types::Media::MediaType::ALL, kodi_id = 1)
         request = KodiRequest.new(kodi_id, GET_PLAYERS, { 'media' => media })
         json = invoke_api(request)
-        result = json['result'].map { |it| Types::Player::Player.new(it) }
+        result = Types::Player::Player.create_list(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end
@@ -74,7 +74,7 @@ module KodiClient
         request = KodiRequest.new(kodi_id, GET_PROPERTIES, { 'playerid' => player_id,
                                                              'properties' => properties })
         json = invoke_api(request)
-        result = Types::Player::PropertyValue.new(json['result'])
+        result = Types::Player::PropertyValue.create(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end
@@ -82,7 +82,7 @@ module KodiClient
       def get_view_mode(kodi_id = 1)
         request = KodiRequest.new(kodi_id, GET_VIEW_MODE, {})
         json = invoke_api(request)
-        result = Types::Player::PlayerViewMode.new(json['result'])
+        result = Types::Player::PlayerViewMode.create(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end
@@ -130,7 +130,7 @@ module KodiClient
       def seek(player_id, value, kodi_id = 1)
         request = KodiRequest.new(kodi_id, SEEK, { 'playerid' => player_id, 'value' => value })
         json = invoke_api(request)
-        result = Types::Player::SeekReturnValue.new(json['result'])
+        result = Types::Player::SeekReturned.create(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end

data/lib/kodi_client/method/profiles.rb

@@ -15,7 +15,7 @@ module KodiClient
       def get_current_profile(properties = Types::Profiles::FieldsProfile.all_properties, kodi_id = 1)
         request = KodiRequest.new(kodi_id, GET_CURRENT_PROFILE, { 'properties' => properties })
         json = invoke_api(request)
-        result = json['result'].nil? ? nil : Types::Profiles::DetailsProfile.new(json['result'])
+        result = Types::Profiles::DetailsProfile.create(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end
@@ -30,7 +30,7 @@ module KodiClient
                                                 'order' => sort.order,
                                                 'useartistsortname' => sort.use_artist_sort_name } })
         json = invoke_api(request)
-        result = json['result'].nil? ? nil : Types::Profiles::GetProfilesReturned.new(json['result'])
+        result = Types::Profiles::GetProfilesReturned.create(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end

data/lib/kodi_client/method/system.rb

@@ -25,7 +25,7 @@ module KodiClient
       def get_properties(properties = Types::System::PropertyName.all_properties, kodi_id = 1)
         request = KodiRequest.new(kodi_id, GET_PROPERTIES, { 'properties' => properties })
         json = invoke_api(request)
-        result = json['result'].nil? ? nil : Types::System::PropertyValue.new(json['result'])
+        result = Types::System::PropertyValue.create(json['result'])
         json['result'] = result
         KodiResponse.new(json)
       end

data/lib/kodi_client/util/comparable.rb

@@ -4,7 +4,6 @@ module KodiClient
 
   # offers compare methods
   module Comparable
-
     def compare(obj1, obj2)
       is_same = true
       obj1.instance_variables.each do |it|
@@ -13,5 +12,9 @@ module KodiClient
 
       is_same
     end
+
+    def ==(other)
+      compare(self, other)
+    end
   end
 end

data/lib/kodi_client/util/creatable.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module KodiClient
+
+  # creates a create and create_list method by hash
+  module Creatable
+
+    def attr_accessor(*args)
+      attr_reader(*args)
+      attr_writer(*args)
+    end
+
+    def attr_reader(*args)
+      @kodi_fields = args.map { |it| it.to_s.gsub('_', '') }
+
+      args.each do |it|
+        inst_variable_name = "@#{it}".to_sym
+        define_method it do
+          instance_variable_get(inst_variable_name)
+        end
+      end
+    end
+
+    def attr_writer(*args)
+      args.each do |it|
+        inst_variable_name = "@#{it}".to_sym
+        define_method "#{it}=" do |new_value|
+          instance_variable_set(inst_variable_name, new_value)
+        end
+      end
+    end
+
+    def create_list(hash)
+      hash.nil? ? [] : hash.map { |it| create(it) }
+    end
+
+    def create(hash)
+      return nil if hash.nil?
+      return nil if @kodi_fields.none? { |it| !hash[it].nil? }
+
+      new(*@kodi_fields.map { |it| hash[it] })
+    end
+
+    def self.hash_to_arr(hash, fields)
+      fields.map { |it| hash[it.to_s.gsub('_', '')].nil? ? nil : hash[it.to_s.gsub('_', '')] }
+    end
+
+    def hash_to_arr(hash, fields)
+      Creatable.hash_to_arr(hash, fields)
+    end
+  end
+end

data/lib/kodi_client.rb

@@ -35,15 +35,11 @@ module KodiClient
       @system = KodiClient::Modules::System.new
     end
 
-    def apply_options(options)
-      @addons.apply_options(options)
-      @application.apply_options(options)
-      @gui.apply_options(options)
-      @input.apply_options(options)
-      @player.apply_options(options)
-      @favourites.apply_options(options)
-      @profiles.apply_options(options)
-      @system.apply_options(options)
+    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)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kodi_client
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Christian Feier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -69,6 +69,7 @@ files:
 - lib/kodi_client/method/system.rb
 - lib/kodi_client/options.rb
 - lib/kodi_client/util/comparable.rb
+- lib/kodi_client/util/creatable.rb
 - lib/kodi_client/util/iterable.rb
 homepage: https://github.com/cfe86/RubyKodiClient
 licenses: