mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Cleanup network config

Browse source
This commit is contained in:
Shadowghost 2023-07-13 07:08:01 +02:00
parent 1fa7106dbc
commit a159a6f916
3 changed files with 15 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/controllers/dashboard/networking.html
View file

@ -105,15 +105,8 @@
</label> </label>
<div class="fieldDescription checkboxFieldDescription">${LabelEnableAutomaticPortMapHelp}</div> <div class="fieldDescription checkboxFieldDescription">${LabelEnableAutomaticPortMapHelp}</div>
</div> </div>
<div class="checkboxContainer checkboxContainer-withDescription hide"> <div class="inputContainer fldPublicHttpPort hide">
<label> <input is="emby-input" type="number" label="${LabelPublicHttpPort}" id="txtPublicHttpPort" pattern="[0-9]*" required="required" min="1" max="65535" />
<input type="checkbox" is="emby-checkbox" id="chkCreateHttpPortMap" />
<span>${LabelCreateHttpPortMap}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelCreateHttpPortMapHelp}</div>
</div>
<div class="inputContainer fldPublicPort hide">
<input is="emby-input" type="number" label="${LabelPublicHttpPort}" id="txtPublicPort" pattern="[0-9]*" required="required" min="1" max="65535" />
<div class="fieldDescription">${LabelPublicHttpPortHelp}</div> <div class="fieldDescription">${LabelPublicHttpPortHelp}</div>
</div> </div>
<div class="inputContainer fldPublicHttpsPort hide"> <div class="inputContainer fldPublicHttpsPort hide">
@ -159,36 +152,6 @@
<input is="emby-input" type="text" id="txtPublishedServer" label="${LabelPublishedServerUri}" /> <input is="emby-input" type="text" id="txtPublishedServer" label="${LabelPublishedServerUri}" />
<div class="fieldDescription">${LabelPublishedServerUriHelp}</div> <div class="fieldDescription">${LabelPublishedServerUriHelp}</div>
</div> </div>
<div class="inputContainer hide">
<input is="emby-input" type="text" id="txtUDPPortRange" pattern="[0-9\-]*" label="${LabelUDPPortRange}" />
<div class="fieldDescription">${LabelUDPPortRangeHelp}</div>
</div>
<div class="inputContainer hide">
<input is="emby-input" type="text" id="txtHDHomerunPortRange" pattern="[0-9\-]*" label="${LabelHDHomerunPortRange}" />
<div class="fieldDescription">${LabelHDHomerunPortRangeHelp}</div>
</div>
</fieldset>
<fieldset class='verticalSection verticalSection-extrabottompadding hide'>
<legend><h3>${HeaderDebugging}</h3></legend>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" id="chkEnableSSDPTracing" />
<span>${LabelEnableSSDPTracing}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelEnableSSDPTracingHelp}</div>
</div>
<div class="inputContainer">
<input is="emby-input" type="text" id="txtSSDPTracingFilter" pattern="[0-9\.]*" label="${LabelSSDPTracingFilter}" />
<div class="fieldDescription">${LabelSSDPTracingFilterHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" id="chkAutodiscoveryTracing" />
<span>${LabelAutoDiscoveryTracing}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelAutoDiscoveryTracingHelp}</div>
</div>
</fieldset> </fieldset>
</div> </div>
<div> <div>

40
src/controllers/dashboard/networking.js
View file

@ -48,10 +48,10 @@ function onSubmit(e) {
}); });
config.IsRemoteIPFilterBlacklist = form.querySelector('#selectExternalAddressFilterMode').value === 'blacklist'; config.IsRemoteIPFilterBlacklist = form.querySelector('#selectExternalAddressFilterMode').value === 'blacklist';
config.PublicPort = form.querySelector('#txtPublicPort').value; config.PublicHttpPort = form.querySelector('#txtPublicHttpPort').value;
config.PublicHttpsPort = form.querySelector('#txtPublicHttpsPort').value; config.PublicHttpsPort = form.querySelector('#txtPublicHttpsPort').value;
config.HttpServerPortNumber = form.querySelector('#txtPortNumber').value; config.InternalHttpPort = form.querySelector('#txtPortNumber').value;
config.HttpsPortNumber = form.querySelector('#txtHttpsPort').value; config.InternalHttpsPort = form.querySelector('#txtHttpsPort').value;
config.EnableHttps = form.querySelector('#chkEnableHttps').checked; config.EnableHttps = form.querySelector('#chkEnableHttps').checked;
config.RequireHttps = form.querySelector('#chkRequireHttps').checked; config.RequireHttps = form.querySelector('#chkRequireHttps').checked;
config.EnableUPnP = enableUpnp; config.EnableUPnP = enableUpnp;
@ -59,16 +59,9 @@ function onSubmit(e) {
config.EnableRemoteAccess = form.querySelector('#chkRemoteAccess').checked; config.EnableRemoteAccess = form.querySelector('#chkRemoteAccess').checked;
config.CertificatePath = form.querySelector('#txtCertificatePath').value || null; config.CertificatePath = form.querySelector('#txtCertificatePath').value || null;
config.CertificatePassword = form.querySelector('#txtCertPassword').value || null; config.CertificatePassword = form.querySelector('#txtCertPassword').value || null;
config.UPnPCreateHttpPortMap = form.querySelector('#chkCreateHttpPortMap').checked;
config.AutoDiscovery = form.querySelector('#chkAutodiscovery').checked; config.AutoDiscovery = form.querySelector('#chkAutodiscovery').checked;
config.AutoDiscoveryTracing = form.querySelector('#chkAutodiscoveryTracing').checked; config.EnableIPv6 = form.querySelector('#chkEnableIP6').checked;
config.EnableIPV6 = form.querySelector('#chkEnableIP6').checked; config.EnableIPv4 = form.querySelector('#chkEnableIP4').checked;
config.EnableIPV4 = form.querySelector('#chkEnableIP4').checked;
config.UPnPCreateHttpPortMap = form.querySelector('#chkCreateHttpPortMap').checked;
config.UDPPortRange = form.querySelector('#txtUDPPortRange').value;
config.HDHomerunPortRange = form.querySelector('#txtHDHomerunPortRange').value;
config.EnableSSDPTracing = form.querySelector('#chkEnableSSDPTracing').checked;
config.SSDPTracingFilter = form.querySelector('#txtSSDPTracingFilter').value;
ApiClient.updateNamedConfiguration('network', config).then(Dashboard.processServerConfigurationUpdateResult, Dashboard.processErrorResponse); ApiClient.updateNamedConfiguration('network', config).then(Dashboard.processServerConfigurationUpdateResult, Dashboard.processErrorResponse);
}); });
}); });
@ -83,7 +76,7 @@ function triggerChange(select) {
} }
function getValidationAlert(form) { function getValidationAlert(form) {
if (form.querySelector('#txtPublicPort').value === form.querySelector('#txtPublicHttpsPort').value) { if (form.querySelector('#txtPublicHttpPort').value === form.querySelector('#txtPublicHttpsPort').value) {
return 'The public http and https ports must be different.'; return 'The public http and https ports must be different.';
} }
@ -131,8 +124,8 @@ function confirmSelections(localAddress, enableUpnp, callback) {
export default function (view) { export default function (view) {
function loadPage(page, config) { function loadPage(page, config) {
page.querySelector('#txtPortNumber').value = config.HttpServerPortNumber; page.querySelector('#txtPortNumber').value = config.InternalHttpPort;
page.querySelector('#txtPublicPort').value = config.PublicPort; page.querySelector('#txtPublicHttpPort').value = config.PublicHttpPort;
page.querySelector('#txtPublicHttpsPort').value = config.PublicHttpsPort; page.querySelector('#txtPublicHttpsPort').value = config.PublicHttpsPort;
page.querySelector('#txtLocalAddress').value = (config.LocalNetworkAddresses || []).join(', '); page.querySelector('#txtLocalAddress').value = (config.LocalNetworkAddresses || []).join(', ');
page.querySelector('#txtLanNetworks').value = (config.LocalNetworkSubnets || []).join(', '); page.querySelector('#txtLanNetworks').value = (config.LocalNetworkSubnets || []).join(', ');
@ -140,7 +133,7 @@ export default function (view) {
page.querySelector('#txtExternalAddressFilter').value = (config.RemoteIPFilter || []).join(', '); page.querySelector('#txtExternalAddressFilter').value = (config.RemoteIPFilter || []).join(', ');
page.querySelector('#selectExternalAddressFilterMode').value = config.IsRemoteIPFilterBlacklist ? 'blacklist' : 'whitelist'; page.querySelector('#selectExternalAddressFilterMode').value = config.IsRemoteIPFilterBlacklist ? 'blacklist' : 'whitelist';
page.querySelector('#chkRemoteAccess').checked = config.EnableRemoteAccess == null || config.EnableRemoteAccess; page.querySelector('#chkRemoteAccess').checked = config.EnableRemoteAccess == null || config.EnableRemoteAccess;
page.querySelector('#txtHttpsPort').value = config.HttpsPortNumber; page.querySelector('#txtHttpsPort').value = config.InternalHttpsPort;
page.querySelector('#chkEnableHttps').checked = config.EnableHttps; page.querySelector('#chkEnableHttps').checked = config.EnableHttps;
page.querySelector('#chkRequireHttps').checked = config.RequireHttps; page.querySelector('#chkRequireHttps').checked = config.RequireHttps;
page.querySelector('#txtBaseUrl').value = config.BaseUrl || ''; page.querySelector('#txtBaseUrl').value = config.BaseUrl || '';
@ -149,16 +142,9 @@ export default function (view) {
page.querySelector('#txtCertPassword').value = config.CertificatePassword || ''; page.querySelector('#txtCertPassword').value = config.CertificatePassword || '';
page.querySelector('#chkEnableUpnp').checked = config.EnableUPnP; page.querySelector('#chkEnableUpnp').checked = config.EnableUPnP;
triggerChange(page.querySelector('#chkRemoteAccess')); triggerChange(page.querySelector('#chkRemoteAccess'));
page.querySelector('#chkCreateHttpPortMap').checked = config.UPnPCreateHttpPortMap;
page.querySelector('#chkAutodiscovery').checked = config.AutoDiscovery; page.querySelector('#chkAutodiscovery').checked = config.AutoDiscovery;
page.querySelector('#chkAutodiscoveryTracing').checked = config.AutoDiscoveryTracing; page.querySelector('#chkEnableIP6').checked = config.EnableIPv6;
page.querySelector('#chkEnableIP6').checked = config.EnableIPV6; page.querySelector('#chkEnableIP4').checked = config.EnableIPv4;
page.querySelector('#chkEnableIP4').checked = config.EnableIPV4;
page.querySelector('#chkCreateHttpPortMap').checked = config.UPnPCreateHttpPortMap;
page.querySelector('#txtUDPPortRange').value = config.UDPPortRange || '';
page.querySelector('#txtHDHomerunPortRange').checked = config.HDHomerunPortRange || '';
page.querySelector('#chkEnableSSDPTracing').checked = config.EnableSSDPTracing;
page.querySelector('#txtSSDPTracingFilter').value = config.SSDPTracingFilter || '';
page.querySelector('#txtPublishedServer').value = (config.PublishedServerUriBySubnet || []).join(', '); page.querySelector('#txtPublishedServer').value = (config.PublishedServerUriBySubnet || []).join(', ');
loading.hide(); loading.hide();
} }
@ -167,13 +153,13 @@ export default function (view) {
if (this.checked) { if (this.checked) {
view.querySelector('.fldExternalAddressFilter').classList.remove('hide'); view.querySelector('.fldExternalAddressFilter').classList.remove('hide');
view.querySelector('.fldExternalAddressFilterMode').classList.remove('hide'); view.querySelector('.fldExternalAddressFilterMode').classList.remove('hide');
view.querySelector('.fldPublicPort').classList.remove('hide'); view.querySelector('.fldPublicHttpPort').classList.remove('hide');
view.querySelector('.fldPublicHttpsPort').classList.remove('hide'); view.querySelector('.fldPublicHttpsPort').classList.remove('hide');
view.querySelector('.fldEnableUpnp').classList.remove('hide'); view.querySelector('.fldEnableUpnp').classList.remove('hide');
} else { } else {
view.querySelector('.fldExternalAddressFilter').classList.add('hide'); view.querySelector('.fldExternalAddressFilter').classList.add('hide');
view.querySelector('.fldExternalAddressFilterMode').classList.add('hide'); view.querySelector('.fldExternalAddressFilterMode').classList.add('hide');
view.querySelector('.fldPublicPort').classList.add('hide'); view.querySelector('.fldPublicHttpPort').classList.add('hide');
view.querySelector('.fldPublicHttpsPort').classList.add('hide'); view.querySelector('.fldPublicHttpsPort').classList.add('hide');
view.querySelector('.fldEnableUpnp').classList.add('hide'); view.querySelector('.fldEnableUpnp').classList.add('hide');
} }

11
src/strings/en-us.json
View file

@ -349,7 +349,6 @@
"HeaderContinueReading": "Continue Reading", "HeaderContinueReading": "Continue Reading",
"HeaderCustomDlnaProfiles": "Custom Profiles", "HeaderCustomDlnaProfiles": "Custom Profiles",
"HeaderDateIssued": "Date Issued", "HeaderDateIssued": "Date Issued",
"HeaderDebugging": "Debugging and Tracing",
"HeaderDefaultRecordingSettings": "Default Recording Settings", "HeaderDefaultRecordingSettings": "Default Recording Settings",
"HeaderDeleteDevice": "Delete Device", "HeaderDeleteDevice": "Delete Device",
"HeaderDeleteDevices": "Delete All Devices", "HeaderDeleteDevices": "Delete All Devices",
@ -559,8 +558,6 @@
"LabelAuthProvider": "Authentication Provider", "LabelAuthProvider": "Authentication Provider",
"LabelAutomaticallyAddToCollection": "Automatically add to collection", "LabelAutomaticallyAddToCollection": "Automatically add to collection",
"LabelAutomaticallyAddToCollectionHelp": "When at least 2 movies have the same collection name, they will be automatically added to the collection.", "LabelAutomaticallyAddToCollectionHelp": "When at least 2 movies have the same collection name, they will be automatically added to the collection.",
"LabelAutoDiscoveryTracing": "Enable Auto Discovery tracing.",
"LabelAutoDiscoveryTracingHelp": "When enabled, packets received on the auto discovery port will be logged.",
"LabelAutomaticallyRefreshInternetMetadataEvery": "Automatically refresh metadata from the internet", "LabelAutomaticallyRefreshInternetMetadataEvery": "Automatically refresh metadata from the internet",
"LabelAutomaticDiscovery": "Enable Auto Discovery", "LabelAutomaticDiscovery": "Enable Auto Discovery",
"LabelAutomaticDiscoveryHelp": "Allow applications to automatically detect Jellyfin by using UDP port 7359.", "LabelAutomaticDiscoveryHelp": "Allow applications to automatically detect Jellyfin by using UDP port 7359.",
@ -668,8 +665,6 @@
"LabelEnableRealtimeMonitorHelp": "Changes to files will be processed immediately on supported file systems.", "LabelEnableRealtimeMonitorHelp": "Changes to files will be processed immediately on supported file systems.",
"LabelEnableSingleImageInDidlLimit": "Limit to single embedded image", "LabelEnableSingleImageInDidlLimit": "Limit to single embedded image",
"LabelEnableSingleImageInDidlLimitHelp": "Some devices will not render properly if multiple images are embedded within DIDL.", "LabelEnableSingleImageInDidlLimitHelp": "Some devices will not render properly if multiple images are embedded within DIDL.",
"LabelEnableSSDPTracing": "Enable SSDP Tracing",
"LabelEnableSSDPTracingHelp": "Enable details SSDP network tracing to be logged.<br/><b>WARNING:</b> This will cause serious performance degradation.",
"LabelEncoderPreset": "Encoding preset", "LabelEncoderPreset": "Encoding preset",
"LabelEndDate": "End date", "LabelEndDate": "End date",
"LabelEpisodeNumber": "Episode number", "LabelEpisodeNumber": "Episode number",
@ -694,8 +689,6 @@
"LabelHardwareAccelerationType": "Hardware acceleration", "LabelHardwareAccelerationType": "Hardware acceleration",
"LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration.", "LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration.",
"LabelHardwareEncoding": "Hardware encoding", "LabelHardwareEncoding": "Hardware encoding",
"LabelHDHomerunPortRange": "HDHomeRun port range",
"LabelHDHomerunPortRangeHelp": "Restricts the HDHomeRun UDP port range to this value. (Default is 1024 - 645535).",
"LabelHomeNetworkQuality": "Home network quality", "LabelHomeNetworkQuality": "Home network quality",
"LabelHomeScreenSectionValue": "Home screen section {0}", "LabelHomeScreenSectionValue": "Home screen section {0}",
"LabelHttpsPort": "Local HTTPS port number", "LabelHttpsPort": "Local HTTPS port number",
@ -887,8 +880,6 @@
"LabelSource": "Source", "LabelSource": "Source",
"LabelSpecialSeasonsDisplayName": "Special season display name", "LabelSpecialSeasonsDisplayName": "Special season display name",
"LabelSportsCategories": "Sports categories", "LabelSportsCategories": "Sports categories",
"LabelSSDPTracingFilter": "SSDP Filter",
"LabelSSDPTracingFilterHelp": "Optional IP address upon which to filter the logged SSDP traffic.",
"LabelStable": "Stable", "LabelStable": "Stable",
"LabelStartWhenPossible": "Start when possible", "LabelStartWhenPossible": "Start when possible",
"LabelStatus": "Status", "LabelStatus": "Status",
@ -971,8 +962,6 @@
"LabelType": "Type", "LabelType": "Type",
"LabelTypeMetadataDownloaders": "Metadata downloaders ({0})", "LabelTypeMetadataDownloaders": "Metadata downloaders ({0})",
"LabelTypeText": "Text", "LabelTypeText": "Text",
"LabelUDPPortRange": "UDP Communication Range",
"LabelUDPPortRangeHelp": "Restrict Jellyfin to use this port range when making UDP connections. (Default is 1024 - 645535).<br/> Note: Certain function require fixed ports that may be outside of this range.",
"LabelUnstable": "Unstable", "LabelUnstable": "Unstable",
"LabelUser": "User", "LabelUser": "User",
"LabelUserAgent": "User agent", "LabelUserAgent": "User agent",