kodi_client 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bbe8ae31b1c2f5092c6e6fa02a4641d3a73393dcedb44cd08e75f977b85b19b
-  data.tar.gz: 2d5362b89b5ef4e02542a2fcf9e548a8d33f38575496bbcd48a2b40c1c378003
+  metadata.gz: b9680c9f9dfa0c615b2f9291c9b8cf6eebc7eada7f505cbea740392d1713fabf
+  data.tar.gz: 965748a029340c66498531049584de14255e91206e5781be0cd41f3d392e32f9
 SHA512:
-  metadata.gz: 89796e76db1800a22e165a2bec14b2c3365318f87d7f57cf2861cdf2646ff0ca1e1108b47f0399782f4491fa9c2604e8fadec6f83f878b15e420bd74901510e8
-  data.tar.gz: f42bf33a0651081ec388e7bf5142d5284e00cd5d8e8d0b07d5766c05ea18197f7c523b97642fe993e6e789576c677945b1949764d592bdecab0d635d661d7edc
+  metadata.gz: 98754c7aa49b524de6a1569361dac82f42eb34dc760b599588db0431832c467e5b19f62732f46482da267ff6858db4c2ccbfbedcba768b52e01fb819abb2aa76
+  data.tar.gz: 2bea819a70f7bc67009966e2f428d9a64c3514e26a4de7cb5f96dcb57bb74fb9d57abb9812adee779385dd4f0863f2a5811900cd5f0a02f1897102b5b6b1501e

data/kodi_client.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'kodi_client'
-  spec.version       = '0.7.0'
+  spec.version       = '0.7.1'
   spec.authors       = ['Christian Feier']
   spec.email         = ['christian.feier@gmail.com']
 

data/lib/kodi_client/extensions/creatable.rb

@@ -20,13 +20,11 @@ module KodiClient
         return if args.nil?
 
         @type_mapping = {}
-        args.map { |it| @type_mapping[it[0]] = Creatable::CreateMap.new(it[1], it[2].nil? ? false : it[2]) }
+        args.map { |it| @type_mapping[it[0]] = Creatable.arr_to_mapping(it) }
       end
 
-      # if @type_mapping is nil, it tries to fetch the mapping from here instead
-      # @return [Hash<String, CreateMap>] an hash containing all the mappings
-      def lazy_type_mapping
-        {}
+      def self.arr_to_mapping(arr)
+        Creatable::CreateMap.new(arr[1], arr[2].nil? ? false : arr[2])
       end
 
       # expects the given hash is a list of hashes and calls #create on each element
@@ -51,7 +49,7 @@ module KodiClient
           fields = @fields_to_map
         end
 
-        mapping = @type_mapping.nil? ? lazy_type_mapping : @type_mapping
+        mapping = @type_mapping.nil? ? {} : @type_mapping
         args = fields.map do |it|
           field = it.to_s.gsub('_', '')
           Creatable.extract_field_from_hash(field, hash, mapping)
@@ -65,22 +63,19 @@ module KodiClient
       # used
       # @param hash [Hash] the given hash
       # @param fields [Array<String>] the fields to extract
-      # @param mapping [Hash<String, CreateMap>] optional mapping if a field contains a complex type
+      # @param mapping [Hash<String>, Array<Array<String>>] optional mapping if a field contains a complex type
       # @return [Array] an array containing the values of hash[field] in the given field order
       def self.hash_to_arr(hash, fields, mapping = {})
         return nil if hash.nil?
 
+        mapping = mapping.map { |it| arr_to_mapping(it) } unless mapping.is_a?(Hash)
+
         fields.map do |it|
           field = it.to_s.gsub('_', '')
           extract_field_from_hash(field, hash, mapping)
         end
       end
 
-      # map to self.hash_to_arr. The mapping is taken from #type_mapping
-      def hash_to_arr(hash, fields)
-        Creatable.hash_to_arr(hash, fields, @type_mapping.nil? ? {} : @type_mapping)
-      end
-
       # extracts the given field from the given hash and optionally applies mapping if given
       # @param field [String] the field name
       # @param hash [Hash, nil] the hash where to extract the field from

data/lib/kodi_client/types/audio/audio_details_artist_type.rb

@@ -18,8 +18,7 @@ module KodiClient
                          sort_name source_id style type years_active art date_added genre fan_art thumbnail
                          label]
 
-        type_mapping ['songgenres', Genre, true], ['art', Types::Media::MediaArtwork],
-                     ['roles', AudioArtistRole, true]
+        type_mapping ['songgenres', Genre, true], ['art', Types::Media::MediaArtwork], ['roles', AudioArtistRole, true]
 
         def initialize(artist, artist_id, born, compilation_artist, description, died, disambiguation, disbanded,
                        formed, gender, instrument, is_album_artist, mood, musicbrainz_artist_id, roles, song_genres,

data/lib/kodi_client/types/audio/audio_details_base_type.rb

@@ -10,8 +10,7 @@ module KodiClient
         attr_reader :art, :date_added, :genre
 
         def audio_details_base_mappings
-          mappings = { 'art' => Extensions::Creatable::CreateMap.new(Types::Media::MediaArtwork) }
-          mappings.merge(media_details_base_mappings)
+          [['art', Types::Media::MediaArtwork]] + media_details_base_mappings
         end
 
         def audio_details_base_by_hash(hash)

data/lib/kodi_client/types/audio/audio_details_media_type.rb

@@ -7,6 +7,10 @@ module KodiClient
       module AudioDetailsMedia
         include AudioDetailsBase
 
+        def self.included(base)
+          base.extend(self)
+        end
+
         attr_reader :artist, :artist_id, :display_artist, :musicbrainz_album_artist_id, :original_date, :rating,
                     :release_date, :sort_artist, :title, :user_rating, :votes, :year
 

data/lib/kodi_client/types/audio/audio_details_song_type.rb

@@ -8,7 +8,6 @@ module KodiClient
         include AudioDetailsMedia
         include Extensions::Comparable
         extend Extensions::Creatable
-        extend AudioDetailsMedia
 
         attr_reader :album, :album_artist, :album_artist_id, :album_id, :album_release_type, :bitrate, :bpm, :channels,
                     :comment, :contributors, :disc, :disc_title, :display_composer, :display_conductor,
@@ -16,6 +15,8 @@ module KodiClient
                     :musicbrainz_artist_id, :musicbrainz_track_id, :play_count, :sample_rate, :song_id, :source_id,
                     :track
 
+        type_mapping ['contributors', Types::Audio::AudioContributor, true], *audio_details_media_mappings
+
         fields_to_map %w[album album_artist album_artist_id album_id album_release_type bitrate bpm channels
                          comment contributors disc disc_title display_composer display_conductor display_lyricist
                          display_orchestra duration file genre_id last_played lyrics mood musicbrainz_artist_id
@@ -24,11 +25,6 @@ module KodiClient
                          rating release_date sort_artist title user_rating votes year
                          art date_added genre fan_art thumbnail label]
 
-        def self.lazy_type_mapping
-          mapping = { 'contributors' => Extensions::Creatable::CreateMap.new(Types::Audio::AudioContributor, true) }
-          mapping.merge(audio_details_media_mappings)
-        end
-
         def initialize(album, album_artist, album_artist_id, album_id, album_release_type, bitrate, bpm, channels,
                        comment, contributors, disc, disc_title, display_composer, display_conductor, display_lyricist,
                        display_orchestra, duration, file, genre_id, last_played, lyrics, mood, musicbrainz_artist_id,

data/lib/kodi_client/types/items/item_details_base_type.rb

@@ -8,7 +8,7 @@ module KodiClient
         attr_reader :label
 
         def item_details_base_mappings
-          {}
+          []
         end
 
         def item_details_base_by_hash(hash)

data/lib/kodi_client/types/list/list_item_all_type.rb

@@ -8,7 +8,6 @@ module KodiClient
         include ListItemBase
         include Extensions::Comparable
         extend Extensions::Creatable
-        extend ListItemBase
 
         attr_reader :channel, :channel_number, :channel_type, :end_time, :hidden, :locked, :start_time,
                     :sub_channel_number
@@ -27,9 +26,7 @@ module KodiClient
                          fan_art thumbnail label artist artist_id display_artist musicbrainz_album_artist_id
                          rating sort_artist user_rating year genre]
 
-        def self.lazy_type_mapping
-          list_item_base_mappings
-        end
+        type_mapping(*list_item_base_mappings)
 
         def initialize(channel, channel_number, channel_type, end_time, hidden, locked, start_time, sub_channel_number,
                        album, album_artist, album_artist_id, album_id, album_release_type, album_status, bit_rate,

data/lib/kodi_client/types/list/list_item_base_type.rb

@@ -8,6 +8,10 @@ module KodiClient
         include Video::VideoDetailsFile
         include Audio::AudioDetailsMedia
 
+        def self.included(base)
+          base.extend(self)
+        end
+
         attr_reader :album, :album_artist, :album_artist_id, :album_id, :album_release_type, :album_status, :bit_rate,
                     :bpm, :cast, :channels, :comment, :compilation, :contributors, :country, :description, :disc,
                     :disc_title, :display_composer, :display_conductor, :display_lyricist, :display_orchestra,
@@ -19,14 +23,13 @@ module KodiClient
                     :trailer, :tv_show_id, :type, :unique_id, :votes, :watched_episodes, :writer
 
         def list_item_base_mappings
-          mappings = {
-            'cast' => Extensions::Creatable::CreateMap.new(Video::VideoCast, true),
-            'contributors' => Extensions::Creatable::CreateMap.new(Audio::AudioContributor, true),
-            'resume' => Extensions::Creatable::CreateMap.new(Video::VideoResume),
-            'streamdetails' => Extensions::Creatable::CreateMap.new(Video::StreamDetails),
-            'art' => Extensions::Creatable::CreateMap.new(Media::MediaArtwork)
-          }
-          mappings.merge(video_details_file_mappings).merge(audio_details_media_mappings)
+          [
+            ['cast', Video::VideoCast, true],
+            ['contributors', Audio::AudioContributor, true],
+            ['resume', Video::VideoResume],
+            ['streamdetails', Video::StreamDetails],
+            ['art', Media::MediaArtwork]
+          ] + video_details_file_mappings + audio_details_media_mappings
         end
 
         def list_item_base_by_hash(hash)

data/lib/kodi_client/types/list/list_item_file_type.rb

@@ -8,7 +8,6 @@ module KodiClient
         include ListItemBase
         include Extensions::Comparable
         extend Extensions::Creatable
-        extend ListItemBase
 
         attr_reader :file, :file_type, :last_modified, :mime_type, :size
 
@@ -26,9 +25,8 @@ module KodiClient
                          fan_art thumbnail label artist artist_id display_artist musicbrainz_album_artist_id
                          rating sort_artist user_rating year genre]
 
-        def self.lazy_type_mapping
-          list_item_base_mappings
-        end
+        type_mapping(*list_item_base_mappings)
+
 
         def initialize(file_type, last_modified, mime_type, size,
                        album, album_artist, album_artist_id, album_id, album_release_type, album_status, bit_rate,

data/lib/kodi_client/types/media/media_details_base_type.rb

@@ -14,7 +14,8 @@ module KodiClient
         end
 
         def media_details_base_by_hash(hash)
-          media_details_base(*Extensions::Creatable.hash_to_arr(hash, %w[fan_art thumbnail label]), media_details_base_mappings)
+          media_details_base(*Extensions::Creatable.hash_to_arr(hash, %w[fan_art thumbnail label]),
+                             media_details_base_mappings)
         end
 
         def media_details_base(fan_art, thumbnail, label)

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

@@ -10,17 +10,17 @@ module KodiClient
         attr_reader :director, :resume, :runtime, :stream_details
 
         def video_details_file_mappings
-          mappings = {
-            'resume' => Extensions::Creatable::CreateMap.new(VideoResume),
-            'streamdetails' => Extensions::Creatable::CreateMap.new(StreamDetails)
-          }
-          mappings.merge(video_details_item_mappings)
+          [
+            ['resume', VideoResume],
+            ['streamdetails', StreamDetails]
+          ] + video_details_item_mappings
         end
 
         def video_details_file_by_hash(hash)
-          video_details_file(*Extensions::Creatable.hash_to_arr(hash, %w[director resume runtime stream_details date_added
-                                                             file last_played plot title art play_count fan_art
-                                                             thumbnail label], video_details_file_mappings))
+          video_details_file(*Extensions::Creatable.hash_to_arr(hash, %w[director resume runtime stream_details 
+                                                                         date_added file last_played plot title art 
+                                                                         play_count fan_art thumbnail label],
+                                                                video_details_file_mappings))
         end
 
         def video_details_file(director, resume, runtime, stream_details, date_added, file, last_played, plot, title,

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

@@ -15,7 +15,7 @@ module KodiClient
 
         def video_details_item_by_hash(hash)
           video_details_item(*Extensions::Creatable.hash_to_arr(hash, %w[date_added file last_played plot title art
-                                                             play_count fan_art thumbnail label],
+                                                                         play_count fan_art thumbnail label],
                                                                 video_details_item_mappings))
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kodi_client
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Christian Feier