diff --git a/GitVersion.yml b/GitVersion.yml index f3dad2e..6c87740 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -3,4 +3,4 @@ ignore: sha: [] merge-message-formats: {} mode: ContinuousDelivery -next-version: 2.11.5 +next-version: 2.11.6 diff --git a/assets/plexmovieposter/PMPDLib.php b/assets/plexmovieposter/PMPDLib.php index 330d594..3c11cf1 100644 --- a/assets/plexmovieposter/PMPDLib.php +++ b/assets/plexmovieposter/PMPDLib.php @@ -346,6 +346,10 @@ function PMPD_DisplayMediaInfo() { break; } + if ($contentRatingProfile != "") { + $contentRatingProfile = ""; + } + switch ($mediaVideoResolution) { case "sd": $videoResolutionProfile = "$iconPath/Res-SD.png?$iconChangeID"; @@ -372,6 +376,10 @@ function PMPD_DisplayMediaInfo() { $videoResolutionProfile = ""; break; } + + if ($videoResolutionProfile != "") { + $videoResolutionProfile = ""; + } switch ($mediaVideoCodec) { case "h264": @@ -388,6 +396,10 @@ function PMPD_DisplayMediaInfo() { break; } + if ($videoCodecProfile != "") { + $videoCodecProfile = ""; + } + switch ($mediaAudioCodec) { case "aac": $audioCodecProfile = ""; @@ -414,6 +426,10 @@ function PMPD_DisplayMediaInfo() { $audioCodecProfile = ""; break; } + + if ($audioCodecProfile != "") { + $audioCodecProfile = ""; + } switch ($mediaAudioChannelLayout) { case "mono": @@ -433,16 +449,14 @@ function PMPD_DisplayMediaInfo() { $audioCodecProfile = ""; break; } + + if ($audioChannelLayoutProfile != "") { + $audioChannelLayoutProfile = ""; + } $profileHeader = ""; $titleProfile = "
$title

"; - $contentRatingProfile = ""; - $videoResolutionProfile = ""; - $videoCodecProfile = ""; - $audioCodecProfile = ""; - $audioChannelLayoutProfile = ""; - $profileFooter = "

"; $mediaProfiles = $videoResolutionProfile . $videoCodecProfile . $audioChannelLayoutProfile . $contentRatingProfile; diff --git a/assets/plexmovieposter/css/DisplayStyle.css b/assets/plexmovieposter/css/DisplayStyle.css index ac4bac2..82465b5 100644 --- a/assets/plexmovieposter/css/DisplayStyle.css +++ b/assets/plexmovieposter/css/DisplayStyle.css @@ -87,15 +87,24 @@ font-size: 10px; } +.showMetadata img { + padding-left: 2px; + padding-right: 2px; +} + @media screen and (orientation: landscape) { .showMetadata img { - width: 20%; + width: 15%; + /* padding-left: 2px; */ + /* padding-right: 2px; */ } } @media screen and (orientation: portrait) { .showMetadata img { - width: 40%; + width: 30%; + /* padding-left: 2px; */ + /* padding-right: 2px; */ } } diff --git a/assets/plexmovieposter/images/icons/mediaInfo/Rated-TV14.png b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TV14.png index b4d726a..28e9a34 100644 Binary files a/assets/plexmovieposter/images/icons/mediaInfo/Rated-TV14.png and b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TV14.png differ diff --git a/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVG.png b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVG.png new file mode 100644 index 0000000..484793f Binary files /dev/null and b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVG.png differ diff --git a/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVMA.png b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVMA.png index 5ded49f..e008039 100644 Binary files a/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVMA.png and b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVMA.png differ diff --git a/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVPG.png b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVPG.png index 052e7f5..4c5c8b5 100644 Binary files a/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVPG.png and b/assets/plexmovieposter/images/icons/mediaInfo/Rated-TVPG.png differ diff --git a/assets/plexmovieposter/images/icons/mediaInfo/_MediaInfo_Template.xcf b/assets/plexmovieposter/images/icons/mediaInfo/_MediaInfo_Template.xcf index 2984177..0ae2fd4 100644 Binary files a/assets/plexmovieposter/images/icons/mediaInfo/_MediaInfo_Template.xcf and b/assets/plexmovieposter/images/icons/mediaInfo/_MediaInfo_Template.xcf differ diff --git a/build/DockerSetup.config b/build/DockerSetup.config index b03a859..33282e4 100644 --- a/build/DockerSetup.config +++ b/build/DockerSetup.config @@ -3,7 +3,7 @@ portexternal = 80 portinternal = 80 osplatform = linux imagenameroot = plexmovieposterdisplay -tag = 2.11.5 +tag = 2.11.6 dockerfileroot = ../. imagetype = networktype = diff --git a/build/UpdateVersion.py b/build/UpdateVersion.py index 4c55282..09f43f0 100644 --- a/build/UpdateVersion.py +++ b/build/UpdateVersion.py @@ -80,7 +80,7 @@ def UpdatePHP(DisplayMSG=False,ConfigSegment="DEFAULT",ConfigKey="version",Confi # there for there might be trailing data we need to truncate away. DisplayMSG = False -SetVersion = "2.11.5" +SetVersion = "2.11.6" PYScriptRoot = os.path.abspath(os.path.dirname(__file__)) diff --git a/docs/ChangeLogs.md b/docs/ChangeLogs.md index a9a1192..860777d 100644 --- a/docs/ChangeLogs.md +++ b/docs/ChangeLogs.md @@ -419,3 +419,17 @@ Enhancement: Plex Function Isolation (Issue #64) - Isolate PLEX read from using 'clients' variable and converted to PLEX object. Full conversion still in progress. - Clean up duplicated variables for 'logName' to use as part of PLEX object. - Move away from reading media session information xml to direct media information for much richer metadata. Media session information still required to get direct media library ID for direct read. + +Updates and Bug Fixes: +- Update test for logging to allow read of logs directly from the browser. + +**v2.11.6 Community Updates**\ +Enhancement: Images to the bottom of Now Showing for resolution, sound format, and aspect ratio (Issue #74) +- Add padding to information icons so they don't sit up against each other. +- Adjust sizing of info icons to be a little smaller +- Update 'TV-' icons to more match film colors and make a bit easier to read. +- Add TV-G icon +- Update icon logic to eliminate empty icon if not available. + +Updates and Bug Fixes: +- Update missed information in ChangeLog for 2.11.5 \ No newline at end of file diff --git a/settings/PMPInfo.php b/settings/PMPInfo.php index 253b699..c4b337b 100644 --- a/settings/PMPInfo.php +++ b/settings/PMPInfo.php @@ -1,6 +1,6 @@ \ No newline at end of file