github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-15 09:42:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Manually merge v1.4.23 into v2

Browse source
This commit is contained in:
JonnyWong16 2017-09-30 16:47:26 -07:00
parent 54cd860c13
commit daec864f50
6 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,5 +1,12 @@
# Changelog # Changelog
## v1.4.23 (2017-09-30)
* Fix: Playstation 4 platform name.
* Fix: PlexWatch and Plexivity import.
* Fix: Pushbullet authorization header.
## v1.4.22 (2017-08-19) ## v1.4.22 (2017-08-19)
* Fix: Cleaning up of old config backups. * Fix: Cleaning up of old config backups.

14
data/interfaces/default/base.html
View file

@ -315,9 +315,10 @@ ${next.modalIncludes()}
<ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;"> <ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;">
<li class="active"><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li> <li class="active"><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li>
<li><a href="#flattr-donation" role="tab" data-toggle="tab">Flattr</a></li> <li><a href="#flattr-donation" role="tab" data-toggle="tab">Flattr</a></li>
<li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="Bitcoin" data-address="15YMw9c8uH7QecVPXSSjdZ7s55vnbmdKLq">Bitcoin</a></li> <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoin" data-name="Bitcoin" data-address="3FdfJAyNWU15Sf11U9FTgPHuP1hPz32eEN">Bitcoin</a></li>
<li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="Ethereum" data-address="0x8512f6545858eB6269A0F39349F1cC86Df6Ffaf6">Ethereum</a></li> <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoincash" data-name="Bitcoin Cash" data-address="1H2atabxAQGaFAWYQEiLkXKSnK9CZZvt2n">Bitcoin Cash</a></li>
<li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="Litecoin" data-address="LZWsygTHuL4KNbg2H5EzXBDdJKNtZoqq2R">Litecoin</a></li> <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="ethereum" data-name="Ethereum" data-address="0x77ae4c2b8de1a1ccfa93553db39971da58c873d3">Ethereum</a></li>
<li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="litecoin" data-name="Litecoin" data-address="LWpPmUqQYHBhMV83XSCsHzPmKLhJt6r57J">Litecoin</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="paypal-donation" style="text-align: center"> <div role="tabpanel" class="tab-pane active" id="paypal-donation" style="text-align: center">
@ -417,12 +418,13 @@ ${next.modalIncludes()}
}); });
$('#donation_type a.crypto-donation').on('shown.bs.tab', function () { $('#donation_type a.crypto-donation').on('shown.bs.tab', function () {
var crypto_type = $(this).data('coin'); var crypto_coin = $(this).data('coin');
var crypto_name = $(this).data('name');
var crypto_address = $(this).data('address') var crypto_address = $(this).data('address')
$('#crypto_qr_code').empty().qrcode({ $('#crypto_qr_code').empty().qrcode({
text: crypto_type + ":" + crypto_address text: crypto_coin + ":" + crypto_address
}); });
$('#crypto_type_label').html(crypto_type); $('#crypto_type_label').html(crypto_name);
$('#crypto_address').html(crypto_address); $('#crypto_address').html(crypto_address);
}); });
% endif % endif

3
plexpy/common.py
View file

@ -39,7 +39,8 @@ DEFAULT_ART = "interfaces/default/images/art.png"
PLATFORM_NAME_OVERRIDES = {'Konvergo': 'Plex Media Player', PLATFORM_NAME_OVERRIDES = {'Konvergo': 'Plex Media Player',
'Mystery 3': 'Playstation 3', 'Mystery 3': 'Playstation 3',
'Mystery 4': 'Playstation 4', 'Mystery 4': 'Playstation 4',
'Mystery 5': 'Xbox 360' 'Mystery 5': 'Xbox 360',
'WebMAF': 'Playstation 4'
} }
PMS_PLATFORM_NAME_OVERRIDES = {'MacOSX': 'Mac' PMS_PLATFORM_NAME_OVERRIDES = {'MacOSX': 'Mac'

12
plexpy/plexivity_import.py
View file

@ -406,7 +406,17 @@ def import_from_plexivity(database=None, table_name=None, import_ignore_interval
'genres': extracted_xml['genres'], 'genres': extracted_xml['genres'],
'studio': extracted_xml['studio'], 'studio': extracted_xml['studio'],
'labels': extracted_xml['labels'], 'labels': extracted_xml['labels'],
'full_title': row['full_title'] 'full_title': row['full_title'],
'width': extracted_xml['width'],
'height': extracted_xml['height'],
'container': extracted_xml['container'],
'video_codec': extracted_xml['video_codec'],
'audio_codec': extracted_xml['audio_codec'],
'bitrate': extracted_xml['bitrate'],
'video_resolution': extracted_xml['video_resolution'],
'video_framerate': extracted_xml['video_framerate'],
'aspect_ratio': extracted_xml['aspect_ratio'],
'audio_channels': extracted_xml['audio_channels']
} }
# On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values # On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values

12
plexpy/plexwatch_import.py
View file

@ -399,7 +399,17 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval
'genres': extracted_xml['genres'], 'genres': extracted_xml['genres'],
'studio': extracted_xml['studio'], 'studio': extracted_xml['studio'],
'labels': extracted_xml['labels'], 'labels': extracted_xml['labels'],
'full_title': row['full_title'] 'full_title': row['full_title'],
'width': extracted_xml['width'],
'height': extracted_xml['height'],
'container': extracted_xml['container'],
'video_codec': extracted_xml['video_codec'],
'audio_codec': extracted_xml['audio_codec'],
'bitrate': extracted_xml['bitrate'],
'video_resolution': extracted_xml['video_resolution'],
'video_framerate': extracted_xml['video_framerate'],
'aspect_ratio': extracted_xml['aspect_ratio'],
'audio_channels': extracted_xml['audio_channels']
} }
# On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values # On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_BRANCH = "master" PLEXPY_BRANCH = "master"
PLEXPY_RELEASE_VERSION = "1.4.22" PLEXPY_RELEASE_VERSION = "1.4.23"