Skip to content

Commit

Permalink
[WebUI] Accept network interface name as well as IP address
Browse files Browse the repository at this point in the history
Deluge & libtorrent actually accept both IP address and device/interface namesgq
as listen_interface: 540d557 which patched ui/ console & gkt3, but not
web, this fixes it.

(Inspired by deluge-torrent#300)

(Translation should be ok: this string already exists)

Also, resync listen & outgoing widths: they hold the same data types.

Closes: deluge-torrent#458
  • Loading branch information
Niluge-KiWi authored and doadin committed Sep 21, 2024
1 parent a5ca49a commit 842de5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- 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
Expand Down
14 changes: 2 additions & 12 deletions deluge/ui/web/js/deluge-all/preferences/NetworkPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -48,7 +39,6 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, {
fieldLabel: '',
labelSeparator: '',
width: 200,
vtype: 'IPAddress',
})
);

Expand Down Expand Up @@ -110,7 +100,7 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, {
name: 'outgoing_interface',
fieldLabel: '',
labelSeparator: '',
width: 40,
width: 200,
})
);

Expand Down

0 comments on commit 842de5b

Please sign in to comment.