kodi_client 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5686743b785e5b591798992689064cec6c1e0d48a54721b97d9d28ae5a97ded3
-  data.tar.gz: fc7516af1d65c10ef63897253979bdb67b8d74f6f11bb74c959ccc942f8c026e
+  metadata.gz: 5fea7dad06fe723225e4d8bf268db09490af87c98a74f653e5966f170d1156fd
+  data.tar.gz: a4d8a3dfcac1a85abbf1c073b0c2f6016de9de9d07249eabc5067fe47c829727
 SHA512:
-  metadata.gz: ed6fbc05813a0f0a606c08c2e18606603af576e06f4af5941912097b477ad0a622a5ea7f47c7ce52062188b38522d60522337a06261d23f6894f5e1fbb6480c6
-  data.tar.gz: fb200b6342ff5a29d291d60e8c8e61d53de6012bcc5b29058e16ae2eee8d3df9583ed7e8f6f78a72a2da02481d74e9e48d6dbc945dbad73ed85526e711220532
+  metadata.gz: 031fcbe6dc03750fa90d3b8d395f903082d6b2b8586f3fe49ff3d9d5ca3375501e2b8e34305808399026de10bd62a5cfc00bf3ad5fc505cb5043e47ba2cdc85f
+  data.tar.gz: 6e9622971b0e8737130feddefca5ac49a8efd4073dd4ec9719b524c2cb7ba3781e915322a03bd1ffac63fe4ab48b3ed1428a83135a69223add9a041b8ff1288d

data/kodi_client.gemspec

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

data/lib/kodi_client/global_types/addon_types.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'kodi_client/global_types/item_types'
+require 'kodi_client/global_types/list_types'
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
 require 'kodi_client/util/creatable'
@@ -118,17 +119,10 @@ module KodiClient
         attr_reader :addon_id, :author, :broken, :dependencies, :description, :disclaimer, :enabled, :extra_info,
                     :fan_art, :installed, :name, :path, :rating, :summary, :thumbnail, :type, :version
 
-        def self.create(hash)
-          return nil if hash.nil?
+        fields_to_map %w[addon_id author broken dependencies description disclaimer enabled extra_info fan_art
+                         installed name path rating summary thumbnail type version label]
 
-          dependencies = AddonDependency.create_list(hash['dependencies'])
-          extra_info = AddonExtraInfo.create_list(hash['extrainfo'])
-
-          new(hash['addonid'], hash['author'], hash['broken'], dependencies, hash['description'], hash['disclaimer'],
-              hash['enabled'], extra_info, hash['fanart'], hash['installed'], hash['name'], hash['path'],
-              hash['rating'], hash['summary'], hash['thumbnail'], hash['type'], hash['version'],
-              *hash_to_arr(hash, ['label']))
-        end
+        type_mapping ['dependencies', AddonDependency, true], ['extrainfo', AddonExtraInfo, true]
 
         def initialize(addon_id, author, broken, dependencies, description, disclaimer, enabled, extra_info,
                        fan_art, installed, name, path, rating, summary, thumbnail, type, version, label)
@@ -156,16 +150,11 @@ module KodiClient
       # getAddons return
       class Addons
         include Comparable
+        extend Creatable
 
         attr_reader :addons, :limits
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          addons = AddonDetails.create_list(hash['addons'])
-          limits = List::ListLimitsReturned.create(hash['limits'])
-          new(addons, limits)
-        end
+        type_mapping ['addons', AddonDetails, true], ['limits', List::ListLimitsReturned]
 
         def initialize(addons, limits)
           @addons = addons
@@ -176,14 +165,11 @@ module KodiClient
       # getAddon return
       class Addon
         include Comparable
+        extend Creatable
 
         attr_reader :addon
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          new(AddonDetails.create(hash['addon']))
-        end
+        type_mapping ['addon', AddonDetails]
 
         def initialize(addon)
           @addon = addon

data/lib/kodi_client/global_types/application_types.rb

@@ -20,6 +20,21 @@ module KodiClient
         LANGUAGE = 'language'
       end
 
+      # represent application properties version
+      class Version
+        include Comparable
+        extend Creatable
+
+        attr_reader :major, :minor, :revision, :tag
+
+        def initialize(major, minor, revision, tag)
+          @major = major
+          @minor = minor
+          @revision = revision
+          @tag = tag
+        end
+      end
+
       # Application.Property.Value https://kodi.wiki/view/JSON-RPC_API/v12#Application.Property.Value
       class PropertyValue
         include Comparable
@@ -27,12 +42,7 @@ module KodiClient
 
         attr_reader :name, :version, :muted, :volume
 
-        def self.create(hash)
-          return null if hash.nil?
-
-          version = Version.create(hash['version'])
-          new(hash['name'], version, hash['muted'], hash['volume'])
-        end
+        type_mapping ['version', Version]
 
         def initialize(name, version, muted, volume)
           @name = name
@@ -41,21 +51,6 @@ module KodiClient
           @volume = volume
         end
       end
-
-      # represent application properties version
-      class Version
-        include Comparable
-        extend Creatable
-
-        attr_reader :major, :minor, :revision, :tag
-
-        def initialize(major, minor, revision, tag)
-          @major = major
-          @minor = minor
-          @revision = revision
-          @tag = tag
-        end
-      end
     end
   end
 end

data/lib/kodi_client/global_types/audio_types.rb

@@ -38,9 +38,14 @@ module KodiClient
 
         attr_reader :art, :date_added, :genre
 
+        def audio_details_base_mappings
+          mappings = { 'art' => Creatable::CreateMap.new(Types::Media::MediaArtwork) }
+          mappings.merge(media_details_base_mappings)
+        end
+
         def audio_details_base_by_hash(hash)
-          audio_details_base(Types::Media::MediaArtwork.create(hash['art']), hash['date_added'], hash['genre'],
-                             *Creatable.hash_to_arr(hash, %w[fan_art thumbnail label]))
+          audio_details_base(*Creatable.hash_to_arr(hash, %w[art date_added genre fan_art thumbnail label]),
+                             audio_details_base_mappings)
         end
 
         def audio_details_base(art, date_added, genre, fan_art, thumbnail, label)
@@ -58,11 +63,16 @@ module KodiClient
         attr_reader :artist, :artist_id, :display_artist, :musicbrainz_album_artist_id, :original_date, :rating,
                     :release_date, :sort_artist, :title, :user_rating, :votes, :year
 
+        def audio_details_media_mappings
+          audio_details_base_mappings
+        end
+
         def audio_details_media_by_hash(hash)
-          audio_details_media(hash['artist'], hash['artistid'], hash['displayartist'], hash['musicbrainzalbumartistid'],
-                              hash['originaldate'], hash['rating'], hash['releasedate'], hash['sortartist'],
-                              hash['title'], hash['userrating'], hash['votes'], hash['year'],
-                              *Creatable.hash_to_arr(hash, %w[art date_added genre fan_art thumbnail label]))
+          audio_details_media(*Creatable.hash_to_arr(hash, %w[artist artist_id display_artist
+                                                              musicbrainz_album_artist_id original_date rating
+                                                              release_date sort_artist title user_rating votes year art
+                                                              date_added genre fan_art thumbnail label],
+                                                     audio_details_base_mappings))
         end
 
         def audio_details_media(artist, artist_id, display_artist, musicbrainz_album_artist_id, original_date,
@@ -83,6 +93,134 @@ module KodiClient
           audio_details_base(art, date_added, genre, fan_art, thumbnail, label)
         end
       end
+
+      # Audio.Fields.Album https://kodi.wiki/view/JSON-RPC_API/v12#Audio.Fields.Album
+      module AudioFieldsAlbum
+        extend Iterable
+
+        #album id
+        ALBUM_DURATION = 'albumduration'
+        ALBUM_LABEL = 'albumlabel'
+        ALBUM_STATUS = 'albumstatus'
+        ART = 'art'
+        ARTIST = 'artist'
+        ARTIST_ID = 'artistid'
+        COMPILATION = 'compilation'
+        DATE_ADDED = 'dateadded'
+        DATE_MODIFIED = 'datemodified'
+        DATE_NEW = 'datenew'
+        DESCRIPTION = 'description'
+        DISPLAY_ARTIST = 'displayartist'
+        FAN_ART = 'fanart'
+        GENRE = 'genre'
+        IS_BOX_SET = 'isboxset'
+        LAST_PLAYED = 'lastplayed'
+        MOOD = 'mood'
+        MUSICBRAINZ_ALBUM_ARTIST_ID = 'musicbrainzalbumartistid'
+        MUSICBRAINZ_ALBUM_ID = 'musicbrainzalbumid'
+        MUSICBRAINZ_RELEASE_GROUP_ID = 'musicbrainzreleasegroupid'
+        ORIGINAL_DATE = 'originaldate'
+        PLAY_COUNT = 'playcount'
+        RATING = 'rating'
+        RELEASE_DATE = 'releasedate'
+        RELEASE_TYPE = 'releasetype'
+        SONG_GENRES = 'songgenres'
+        SORT_ARTIST = 'sortartist'
+        SOURCE_ID = 'sourceid'
+        STYLE = 'style'
+        THEME = 'theme'
+        THUMBNAIL = 'thumbnail'
+        TITLE = 'title'
+        TOTAL_DISCS = 'totaldiscs'
+        TYPE = 'type'
+        USER_RATING = 'userrating'
+        VOTES = 'votes'
+        YEAR = 'year'
+      end
+
+      # Audio.Details.Genres https://kodi.wiki/view/JSON-RPC_API/v12#Audio.Details.Genres
+      class Genre
+        include Comparable
+        extend Creatable
+
+        attr_reader :genre_id, :title
+
+        def initialize(genre_id, title)
+          @genre_id = genre_id
+          @title = title
+        end
+      end
+
+      # Audio.Details.Album https://kodi.wiki/view/JSON-RPC_API/v12#Audio.Details.Album
+      class DetailsAlbum
+        include AudioDetailsMedia
+        include Comparable
+        extend Creatable
+
+        attr_reader :album_duration, :album_id, :album_label, :album_status, :compilation, :date_modified, :date_new,
+                    :description, :is_box_set, :last_played, :mood, :musicbrainz_album_id, :musicbrainz_release_group_id,
+                    :play_count, :release_type, :song_genres, :source_id, :style, :theme, :total_discs, :type
+
+        fields_to_map %w[album_duration album_id album_label album_status art artist artist_id compilation date_added
+                         date_modified date_new description display_artist fan_art genre is_box_set label last_played
+                         mood musicbrainz_album_artist_id musicbrainz_album_id musicbrainz_release_group_id
+                         original_date play_count rating release_date release_type song_genres sort_artist source_id
+                         style theme thumbnail title total_discs type user_rating votes year]
+
+        type_mapping ['songgenres', Genre, true], ['art', Types::Media::MediaArtwork]
+
+        def initialize(album_duration, album_id, album_label, album_status, art, artist, artist_id, compilation,
+                       date_added, date_modified, date_new, description, display_artist, fan_art, genre, is_box_set,
+                       label, last_played, mood, musicbrainz_album_artist_id, musicbrainz_album_id,
+                       musicbrainz_release_group_id, original_date, play_count, rating, release_date, release_type,
+                       song_genres, sort_artist, source_id, style, theme, thumbnail, title, total_discs, type,
+                       user_rating, votes, year)
+          @album_duration = album_duration
+          @album_id = album_id
+          @album_label = album_label
+          @album_status = album_status
+          @compilation = compilation
+          @date_modified = date_modified
+          @date_new = date_new
+          @description = description
+          @is_box_set = is_box_set
+          @last_played = last_played
+          @mood = mood
+          @musicbrainz_album_id = musicbrainz_album_id
+          @musicbrainz_release_group_id = musicbrainz_release_group_id
+          @play_count = play_count
+          @release_type = release_type
+          @song_genres = song_genres
+          @source_id = source_id
+          @style = style
+          @theme = theme
+          @total_discs = total_discs
+          @type = type
+          audio_details_media(artist, artist_id, display_artist, musicbrainz_album_artist_id, original_date,
+                              rating, release_date, sort_artist, title, user_rating, votes, year,
+                              art, date_added, genre, fan_art, thumbnail, label)
+        end
+      end
+
+      # return type for AudioLibrary.GetAlbums
+      class GetAlbumsReturned
+        include Comparable
+        extend Creatable
+
+        attr_reader :albums, :limits
+
+        def self.lazy_type_mapping
+          {
+            'albums' => Creatable::CreateMap.new(DetailsAlbum, true),
+            'limits' => Creatable::CreateMap.new(List::ListLimitsReturned)
+          }
+        end
+
+        def initialize(albums, limits)
+          @albums = albums
+          @limits = limits
+        end
+      end
     end
   end
 end

data/lib/kodi_client/global_types/favourites_types.rb

@@ -54,11 +54,7 @@ module KodiClient
 
         attr_reader :favourites, :limits
 
-        def self.create(hash)
-          favourites = DetailsFavourite.create_list(hash['favourites'])
-          limits = Types::List::ListLimitsReturned.create(hash['limits'])
-          new(favourites, limits)
-        end
+        type_mapping ['favourites', DetailsFavourite, true], ['limits', Types::List::ListLimitsReturned]
 
         def initialize(favourites, limits)
           @favourites = favourites

data/lib/kodi_client/global_types/files_types.rb

@@ -27,14 +27,7 @@ module KodiClient
 
         attr_reader :files, :limits
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          files = Types::List::ListItemFile.create_list(hash['files'])
-          limits = Types::List::ListLimitsReturned.create(hash['limits'])
-
-          new(files, limits)
-        end
+        type_mapping ['files', List::ListItemFile, true], ['limits', List::ListLimitsReturned]
 
         def initialize(files, limits)
           @files = files
@@ -49,14 +42,7 @@ module KodiClient
 
         attr_reader :sources, :limits
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          sources = Types::List::FileLabel.create_list(hash['sources'])
-          limits = Types::List::ListLimitsReturned.create(hash['limits'])
-
-          new(sources, limits)
-        end
+        type_mapping ['sources', List::FileLabel, true], ['limits', List::ListLimitsReturned]
 
         def initialize(sources, limits)
           @sources = sources

data/lib/kodi_client/global_types/gui_types.rb

@@ -168,15 +168,8 @@ module KodiClient
 
         attr_reader :current_control, :current_window, :fullscreen, :skin, :stereoscopic_mode
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          current_control = Global::IdLabel.create(hash['currentcontrol'])
-          current_window = Global::IdLabel.create(hash['currentwindow'])
-          skin = Global::IdName.create(hash['skin'])
-          stereoscopic_mode = StereoscopyMode.create(hash['stereoscopicmode'])
-          new(current_control, current_window, hash['fullscreen'], skin, stereoscopic_mode)
-        end
+        type_mapping ['currentcontrol', Global::IdLabel], ['currentwindow', Global::IdLabel],
+                     ['skin', Global::IdName], ['stereoscopicmode', StereoscopyMode]
 
         def initialize(current_control, current_window, fullscreen, skin, stereoscopic_mode)
           @current_control = current_control

data/lib/kodi_client/global_types/item_types.rb

@@ -9,8 +9,12 @@ module KodiClient
 
         attr_reader :label
 
+        def item_details_base_mappings
+          {}
+        end
+
         def item_details_base_by_hash(hash)
-          item_details_base(hash['label'])
+          item_details_base(*Creatable.hash_to_arr(hash, %w[label], item_details_base_mappings))
         end
 
         def item_details_base(label)

data/lib/kodi_client/global_types/list_types.rb

@@ -2,6 +2,7 @@
 
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/creatable'
+require 'kodi_client/util/iterable'
 require 'kodi_client/global_types/video_types'
 require 'kodi_client/global_types/audio_types'
 
@@ -28,11 +29,7 @@ module KodiClient
 
         attr_reader :list_start, :list_end, :total
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          new(hash['start'], hash['end'], hash['total'])
-        end
+        fields_to_map %w[start end total]
 
         def initialize(list_start, list_end, total)
           @list_start = list_start
@@ -257,31 +254,34 @@ module KodiClient
                     :special_sort_season, :studio, :style, :tag, :tag_line, :theme, :top250, :total_discs, :track,
                     :trailer, :tv_show_id, :type, :unique_id, :votes, :watched_episodes, :writer
 
+        def list_item_base_mappings
+          mappings = {
+            'cast' => Creatable::CreateMap.new(Video::VideoCast, true),
+            'contributors' => Creatable::CreateMap.new(Audio::AudioContributor, true),
+            'resume' => Creatable::CreateMap.new(Video::VideoResume),
+            'streamdetails' => Creatable::CreateMap.new(Video::Streams),
+            'art' => Creatable::CreateMap.new(Media::MediaArtwork)
+          }
+          mappings.merge(video_details_file_mappings).merge(audio_details_media_mappings)
+        end
+
         def list_item_base_by_hash(hash)
-          cast = Types::Video::VideoCast.create_list(hash['cast'])
-          contributors = Types::Audio::AudioContributor.create_list(hash['contributors'])
-          resume = Types::Video::VideoResume.create(hash['resume'])
-          stream_details = Types::Video::Streams.create(hash['streamdetails'])
-          art = Types::Media::MediaArtwork.create(hash['art'])
-          hash['type'] = 'unknown' if hash['type'].nil?
-          list_item_base(*Creatable.hash_to_arr(hash, %w[album album_artist album_artist_id album_id
-                                                         album_release_type album_status bit_rate bpm]), cast,
-                         hash['channels'], hash['comment'], hash['compilation'], contributors,
-                         *Creatable.hash_to_arr(hash, %w[country description disc disc_title display_composer
-                                                         display_conductor display_lyricist display_orchestra duration
-                                                         dyn_path episode episode_guide first_aired id imdb_number
-                                                         is_box_set lyrics media_path mood mpaa musicbrainz_artist_id
-                                                         musicbrainz_track_id original_date original_title plot_outline
-                                                         premiered production_code release_date release_type sample_rate
-                                                         season set set_id show_link show_title sort_title
-                                                         special_sort_episode special_sort_season studio style tag
-                                                         tag_line theme top250 total_discs track trailer tv_show_id
-                                                         type unique_id votes watched_episodes writer director]),
-                         resume, hash['runtime'], stream_details,
-                         *Creatable.hash_to_arr(hash, %w[date_added file last_played plot title]), art,
-                         *Creatable.hash_to_arr(hash, %w[play_count fan_art thumbnail label artist artist_id
-                                                         display_artist musicbrainz_album_artist_id rating sort_artist
-                                                         user_rating year genre]))
+          return nil if hash.nil?
+
+          list_item_base(*Creatable.hash_to_arr(
+            hash, %w[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
+                     duration dyn_path episode episode_guide first_aired id imdb_number is_box_set
+                     lyrics media_path mood mpaa musicbrainz_artist_id musicbrainz_track_id original_date
+                     original_title plot_outline premiered production_code release_date release_type
+                     sample_rate season set set_id show_link show_title sort_title special_sort_episode
+                     special_sort_season studio style tag tag_line theme top250 total_discs track
+                     trailer tv_show_id type unique_id votes watched_episodes writer director resume
+                     runtime stream_details date_added file last_played plot title art play_count
+                     fan_art thumbnail label artist artist_id display_artist musicbrainz_album_artist_id
+                     rating sort_artist user_rating year genre], list_item_base_mappings
+          ))
         end
 
         def list_item_base(album, album_artist, album_artist_id, album_id, album_release_type, album_status, bit_rate,
@@ -375,38 +375,27 @@ module KodiClient
         include ListItemBase
         include Comparable
         extend Creatable
+        extend ListItemBase
 
         attr_reader :channel, :channel_number, :channel_type, :end_time, :hidden, :locked, :start_time,
                     :sub_channel_number
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          cast = Types::Video::VideoCast.create_list(hash['cast'])
-          contributors = Types::Audio::AudioContributor.create_list(hash['contributors'])
-          resume = Types::Video::VideoResume.create(hash['resume'])
-          stream_details = Types::Video::Streams.create(hash['streamdetails'])
-          art = Types::Media::MediaArtwork.create(hash['art'])
-          hash['type'] = 'unknown' if hash['type'].nil?
-          new(*Creatable.hash_to_arr(hash, %w[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 bpm]), cast,
-              hash['channels'], hash['comment'], hash['compilation'], contributors,
-              *Creatable.hash_to_arr(hash, %w[country description disc disc_title display_composer
-                                              display_conductor display_lyricist display_orchestra duration
-                                              dyn_path episode episode_guide first_aired id imdb_number
-                                              is_box_set lyrics media_path mood mpaa musicbrainz_artist_id
-                                              musicbrainz_track_id original_date original_title plot_outline
-                                              premiered production_code release_date release_type sample_rate
-                                              season set set_id show_link show_title sort_title
-                                              special_sort_episode special_sort_season studio style tag
-                                              tag_line theme top250 total_discs track trailer tv_show_id
-                                              type unique_id votes watched_episodes writer director]),
-              resume, hash['runtime'], stream_details,
-              *Creatable.hash_to_arr(hash, %w[date_added file last_played plot title]), art,
-              *Creatable.hash_to_arr(hash, %w[play_count fan_art thumbnail label artist artist_id
-                                              display_artist musicbrainz_album_artist_id rating sort_artist
-                                              user_rating year genre]))
+        fields_to_map %w[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
+                         bpm cast channels comment compilation contributors country description disc
+                         disc_title display_composer display_conductor display_lyricist display_orchestra
+                         duration dyn_path episode episode_guide first_aired id imdb_number is_box_set
+                         lyrics media_path mood mpaa musicbrainz_artist_id musicbrainz_track_id original_date
+                         original_title plot_outline premiered production_code release_date release_type
+                         sample_rate season set set_id show_link show_title sort_title special_sort_episode
+                         special_sort_season studio style tag tag_line theme top250 total_discs track
+                         trailer tv_show_id type unique_id votes watched_episodes writer director resume
+                         runtime stream_details date_added file last_played plot title art play_count
+                         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
 
         def initialize(channel, channel_number, channel_type, end_time, hidden, locked, start_time, sub_channel_number,
@@ -422,7 +411,6 @@ module KodiClient
                        runtime, stream_details, date_added, file, last_played, plot, title, art, play_count,
                        fan_art, thumbnail, label, artist, artist_id, display_artist, musicbrainz_album_artist_id,
                        rating, sort_artist, user_rating, year, genre)
-
           @channel = channel
           @channel_number = channel_number
           @channel_type = channel_type
@@ -431,6 +419,7 @@ module KodiClient
           @locked = locked
           @start_time = start_time
           @sub_channel_number = sub_channel_number
+          type = type.nil? ? 'unknown' : type
 
           list_item_base(album, album_artist, album_artist_id, album_id, album_release_type, album_status, bit_rate,
                          bpm, cast, channels, comment, compilation, contributors, country, description, disc,
@@ -452,37 +441,26 @@ module KodiClient
         include ListItemBase
         include Comparable
         extend Creatable
+        extend ListItemBase
 
         attr_reader :file, :file_type, :last_modified, :mime_type, :size
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          cast = Types::Video::VideoCast.create_list(hash['cast'])
-          contributors = Types::Audio::AudioContributor.create_list(hash['contributors'])
-          resume = Types::Video::VideoResume.create(hash['resume'])
-          stream_details = Types::Video::Streams.create(hash['streamdetails'])
-          art = Types::Media::MediaArtwork.create(hash['art'])
-          hash['type'] = 'unknown' if hash['type'].nil?
-          new(*Creatable.hash_to_arr(hash, %w[file_type last_modified mime_type size]),
-              *Creatable.hash_to_arr(hash, %w[album album_artist album_artist_id album_id
-                                              album_release_type album_status bit_rate bpm]), cast,
-              hash['channels'], hash['comment'], hash['compilation'], contributors,
-              *Creatable.hash_to_arr(hash, %w[country description disc disc_title display_composer
-                                              display_conductor display_lyricist display_orchestra duration
-                                              dyn_path episode episode_guide first_aired id imdb_number
-                                              is_box_set lyrics media_path mood mpaa musicbrainz_artist_id
-                                              musicbrainz_track_id original_date original_title plot_outline
-                                              premiered production_code release_date release_type sample_rate
-                                              season set set_id show_link show_title sort_title
-                                              special_sort_episode special_sort_season studio style tag
-                                              tag_line theme top250 total_discs track trailer tv_show_id
-                                              type unique_id votes watched_episodes writer director]),
-              resume, hash['runtime'], stream_details,
-              *Creatable.hash_to_arr(hash, %w[date_added file last_played plot title]), art,
-              *Creatable.hash_to_arr(hash, %w[play_count fan_art thumbnail label artist artist_id
-                                              display_artist musicbrainz_album_artist_id rating sort_artist
-                                              user_rating year genre]))
+        fields_to_map %w[file_type last_modified mime_type size
+                         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
+                         duration dyn_path episode episode_guide first_aired id imdb_number is_box_set
+                         lyrics media_path mood mpaa musicbrainz_artist_id musicbrainz_track_id original_date
+                         original_title plot_outline premiered production_code release_date release_type
+                         sample_rate season set set_id show_link show_title sort_title special_sort_episode
+                         special_sort_season studio style tag tag_line theme top250 total_discs track
+                         trailer tv_show_id type unique_id votes watched_episodes writer director resume
+                         runtime stream_details date_added file last_played plot title art play_count
+                         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
 
         def initialize(file_type, last_modified, mime_type, size,
@@ -503,6 +481,7 @@ module KodiClient
           @last_modified = last_modified
           @mime_type = mime_type
           @size = size
+          type = type.nil? ? 'unknown' : type
           list_item_base(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,

data/lib/kodi_client/global_types/media_types.rb

@@ -3,6 +3,7 @@
 require 'kodi_client/global_types/item_types'
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/creatable'
+require 'kodi_client/util/iterable'
 
 module KodiClient
   module Types
@@ -23,10 +24,12 @@ module KodiClient
 
         attr_reader :fan_art, :thumbnail
 
+        def media_details_base_mappings
+          item_details_base_mappings
+        end
+
         def media_details_base_by_hash(hash)
-          @fan_art = hash['fanart']
-          @thumbnail = hash['thumbnail']
-          item_details_base_by_hash(hash)
+          media_details_base(*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/global_types/player_type.rb

@@ -4,6 +4,7 @@ require 'kodi_client/global_types/item_types'
 require 'kodi_client/global_types/global_types'
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 
 module KodiClient
   module Types
@@ -195,35 +196,20 @@ module KodiClient
                     :live, :party_mode, :percentage, :playlist_id, :position, :repeat, :shuffled, :speed,
                     :subtitle_enabled, :subtitles, :time, :total_time, :type, :video_streams
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          audio_streams = AudioStream.create_list(hash['audiostreams'])
-          current_audio_stream = AudioStream.create(hash['currentaudiostream'])
-          current_subtitle = Subtitle.create(hash['currentsubtitle'])
-          current_video_stream = VideoStream.create(hash['currentvideostream'])
-          subtitles = Subtitle.create_list(hash['subtitles'])
-          time = Types::Global::GlobalTime.create(hash['time'])
-          total_time = Types::Global::GlobalTime.create(hash['totaltime'])
-          video_streams = VideoStream.create_list(hash['videostreams'])
-
-          hash['type'] = PlayerType::VIDEO if hash['type'].nil?
-          hash['playlistid'] = -1 if hash['playlistid'].nil?
-          hash['position'] = -1 if hash['position'].nil?
-          hash['repeat'] = PlayerRepeat::OFF if hash['repeat'].nil?
-
-          new(audio_streams, *Creatable.hash_to_arr(hash, %w[cache_percentage can_change_speed can_move
-                                                             can_repeat can_rotate can_seek can_shuffle can_zoom]),
-              current_audio_stream, current_subtitle, current_video_stream,
-              *Creatable.hash_to_arr(hash, %w[live party_mode percentage playlist_id position repeat
-                                              shuffled speed subtitle_enabled]), subtitles, time, total_time,
-              hash['type'], video_streams)
-        end
+        type_mapping ['audiostreams', AudioStream, true], ['currentaudiostream', AudioStream],
+                     ['currentsubtitle', Subtitle], ['currentvideostream', VideoStream],
+                     ['subtitles', Subtitle, true], ['time', Global::GlobalTime],
+                     ['totaltime', Global::GlobalTime], ['videostreams', VideoStream, true]
 
         def initialize(audio_streams, cache_percentage, can_change_speed, can_move, can_repeat, can_rotate, can_seek,
                        can_shuffle, can_zoom, current_audio_stream, current_subtitle, current_video_stream, live,
                        party_mode, percentage, playlist_id, position, repeat, shuffled, speed,
                        subtitle_enabled, subtitles, time, total_time, type, video_streams)
+          type = type.nil? ? PlayerType::VIDEO : type
+          playlist_id = playlist_id.nil? ? -1 : playlist_id
+          position = position.nil? ? -1 : position
+          repeat = repeat.nil? ? PlayerRepeat::OFF : repeat
+
           @audio_streams = audio_streams
           @cache_percentage = cache_percentage
           @can_change_speed = can_change_speed
@@ -299,14 +285,9 @@ module KodiClient
         include Comparable
         extend Creatable
 
-        def self.create(hash)
-          return nil if hash.nil?
+        attr_reader :percentage, :time, :total_time
 
-          time = Types::Global::GlobalTime.create(hash['time'])
-          total_time = Types::Global::GlobalTime.create(hash['totaltime'])
-
-          new(hash['percentage'], time, total_time)
-        end
+        type_mapping ['time', Global::GlobalTime], ['totaltime', Global::GlobalTime]
 
         def initialize(percentage, time, total_time)
           @percentage = percentage

data/lib/kodi_client/global_types/profiles_types.rb

@@ -2,6 +2,7 @@
 
 require 'kodi_client/util/comparable'
 require 'kodi_client/util/iterable'
+require 'kodi_client/util/creatable'
 require 'kodi_client/global_types/item_types'
 
 module KodiClient
@@ -24,11 +25,7 @@ module KodiClient
 
         attr_reader :lock_mode, :thumbnail
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          new(*Creatable.hash_to_arr(hash, %w[lock_mode thumbnail label]))
-        end
+        fields_to_map %w[lock_mode thumbnail label]
 
         def initialize(lock_mode, thumbnail, label)
           @lock_mode = lock_mode
@@ -48,14 +45,7 @@ module KodiClient
 
         attr_reader :limits, :profiles
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          limits = Types::List::ListLimitsReturned.create(hash['limits'])
-          profiles = Types::Profiles::DetailsProfile.create_list(hash['profiles'])
-
-          new(limits, profiles)
-        end
+        type_mapping ['limits', List::ListLimitsReturned], ['profiles', DetailsProfile, true]
 
         def initialize(limits, profiles)
           @limits = limits

data/lib/kodi_client/global_types/system_types.rb

@@ -2,6 +2,7 @@
 
 require 'kodi_client/util/iterable'
 require 'kodi_client/util/comparable'
+require 'kodi_client/util/creatable'
 
 module KodiClient
   module Types

data/lib/kodi_client/global_types/video_types.rb

@@ -8,16 +8,19 @@ require 'kodi_client/util/creatable'
 module KodiClient
   module Types
     module Video
-
       # Video.Details.Base https://kodi.wiki/view/JSON-RPC_API/v12#Video.Details.Base
       module VideoDetailsBase
         include Media::MediaDetailsBase
 
         attr_reader :art, :play_count
 
+        def video_details_base_mappings
+          media_details_base_mappings
+        end
+
         def video_details_base_by_hash(hash)
-          @art = Types::Media::MediaArtwork.create(hash['art'])
-          video_details_base(art, ['playcount'], *Creatable.hash_to_arr(hash, %w[fan_art thumbnail label]))
+          video_details_base(*Creatable.hash_to_arr(hash, %w[art play_count fan_art thumbnail label],
+                                                    video_details_base_mappings))
         end
 
         def video_details_base(art, play_count, fan_art, thumbnail, label)
@@ -48,9 +51,13 @@ module KodiClient
 
         attr_reader :title
 
+        def video_details_media_mappings
+          video_details_base_mappings
+        end
+
         def video_details_media_by_hash(hash)
-          art = Types::Media::MediaArtwork.create(hash['art'])
-          video_details_media(hash['title'], art, *Creatable.hash_to_arr(hash, %w[play_count fan_art thumbnail label]))
+          video_details_media(*Creatable.hash_to_arr(hash, %w[title art play_count fan_art thumbnail label]),
+                              video_details_base_mappings)
         end
 
         def video_details_media(title, art, play_count, fan_art, thumbnail, label)
@@ -65,10 +72,14 @@ module KodiClient
 
         attr_reader :date_added, :file, :last_played, :plot
 
+        def video_details_item_mappings
+          video_details_media_mappings
+        end
+
         def video_details_item_by_hash(hash)
-          art = Types::Media::MediaArtwork.create(hash['art'])
-          video_details_item(*Creatable.hash_to_arr(hash, %w[date_added file last_played plot title]), art,
-                             *Creatable.hash_to_arr(hash, %w[play_count fan_art thumbnail label]))
+          video_details_item(*Creatable.hash_to_arr(hash, %w[date_added file last_played plot title art
+                                                             play_count fan_art thumbnail label],
+                                                    video_details_item_mappings))
         end
 
         def video_details_item(date_added, file, last_played, plot, title, art, play_count, fan_art, thumbnail, label)
@@ -86,13 +97,18 @@ module KodiClient
 
         attr_reader :director, :resume, :runtime, :stream_details
 
+        def video_details_file_mappings
+          mappings = {
+            'resume' => Creatable::CreateMap.new(VideoResume),
+            'streamdetails' => Creatable::CreateMap.new(Streams)
+          }
+          mappings.merge(video_details_item_mappings)
+        end
+
         def video_details_file_by_hash(hash)
-          resume = VideoResume.create(hash['resume'])
-          stream_details = Streams.create(hash['streamdetails'])
-          art = Types::Media::MediaArtwork.create(hash['art'])
-          video_details_file(hash['director'], resume, hash['runtime'], stream_details,
-                             *Creatable.hash_to_arr(hash, %w[date_added file last_played plot title]), art,
-                             *Creatable.hash_to_arr(hash, %w[play_count fan_art thumbnail label]))
+          video_details_file(*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,
@@ -125,14 +141,8 @@ module KodiClient
 
         attr_reader :audio, :subtitle, :video
 
-        def self.create(hash)
-          return nil if hash.nil?
-
-          audio = Types::Player::AudioStream.create_list(hash['audio'])
-          subtitle = Types::Player::Subtitle.create_list(hash['subtitle'])
-          video = Types::Player::VideoStream.create_list(hash['video'])
-          new(audio, subtitle, video)
-        end
+        type_mapping ['audio', Player::AudioStream, true], ['subtitle', Player::Subtitle, true],
+                     ['video', Player::VideoStream, true]
 
         def initialize(audio, subtitle, video)
           @audio = audio

data/lib/kodi_client/method/addons.rb

@@ -34,11 +34,8 @@ module KodiClient
       end
 
       def get_addon_details(addon_id = nil, properties = [], kodi_id = 1)
-        request = KodiRequest.new(kodi_id, GET_ADDON_DETAILS,
-                                  {
-                                    'addonid' => addon_id,
-                                    'properties' => properties
-                                  })
+        request = KodiRequest.new(kodi_id, GET_ADDON_DETAILS, { 'addonid' => addon_id,
+                                                                'properties' => properties })
         json = invoke_api(request)
 
         result = Types::Addons::Addon.create(json['result'])
@@ -47,22 +44,14 @@ module KodiClient
       end
 
       def execute_addon(addon_id = nil, params = '', wait = false, kodi_id = 1)
-        request = KodiRequest.new(kodi_id, EXECUTE_ADDON,
-                                  {
-                                    'addonid' => addon_id,
-                                    'params' => params,
-                                    'wait' => wait
-                                  })
+        request = KodiRequest.new(kodi_id, EXECUTE_ADDON, { 'addonid' => addon_id, 'params' => params,
+                                                            'wait' => wait })
         json = invoke_api(request)
         KodiResponse.new(json)
       end
 
       def set_addon_enabled(addon_id = nil, enabled = Types::Global::Toggle::TOGGLE, kodi_id = 1)
-        request = KodiRequest.new(kodi_id, SET_ADDON_ENABLED,
-                                  {
-                                    'addonid' => addon_id,
-                                    'enabled' => enabled
-                                  })
+        request = KodiRequest.new(kodi_id, SET_ADDON_ENABLED, { 'addonid' => addon_id, 'enabled' => enabled })
         json = invoke_api(request)
         KodiResponse.new(json)
       end

data/lib/kodi_client/method/audio_library.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'kodi_client/kodi_module'
+require 'kodi_client/global_types/application_types'
+
+module KodiClient
+  module Modules
+    # contains all Kodi Application methods
+    class AudioLibrary < KodiModule
+
+      CLEAN = 'AudioLibrary.Clean'
+      EXPORT = 'AudioLibrary.Export'
+      GET_ALBUM_DETAILS = 'AudioLibrary.GetAlbumDetails'
+      GET_ALBUMS = 'AudioLibrary.GetAlbums'
+
+      def clean(show_dialogs = true, kodi_id = 1)
+        request = KodiRequest.new(kodi_id, CLEAN, { 'showdialogs' => show_dialogs })
+        json = invoke_api(request)
+        KodiResponse.new(json)
+      end
+
+      def export(path, kodi_id = 1)
+        request = KodiRequest.new(kodi_id, EXPORT, { 'options' => { 'path' => path } })
+        json = invoke_api(request)
+        KodiResponse.new(json)
+      end
+
+      def get_album_details(album_id, properties = Types::Audio::AudioFieldsAlbum.all_properties, kodi_id = 1)
+        request = KodiRequest.new(kodi_id, GET_ALBUM_DETAILS, { 'albumid' => album_id, 'properties' => properties })
+        json = invoke_api(request)
+        KodiResponse.new(json)
+      end
+
+      def get_albums(properties = Types::Audio::AudioFieldsAlbum.all_properties,
+                     limits = Types::List::ListLimits.new(0, 50),
+                     sort = Types::List::ListSort.new, include_singles = false, all_roles = false, kodi_id = 1)
+        request = KodiRequest.new(kodi_id, GET_ALBUMS,
+                                  { 'properties' => properties,
+                                    'limits' => { 'start' => limits.list_start, 'end' => limits.list_end },
+                                    'sort' => { 'ignorearticle' => sort.ignore_article, 'method' => sort.method,
+                                                'order' => sort.order,
+                                                'useartistsortname' => sort.use_artist_sort_name },
+                                    'includesingles' => include_singles, 'allroles' => all_roles })
+        json = invoke_api(request)
+        KodiResponse.new(json)
+      end
+    end
+  end
+end

data/lib/kodi_client/util/creatable.rb

@@ -5,6 +5,68 @@ module KodiClient
   # creates a create and create_list method by hash
   module Creatable
 
+    def fields_to_map(fields)
+      @fields_to_map = fields
+    end
+
+    def type_mapping(*args)
+      return if args.nil?
+
+      @type_mapping = {}
+      args.map { |it| @type_mapping[it[0]] = Creatable::CreateMap.new(it[1], it[2].nil? ? false : it[2]) }
+    end
+
+    def lazy_type_mapping
+      {}
+    end
+
+    def create_list(hash)
+      hash.nil? ? [] : hash.map { |it| create(it) }.reject(&:nil?)
+    end
+
+    def create(hash)
+      return nil if hash.nil?
+
+      if @fields_to_map.nil? || @fields_to_map.empty?
+        fields = @kodi_fields
+        return nil if @kodi_fields.none? { |it| !hash[it.to_s.gsub('_', '')].nil? }
+      else
+        fields = @fields_to_map
+      end
+
+      mapping = @type_mapping.nil? ? lazy_type_mapping : @type_mapping
+      args = fields.map do |it|
+        field = it.to_s.gsub('_', '')
+        Creatable.extract_field_from_hash(field, hash, mapping)
+      end
+
+      new(*args)
+    end
+
+    def self.hash_to_arr(hash, fields, mapping = {})
+      return nil if hash.nil?
+
+      fields.map do |it|
+        field = it.to_s.gsub('_', '')
+        extract_field_from_hash(field, hash, mapping)
+      end
+    end
+
+    def hash_to_arr(hash, fields)
+      Creatable.hash_to_arr(hash, fields, @type_mapping.nil? ? {} : @type_mapping)
+    end
+
+    def self.extract_field_from_hash(field, hash, mapping)
+      map = mapping[field]
+      return nil if hash[field].nil? && map.nil?
+
+      return hash[field] if map.nil?
+
+      return map.type.create_list(hash[field]) if map.is_list
+
+      map.type.create(hash[field])
+    end
+
     def attr_accessor(*args)
       attr_reader(*args)
       attr_writer(*args)
@@ -30,23 +92,15 @@ module KodiClient
       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? }
+    # mapping class with the type and if it is a list field or not
+    class CreateMap
 
-      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
+      attr_reader :type, :is_list
 
-    def hash_to_arr(hash, fields)
-      Creatable.hash_to_arr(hash, fields)
+      def initialize(type, is_list = false)
+        @type = type
+        @is_list = is_list
+      end
     end
   end
 end

data/lib/kodi_client.rb

@@ -5,6 +5,7 @@ require 'json'
 
 require 'kodi_client/Chainable'
 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'
@@ -23,10 +24,11 @@ module KodiClient
   class Client
     include Chainable
 
-    attr_reader :addons, :application, :favourites, :files, :gui, :input, :player, :profiles, :system
+    attr_reader :audio_library, :addons, :application, :favourites, :files, :gui, :input, :player, :profiles, :system
 
     def initialize
       @addons = KodiClient::Modules::Addons.new
+      @audio_library = KodiClient::Modules::AudioLibrary.new
       @application = KodiClient::Modules::Application.new
       @favourites = KodiClient::Modules::Favourites.new
       @files = KodiClient::Modules::Files.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kodi_client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Christian Feier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -62,6 +62,7 @@ files:
 - 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