mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-11 07:46:07 -07:00
Compare distro and build for pms updates
This commit is contained in:
parent
495659e9cd
commit
79dc190ccc
4 changed files with 15 additions and 2 deletions
|
@ -549,6 +549,7 @@
|
|||
<label for="pms_update_distro_build">Release</label>
|
||||
<select class="form-control" id="pms_update_distro_build" name="pms_update_distro_build">
|
||||
</select>
|
||||
<input type="hidden" class="form-control" id="pms_update_distro" name="pms_update_distro">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -2681,6 +2682,7 @@ $(document).ready(function() {
|
|||
var plexpass = update_params.plexpass;
|
||||
var platform = update_params.pms_platform;
|
||||
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;
|
||||
|
||||
$("#pms_update_channel option[value='plexpass']").remove();
|
||||
|
@ -2699,18 +2701,26 @@ $(document).ready(function() {
|
|||
$("#pms_update_distro_build option").remove();
|
||||
$.each(platform_downloads.releases, function (index, item) {
|
||||
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')
|
||||
.append($('<option></option>')
|
||||
.text(label)
|
||||
.val(item.build)
|
||||
.attr('data-distro', item.distro)
|
||||
.prop('selected', selected));
|
||||
})
|
||||
$('#pms_update_distro').val($("#pms_update_distro_build option:selected").data('distro'))
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
loadUpdateDistros();
|
||||
|
||||
|
||||
$('#pms_update_distro_build').change(function () {
|
||||
var distro = $("option:selected", this).data('distro')
|
||||
$('#pms_update_distro').val(distro)
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</%def>
|
||||
|
|
|
@ -59,6 +59,7 @@ _CONFIG_DEFINITIONS = {
|
|||
'PMS_PLATFORM': (str, 'PMS', ''),
|
||||
'PMS_VERSION': (str, 'PMS', ''),
|
||||
'PMS_UPDATE_CHANNEL': (str, 'PMS', 'public'),
|
||||
'PMS_UPDATE_DISTRO': (str, 'PMS', ''),
|
||||
'PMS_UPDATE_DISTRO_BUILD': (str, 'PMS', ''),
|
||||
'TIME_FORMAT': (str, 'General', 'HH:mm'),
|
||||
'ANON_REDIRECT': (str, 'General', 'http://dereferer.org/?'),
|
||||
|
|
|
@ -650,7 +650,8 @@ class PlexTV(object):
|
|||
|
||||
# Get proper download
|
||||
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,
|
||||
'platform': platform_downloads.get('name'),
|
||||
|
|
|
@ -2791,6 +2791,7 @@ class WebInterface(object):
|
|||
return {'plexpass': plexpass,
|
||||
'pms_platform': plexpy.CONFIG.PMS_PLATFORM,
|
||||
'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}
|
||||
|
||||
@cherrypy.expose
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue