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

Compare distro and build for pms updates

Browse source
This commit is contained in:
JonnyWong16 2016-07-26 19:10:59 -07:00
parent 495659e9cd
commit 79dc190ccc
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
data/interfaces/default/settings.html
View file

@ -549,6 +549,7 @@
<label for="pms_update_distro_build">Release</label> <label for="pms_update_distro_build">Release</label>
<select class="form-control" id="pms_update_distro_build" name="pms_update_distro_build"> <select class="form-control" id="pms_update_distro_build" name="pms_update_distro_build">
</select> </select>
<input type="hidden" class="form-control" id="pms_update_distro" name="pms_update_distro">
</div> </div>
</div> </div>
</div> </div>
@ -2681,6 +2682,7 @@ $(document).ready(function() {
var plexpass = update_params.plexpass; var plexpass = update_params.plexpass;
var platform = update_params.pms_platform; var platform = update_params.pms_platform;
var update_channel = update_params.pms_update_channel; var update_channel = update_params.pms_update_channel;
var update_distro = update_params.pms_update_distro;
var update_distro_build = update_params.pms_update_distro_build; var update_distro_build = update_params.pms_update_distro_build;
$("#pms_update_channel option[value='plexpass']").remove(); $("#pms_update_channel option[value='plexpass']").remove();
@ -2699,18 +2701,26 @@ $(document).ready(function() {
$("#pms_update_distro_build option").remove(); $("#pms_update_distro_build option").remove();
$.each(platform_downloads.releases, function (index, item) { $.each(platform_downloads.releases, function (index, item) {
var label = (platform_downloads.releases.length == 1) ? platform_downloads.name : platform_downloads.name + ' - ' + item.label; var label = (platform_downloads.releases.length == 1) ? platform_downloads.name : platform_downloads.name + ' - ' + item.label;
var selected = (item.build == update_distro_build) ? true : false; var selected = (item.distro == update_distro && item.build == update_distro_build) ? true : false;
$('#pms_update_distro_build') $('#pms_update_distro_build')
.append($('<option></option>') .append($('<option></option>')
.text(label) .text(label)
.val(item.build) .val(item.build)
.attr('data-distro', item.distro)
.prop('selected', selected)); .prop('selected', selected));
}) })
$('#pms_update_distro').val($("#pms_update_distro_build option:selected").data('distro'))
} }
}); });
}); });
} }
loadUpdateDistros(); loadUpdateDistros();
$('#pms_update_distro_build').change(function () {
var distro = $("option:selected", this).data('distro')
$('#pms_update_distro').val(distro)
});
}); });
</script> </script>
</%def> </%def>

1
plexpy/config.py
View file

@ -59,6 +59,7 @@ _CONFIG_DEFINITIONS = {
'PMS_PLATFORM': (str, 'PMS', ''), 'PMS_PLATFORM': (str, 'PMS', ''),
'PMS_VERSION': (str, 'PMS', ''), 'PMS_VERSION': (str, 'PMS', ''),
'PMS_UPDATE_CHANNEL': (str, 'PMS', 'public'), 'PMS_UPDATE_CHANNEL': (str, 'PMS', 'public'),
'PMS_UPDATE_DISTRO': (str, 'PMS', ''),
'PMS_UPDATE_DISTRO_BUILD': (str, 'PMS', ''), 'PMS_UPDATE_DISTRO_BUILD': (str, 'PMS', ''),
'TIME_FORMAT': (str, 'General', 'HH:mm'), 'TIME_FORMAT': (str, 'General', 'HH:mm'),
'ANON_REDIRECT': (str, 'General', 'http://dereferer.org/?'), 'ANON_REDIRECT': (str, 'General', 'http://dereferer.org/?'),

3
plexpy/plextv.py
View file

@ -650,7 +650,8 @@ class PlexTV(object):
# Get proper download # Get proper download
releases = platform_downloads.get('releases', [{}]) releases = platform_downloads.get('releases', [{}])
release = next((r for r in releases if r['build'] == plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD), releases[0]) release = next((r for r in releases if r['distro'] == plexpy.CONFIG.PMS_UPDATE_DISTRO and
r['build'] == plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD), releases[0])
download_info = {'update_available': v_new > v_old, download_info = {'update_available': v_new > v_old,
'platform': platform_downloads.get('name'), 'platform': platform_downloads.get('name'),

1
plexpy/webserve.py
View file

@ -2791,6 +2791,7 @@ class WebInterface(object):
return {'plexpass': plexpass, return {'plexpass': plexpass,
'pms_platform': plexpy.CONFIG.PMS_PLATFORM, 'pms_platform': plexpy.CONFIG.PMS_PLATFORM,
'pms_update_channel': plexpy.CONFIG.PMS_UPDATE_CHANNEL, 'pms_update_channel': plexpy.CONFIG.PMS_UPDATE_CHANNEL,
'pms_update_distro': plexpy.CONFIG.PMS_UPDATE_DISTRO,
'pms_update_distro_build': plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD} 'pms_update_distro_build': plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD}
@cherrypy.expose @cherrypy.expose