kodi_client 0.5.7 → 0.6.3

data/lib/kodi_client/{global_types → types}/list_types.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'kodi_client/util/comparable'
-require 'kodi_client/util/creatable'
-require 'kodi_client/global_types/video_types'
-require 'kodi_client/global_types/audio_types'
-
 module KodiClient
   module Types
     module List
@@ -28,11 +23,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
@@ -153,6 +144,95 @@ module KodiClient
         YEAR = 'year'
       end
 
+      # List.Fields.Files https://kodi.wiki/view/JSON-RPC_API/v12#List.Fields.Files
+      module ListFieldFiles
+        extend Iterable
+
+        ALBUM = 'album'
+        ALBUMARTIST = 'albumartist'
+        ALBUMARTISTID = 'albumartistid'
+        ALBUMID = 'albumid'
+        ALBUMLABEL = 'albumlabel'
+        ART = 'art'
+        ARTIST = 'artist'
+        ARTISTID = 'artistid'
+        CAST = 'cast'
+        COMMENT = 'comment'
+        COUNTRY = 'country'
+        DATEADDED = 'dateadded'
+        DESCRIPTION = 'description'
+        DIRECTOR = 'director'
+        DISC = 'disc'
+        DISPLAYARTIST = 'displayartist'
+        DURATION = 'duration'
+        EPISODE = 'episode'
+        EPISODEGUIDE = 'episodeguide'
+        FANART = 'fanart'
+        FILE = 'file'
+        FIRSTAIRED = 'firstaired'
+        GENRE = 'genre'
+        GENREID = 'genreid'
+        IMDBNUMBER = 'imdbnumber'
+        LASTMODIFIED = 'lastmodified'
+        LASTPLAYED = 'lastplayed'
+        LYRICS = 'lyrics'
+        MIMETYPE = 'mimetype'
+        MOOD = 'mood'
+        MPAA = 'mpaa'
+        MUSICBRAINZALBUMARTISTID = 'musicbrainzalbumartistid'
+        MUSICBRAINZALBUMID = 'musicbrainzalbumid'
+        MUSICBRAINZARTISTID = 'musicbrainzartistid'
+        MUSICBRAINZTRACKID = 'musicbrainztrackid'
+        ORIGINALTITLE = 'originaltitle'
+        PLAYCOUNT = 'playcount'
+        PLOT = 'plot'
+        PLOTOUTLINE = 'plotoutline'
+        PREMIERED = 'premiered'
+        PRODUCTIONCODE = 'productioncode'
+        RATING = 'rating'
+        RESUME = 'resume'
+        RUNTIME = 'runtime'
+        SEASON = 'season'
+        SET = 'set'
+        SETID = 'setid'
+        SHOWLINK = 'showlink'
+        SHOWTITLE = 'showtitle'
+        SIZE = 'size'
+        SORTTITLE = 'sorttitle'
+        SPECIALSORTEPISODE = 'specialsortepisode'
+        SPECIALSORTSEASON = 'specialsortseason'
+        STREAMDETAILS = 'streamdetails'
+        STUDIO = 'studio'
+        STYLE = 'style'
+        TAG = 'tag'
+        TAGLINE = 'tagline'
+        THEME = 'theme'
+        THUMBNAIL = 'thumbnail'
+        TITLE = 'title'
+        TOP250 = 'top250'
+        TRACK = 'track'
+        TRAILER = 'trailer'
+        TVSHOWID = 'tvshowid'
+        UNIQUEID = 'uniqueid'
+        VOTES = 'votes'
+        WATCHEDEPISODES = 'watchedepisodes'
+        WRITER = 'writer'
+        YEAR = 'year'
+      end
+
+      # File/Label tuple
+      class FileLabel
+        include Comparable
+        extend Creatable
+
+        attr_reader :file, :label
+
+        def initialize(file, label)
+          @file = file
+          @label = label
+        end
+      end
+
       # List.Item.Base https://kodi.wiki/view/JSON-RPC_API/v12#List.Item.Base
       module ListItemBase
         include Video::VideoDetailsFile
@@ -168,31 +248,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,
@@ -286,38 +369,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?
+        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]
 
-          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]))
+        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,
@@ -333,7 +405,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
@@ -342,6 +413,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,
@@ -356,9 +428,66 @@ module KodiClient
                          fan_art, thumbnail, label, artist, artist_id, display_artist, musicbrainz_album_artist_id,
                          rating, sort_artist, user_rating, year, genre)
         end
+      end
 
-        def ==(other)
-          compare(self, other)
+      # List.Item.File https://kodi.wiki/view/JSON-RPC_API/v12#List.Item.File
+      class ListItemFile
+        include ListItemBase
+        include Comparable
+        extend Creatable
+        extend ListItemBase
+
+        attr_reader :file, :file_type, :last_modified, :mime_type, :size
+
+        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,
+                       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)
+          @file = file
+          @file_type = file_type
+          @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,
+                         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)
         end
       end
 

data/lib/kodi_client/{global_types → types}/media_types.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'kodi_client/global_types/item_types'
-require 'kodi_client/util/comparable'
-require 'kodi_client/util/creatable'
-
 module KodiClient
   module Types
     module Media
@@ -23,10 +19,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 → types}/player_type.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'kodi_client/global_types/item_types'
-require 'kodi_client/global_types/global_types'
-require 'kodi_client/util/comparable'
-require 'kodi_client/util/iterable'
-
 module KodiClient
   module Types
     module Player
@@ -195,35 +190,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 +279,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 → types}/profiles_types.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'kodi_client/util/comparable'
-require 'kodi_client/util/iterable'
-require 'kodi_client/global_types/item_types'
-
 module KodiClient
   module Types
     module Profiles
@@ -24,11 +20,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 +40,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 → types}/pvr_type.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'kodi_client/util/iterable'
-
 module KodiClient
   module Types
     module PVR

data/lib/kodi_client/{global_types → types}/system_types.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'kodi_client/util/iterable'
-require 'kodi_client/util/comparable'
-
 module KodiClient
   module Types
     module System

data/lib/kodi_client/{global_types → types}/video_types.rb

@@ -1,23 +1,21 @@
 # frozen_string_literal: true
 
-require 'kodi_client/global_types/media_types'
-require 'kodi_client/global_types/player_type'
-require 'kodi_client/util/comparable'
-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 +46,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 +67,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 +92,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,12 +136,8 @@ module KodiClient
 
         attr_reader :audio, :subtitle, :video
 
-        def self.create(hash)
-          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