From 4f31d6ab0bc034fa403ccda1f2c4fde48f9eff49 Mon Sep 17 00:00:00 2001 From: Niluge_KiWi Date: Tue, 27 Aug 2024 21:41:47 +0200 Subject: [PATCH] Accept network interface name in addition to IP address in "Incoming Address" in web UI Deluge & libtorrent actually accept both IP address and device/interface names as listen_interface: https://github.com/deluge-torrent/deluge/commit/540d557cb2163c41af894ee252cc677d01887376 it patched ui/ console & gkt3, but not web, this fixes it. (Inspired by https://github.com/deluge-torrent/deluge/pull/300) (Translation should be ok: this string already exists) Also, resync listen & outgoing widths: they hold the same data types. --- CHANGELOG.md | 3 +++ .../web/js/deluge-all/preferences/NetworkPage.js | 14 ++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d878a488da..884b3388ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ - Python 3.6 support removed (Python >= 3.7) +### Web UI +- Accept network interface name in addition to IP adress in "Incoming Address" + ## 2.1.1 (2022-07-10) ### Core diff --git a/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js b/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js index 5ba98e7e26..4d301a4077 100644 --- a/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js +++ b/deluge/ui/web/js/deluge-all/preferences/NetworkPage.js @@ -9,15 +9,6 @@ */ Ext.namespace('Deluge.preferences'); -// custom Vtype for vtype:'IPAddress' -Ext.apply(Ext.form.VTypes, { - IPAddress: function (v) { - return /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(v); - }, - IPAddressText: 'Must be a numeric IP address', - IPAddressMask: /[\d\.]/i, -}); - /** * @class Deluge.preferences.Network * @extends Ext.form.FormPanel @@ -35,7 +26,7 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, { fieldset = this.add({ xtype: 'fieldset', border: false, - title: _('Incoming Address'), + title: _('Incoming Interface'), style: 'margin-bottom: 5px; padding-bottom: 0px;', autoHeight: true, labelWidth: 1, @@ -48,7 +39,6 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, { fieldLabel: '', labelSeparator: '', width: 200, - vtype: 'IPAddress', }) ); @@ -110,7 +100,7 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, { name: 'outgoing_interface', fieldLabel: '', labelSeparator: '', - width: 40, + width: 200, }) );