diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index c3350a45..9e940827 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -1216,6 +1216,7 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span { width: 250px; height: 1px; margin: 0 40px 20px 25px; + position: relative; } .summary-content { position: relative; @@ -1239,6 +1240,18 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span { margin-left: 2px; margin-right: 10px; } +.summary-content-media-info-wrapper { + width: 100%; + position: absolute; + bottom: 0; + left: 0; + text-align: center; +} +.summary-content-media-info { + max-width: 75pt; + max-height: 20px; + margin: 0 10px; +} .summary-content-summary { overflow: hidden; color: #fff; @@ -2525,8 +2538,7 @@ a .home-platforms-instance-list-oval:hover, right: 0; bottom: 0; left: 0; - overflow-x: hidden; - overflow-y: scroll; + overflow: auto; -webkit-overflow-scrolling: touch; } ::-webkit-scrollbar { diff --git a/data/interfaces/default/images/media_info/1080.png b/data/interfaces/default/images/media_info/1080.png new file mode 100644 index 00000000..8b2c95cb Binary files /dev/null and b/data/interfaces/default/images/media_info/1080.png differ diff --git a/data/interfaces/default/images/media_info/1ch.png b/data/interfaces/default/images/media_info/1ch.png new file mode 100644 index 00000000..bb2a811e Binary files /dev/null and b/data/interfaces/default/images/media_info/1ch.png differ diff --git a/data/interfaces/default/images/media_info/2ch.png b/data/interfaces/default/images/media_info/2ch.png new file mode 100644 index 00000000..cbff6a76 Binary files /dev/null and b/data/interfaces/default/images/media_info/2ch.png differ diff --git a/data/interfaces/default/images/media_info/480.png b/data/interfaces/default/images/media_info/480.png new file mode 100644 index 00000000..adc348ab Binary files /dev/null and b/data/interfaces/default/images/media_info/480.png differ diff --git a/data/interfaces/default/images/media_info/6ch.png b/data/interfaces/default/images/media_info/6ch.png new file mode 100644 index 00000000..aeda8593 Binary files /dev/null and b/data/interfaces/default/images/media_info/6ch.png differ diff --git a/data/interfaces/default/images/media_info/720.png b/data/interfaces/default/images/media_info/720.png new file mode 100644 index 00000000..a9f7d925 Binary files /dev/null and b/data/interfaces/default/images/media_info/720.png differ diff --git a/data/interfaces/default/images/media_info/aac.png b/data/interfaces/default/images/media_info/aac.png new file mode 100644 index 00000000..fa4572bb Binary files /dev/null and b/data/interfaces/default/images/media_info/aac.png differ diff --git a/data/interfaces/default/images/media_info/ac3.png b/data/interfaces/default/images/media_info/ac3.png new file mode 100644 index 00000000..b63c4b96 Binary files /dev/null and b/data/interfaces/default/images/media_info/ac3.png differ diff --git a/data/interfaces/default/images/media_info/dca-ma.png b/data/interfaces/default/images/media_info/dca-ma.png new file mode 100644 index 00000000..02871172 Binary files /dev/null and b/data/interfaces/default/images/media_info/dca-ma.png differ diff --git a/data/interfaces/default/images/media_info/dca.png b/data/interfaces/default/images/media_info/dca.png new file mode 100644 index 00000000..29e19538 Binary files /dev/null and b/data/interfaces/default/images/media_info/dca.png differ diff --git a/data/interfaces/default/images/media_info/mp3.png b/data/interfaces/default/images/media_info/mp3.png new file mode 100644 index 00000000..d2438f27 Binary files /dev/null and b/data/interfaces/default/images/media_info/mp3.png differ diff --git a/data/interfaces/default/images/media_info/sd.png b/data/interfaces/default/images/media_info/sd.png new file mode 100644 index 00000000..5791c4dc Binary files /dev/null and b/data/interfaces/default/images/media_info/sd.png differ diff --git a/data/interfaces/default/images/media_info/vorbis.png b/data/interfaces/default/images/media_info/vorbis.png new file mode 100644 index 00000000..ea16c966 Binary files /dev/null and b/data/interfaces/default/images/media_info/vorbis.png differ diff --git a/data/interfaces/default/images/platforms/cloudsync.png b/data/interfaces/default/images/platforms/cloudsync.png new file mode 100644 index 00000000..6ecbbad9 Binary files /dev/null and b/data/interfaces/default/images/platforms/cloudsync.png differ diff --git a/data/interfaces/default/images/platforms/dlna.png b/data/interfaces/default/images/platforms/dlna.png new file mode 100644 index 00000000..f9ea08ab Binary files /dev/null and b/data/interfaces/default/images/platforms/dlna.png differ diff --git a/data/interfaces/default/images/platforms/linux.png b/data/interfaces/default/images/platforms/linux.png new file mode 100644 index 00000000..338c40a3 Binary files /dev/null and b/data/interfaces/default/images/platforms/linux.png differ diff --git a/data/interfaces/default/images/platforms/osx.png b/data/interfaces/default/images/platforms/osx.png new file mode 100644 index 00000000..81003657 Binary files /dev/null and b/data/interfaces/default/images/platforms/osx.png differ diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index fb7d8a25..0d4c66a5 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -137,12 +137,52 @@ DOCUMENTATION :: END
- % if data['media_type'] == 'movie' or data['media_type'] == 'show' or data['media_type'] == 'season': + % if data['media_type'] == 'movie': + + % elif data['media_type'] == 'show' or data['media_type'] == 'season': % elif data['media_type'] == 'episode': - - % elif data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track': + + % elif data['media_type'] == 'artist' or data['media_type'] == 'album': + % elif data['media_type'] == 'track': + % else: % endif diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index e793c641..3be50b84 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -744,9 +744,14 @@ class DataFactory(object): 'session_history_metadata.content_rating, session_history_metadata.summary, ' \ 'session_history_metadata.tagline, session_history_metadata.rating, session_history_metadata.duration, ' \ 'session_history_metadata.guid, session_history_metadata.directors, session_history_metadata.writers, ' \ - 'session_history_metadata.actors, session_history_metadata.genres, session_history_metadata.studio ' \ + 'session_history_metadata.actors, session_history_metadata.genres, session_history_metadata.studio, ' \ + 'session_history_media_info.container, session_history_media_info.bitrate, ' \ + 'session_history_media_info.video_codec, session_history_media_info.video_resolution, ' \ + 'session_history_media_info.video_framerate, session_history_media_info.audio_codec, ' \ + 'session_history_media_info.audio_channels ' \ 'FROM session_history_metadata ' \ 'JOIN library_sections ON session_history_metadata.section_id = library_sections.section_id ' \ + 'JOIN session_history_media_info ON session_history_metadata.id = session_history_media_info.id ' \ 'WHERE session_history_metadata.rating_key = ?' result = monitor_db.select(query=query, args=[rating_key]) else: @@ -789,7 +794,14 @@ class DataFactory(object): 'genres': genres, 'actors': actors, 'library_name': item['section_name'], - 'section_id': item['section_id'] + 'section_id': item['section_id'], + 'container': item['container'], + 'bitrate': item['bitrate'], + 'video_codec': item['video_codec'], + 'video_resolution': item['video_resolution'], + 'video_framerate': item['video_framerate'], + 'audio_codec': item['audio_codec'], + 'audio_channels': item['audio_channels'] } return metadata diff --git a/plexpy/webserve.py b/plexpy/webserve.py index c8d909ff..fb765fb2 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -1461,7 +1461,7 @@ class WebInterface(object): metadata = data_factory.get_metadata_details(rating_key=rating_key) else: pms_connect = pmsconnect.PmsConnect() - result = pms_connect.get_metadata_details(rating_key=rating_key) + result = pms_connect.get_metadata_details(rating_key=rating_key, get_media_info=True) if result: metadata = result['metadata']