From 19864e97e6e629cd34db72f965213f70e5cb0ed4 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Thu, 4 Jan 2018 13:28:22 -0800 Subject: [PATCH] Fix media type in collection header --- data/interfaces/default/info.html | 13 +++++++------ data/interfaces/default/info_collection_list.html | 11 ++--------- plexpy/common.py | 9 +++++++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html index 641d894e..3498398c 100644 --- a/data/interfaces/default/info.html +++ b/data/interfaces/default/info.html @@ -38,20 +38,21 @@ DOCUMENTATION :: END <%! import re - from plexpy import common, notifiers + from plexpy import notifiers + from plexpy.common import MEDIA_TYPE_HEADERS, MEDIA_FLAGS_AUDIO, MEDIA_FLAGS_VIDEO # Get audio codec file def af(codec): - for pattern, file in common.MEDIA_FLAGS_AUDIO.iteritems(): + for pattern, file_type in MEDIA_FLAGS_AUDIO.iteritems(): if re.match(pattern, codec): - return file + return file_type return codec # Get audio codec file def vf(codec): - for pattern, file in common.MEDIA_FLAGS_VIDEO.iteritems(): + for pattern, file_type in MEDIA_FLAGS_VIDEO.iteritems(): if re.match(pattern, codec): - return file + return file_type return codec def br(text): @@ -356,7 +357,7 @@ DOCUMENTATION :: END
- Movies in ${data['title']} collection + ${MEDIA_TYPE_HEADERS[data['sub_media_type']]} in ${data['title']} collection
diff --git a/data/interfaces/default/info_collection_list.html b/data/interfaces/default/info_collection_list.html index d2d387d0..8d8efbc6 100644 --- a/data/interfaces/default/info_collection_list.html +++ b/data/interfaces/default/info_collection_list.html @@ -28,22 +28,15 @@ DOCUMENTATION :: END % if data != None: <% + from plexpy.common import MEDIA_TYPE_HEADERS types = ('movie', 'show', 'artist', 'album') - headers = {'movie': 'Movies', - 'show': 'TV Shows', - 'season': 'Seasons', - 'episode': 'Episodes', - 'artist': 'Artists', - 'album': 'Albums', - 'track': 'Tracks', - } %> % for media_type in types: % if data['results_list'][media_type]:
- ${headers[media_type]} in ${title} collection + ${MEDIA_TYPE_HEADERS[media_type]} in ${title} collection
diff --git a/plexpy/common.py b/plexpy/common.py index fd6a3096..6ec8f8f0 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -32,6 +32,15 @@ DEFAULT_POSTER_THUMB = "interfaces/default/images/poster.png" DEFAULT_COVER_THUMB = "interfaces/default/images/cover.png" DEFAULT_ART = "interfaces/default/images/art.png" +MEDIA_TYPE_HEADERS = {'movie': 'Movies', + 'show': 'TV Shows', + 'season': 'Seasons', + 'episode': 'Episodes', + 'artist': 'Artists', + 'album': 'Albums', + 'track': 'Tracks', + } + PLATFORM_NAME_OVERRIDES = {'Konvergo': 'Plex Media Player', 'Mystery 3': 'Playstation 3', 'Mystery 4': 'Playstation 4',