jiigen666/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Lint] Update linter version and fix issues

Browse Source 
Notable changes:

* Prettier >=2.3 with more consistent js assignments
* Black now formats docstrings
* Added isort to list of autoformaters
* Update flake8 config for v4

Ref: https://prettier.io/blog/2021/05/09/2.3.0.html
This commit is contained in:
Calum Lind
2022-02-13 12:31:41 +00:00
parent 2bd095e5bf
commit 2ec6e10c8e
35 changed files with 129 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.pre-commit-config.yaml
View File

@ -6,30 +6,32 @@ exclude: >
deluge/tests/data/.*svg| deluge/tests/data/.*svg|
)$ )$
repos: repos:
- repo: https://github.com/ambv/black - repo: https://github.com/psf/black
rev: 20.8b1 rev: 22.1.0
hooks: hooks:
- id: black - id: black
name: Fmt Black name: Fmt Black
- repo: https://github.com/pre-commit/mirrors-prettier - repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.2.1 rev: v2.5.1
hooks: hooks:
- id: prettier - id: prettier
name: Fmt Prettier name: Fmt Prettier
# Workaround to list modified files only. # Workaround to list modified files only.
args: [--list-different] args: [--list-different]
- repo: https://gitlab.com/pycqa/flake8 - repo: https://github.com/pycqa/isort
# v3.7.9 due to E402 issue: https://gitlab.com/pycqa/flake8/-/issues/638 rev: 5.10.1
rev: 3.7.9 hooks:
- id: isort
name: Fmt isort
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
hooks: hooks:
- id: flake8 - id: flake8
name: Chk Flake8 name: Chk Flake8
additional_dependencies: additional_dependencies:
- flake8-isort==4.0.0 - pep8-naming==0.12.1
- pep8-naming==0.11.1
args: [--isort-show-traceback]
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0 rev: v4.1.0
hooks: hooks:
- id: double-quote-string-fixer - id: double-quote-string-fixer
name: Fix Double-quotes name: Fix Double-quotes
@ -42,7 +44,7 @@ repos:
- id: trailing-whitespace - id: trailing-whitespace
name: Fix Trailing whitespace name: Fix Trailing whitespace
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/asottile/pyupgrade
rev: v2.29.1 rev: v2.31.0
hooks: hooks:
- id: pyupgrade - id: pyupgrade
args: [--py36-plus] args: [--py36-plus]

6
deluge/argparserbase.py
View File

@ -106,8 +106,8 @@ class DelugeTextHelpFormatter(argparse.RawDescriptionHelpFormatter):
line instead. This way list formatting is not mangled by textwrap.wrap. line instead. This way list formatting is not mangled by textwrap.wrap.
""" """
wrapped_lines = [] wrapped_lines = []
for l in text.splitlines(): for line in text.splitlines():
wrapped_lines.extend(textwrap.wrap(l, width, subsequent_indent=' ')) wrapped_lines.extend(textwrap.wrap(line, width, subsequent_indent=' '))
return wrapped_lines return wrapped_lines
def _format_action_invocation(self, action): def _format_action_invocation(self, action):
@ -199,7 +199,7 @@ class ArgParserBase(argparse.ArgumentParser):
self.group.add_argument( self.group.add_argument(
'-L', '-L',
'--loglevel', '--loglevel',
choices=[l for k in deluge.log.levels for l in (k, k.upper())], choices=[level for k in deluge.log.levels for level in (k, k.upper())],
help=_('Set the log level (none, error, warning, info, debug)'), help=_('Set the log level (none, error, warning, info, debug)'),
metavar='<level>', metavar='<level>',
) )

46
deluge/common.py
View File

@ -436,22 +436,22 @@ def fsize(fsize_b, precision=1, shortform=False):
""" """
if fsize_b >= 1024 ** 4: if fsize_b >= 1024**4:
return '%.*f %s' % ( return '%.*f %s' % (
precision, precision,
fsize_b / 1024 ** 4, fsize_b / 1024**4,
tib_txt_short if shortform else tib_txt, tib_txt_short if shortform else tib_txt,
) )
elif fsize_b >= 1024 ** 3: elif fsize_b >= 1024**3:
return '%.*f %s' % ( return '%.*f %s' % (
precision, precision,
fsize_b / 1024 ** 3, fsize_b / 1024**3,
gib_txt_short if shortform else gib_txt, gib_txt_short if shortform else gib_txt,
) )
elif fsize_b >= 1024 ** 2: elif fsize_b >= 1024**2:
return '%.*f %s' % ( return '%.*f %s' % (
precision, precision,
fsize_b / 1024 ** 2, fsize_b / 1024**2,
mib_txt_short if shortform else mib_txt, mib_txt_short if shortform else mib_txt,
) )
elif fsize_b >= 1024: elif fsize_b >= 1024:
@ -503,28 +503,28 @@ def fspeed(bps, precision=1, shortform=False):
""" """
if bps < 1024 ** 2: if bps < 1024**2:
return '%.*f %s' % ( return '%.*f %s' % (
precision, precision,
bps / 1024, bps / 1024,
_('K/s') if shortform else _('KiB/s'), _('K/s') if shortform else _('KiB/s'),
) )
elif bps < 1024 ** 3: elif bps < 1024**3:
return '%.*f %s' % ( return '%.*f %s' % (
precision, precision,
bps / 1024 ** 2, bps / 1024**2,
_('M/s') if shortform else _('MiB/s'), _('M/s') if shortform else _('MiB/s'),
) )
elif bps < 1024 ** 4: elif bps < 1024**4:
return '%.*f %s' % ( return '%.*f %s' % (
precision, precision,
bps / 1024 ** 3, bps / 1024**3,
_('G/s') if shortform else _('GiB/s'), _('G/s') if shortform else _('GiB/s'),
) )
else: else:
return '%.*f %s' % ( return '%.*f %s' % (
precision, precision,
bps / 1024 ** 4, bps / 1024**4,
_('T/s') if shortform else _('TiB/s'), _('T/s') if shortform else _('TiB/s'),
) )
@ -639,17 +639,17 @@ def tokenize(text):
size_units = [ size_units = [
{'prefix': 'b', 'divider': 1, 'singular': 'byte', 'plural': 'bytes'}, {'prefix': 'b', 'divider': 1, 'singular': 'byte', 'plural': 'bytes'},
{'prefix': 'KiB', 'divider': 1024 ** 1}, {'prefix': 'KiB', 'divider': 1024**1},
{'prefix': 'MiB', 'divider': 1024 ** 2}, {'prefix': 'MiB', 'divider': 1024**2},
{'prefix': 'GiB', 'divider': 1024 ** 3}, {'prefix': 'GiB', 'divider': 1024**3},
{'prefix': 'TiB', 'divider': 1024 ** 4}, {'prefix': 'TiB', 'divider': 1024**4},
{'prefix': 'PiB', 'divider': 1024 ** 5}, {'prefix': 'PiB', 'divider': 1024**5},
{'prefix': 'KB', 'divider': 1000 ** 1}, {'prefix': 'KB', 'divider': 1000**1},
{'prefix': 'MB', 'divider': 1000 ** 2}, {'prefix': 'MB', 'divider': 1000**2},
{'prefix': 'GB', 'divider': 1000 ** 3}, {'prefix': 'GB', 'divider': 1000**3},
{'prefix': 'TB', 'divider': 1000 ** 4}, {'prefix': 'TB', 'divider': 1000**4},
{'prefix': 'PB', 'divider': 1000 ** 5}, {'prefix': 'PB', 'divider': 1000**5},
{'prefix': 'm', 'divider': 1000 ** 2}, {'prefix': 'm', 'divider': 1000**2},
] ]

2
deluge/config.py
View File

@ -231,7 +231,7 @@ class Config:
self._save_timer = self.callLater(5, self.save) self._save_timer = self.callLater(5, self.save)
def __getitem__(self, key): def __getitem__(self, key):
"""See get_item """ """See get_item"""
return self.get_item(key) return self.get_item(key)
def get_item(self, key): def get_item(self, key):

2
deluge/core/preferencesmanager.py
View File

@ -198,7 +198,7 @@ class PreferencesManager(component.Component):
self.__set_listen_on() self.__set_listen_on()
def __set_listen_on(self): def __set_listen_on(self):
""" Set the ports and interface address to listen for incoming connections on.""" """Set the ports and interface address to listen for incoming connections on."""
if self.config['random_port']: if self.config['random_port']:
if not self.config['listen_random_port']: if not self.config['listen_random_port']:
self.config['listen_random_port'] = random.randrange(49152, 65525) self.config['listen_random_port'] = random.randrange(49152, 65525)

2
deluge/core/torrent.py
View File

@ -576,7 +576,7 @@ class Torrent:
trackers (list of dicts): A list of trackers. trackers (list of dicts): A list of trackers.
""" """
if trackers is None: if trackers is None:
self.trackers = [tracker for tracker in self.handle.trackers()] self.trackers = list(self.handle.trackers())
self.tracker_host = None self.tracker_host = None
return return

31
deluge/plugins/AutoAdd/deluge_autoadd/data/autoadd.js
View File

@ -42,22 +42,21 @@ Deluge.ux.preferences.AutoAddPage = Ext.extend(Ext.Panel, {
dataIndex: 'enabled', dataIndex: 'enabled',
tpl: new Ext.XTemplate('{enabled:this.getCheckbox}', { tpl: new Ext.XTemplate('{enabled:this.getCheckbox}', {
getCheckbox: function (checked, selected) { getCheckbox: function (checked, selected) {
Deluge.ux.AutoAdd.onClickFunctions[ Deluge.ux.AutoAdd.onClickFunctions[selected.id] =
selected.id function () {
] = function () { if (selected.enabled) {
if (selected.enabled) { deluge.client.autoadd.disable_watchdir(
deluge.client.autoadd.disable_watchdir( selected.id
selected.id );
); checked = false;
checked = false; } else {
} else { deluge.client.autoadd.enable_watchdir(
deluge.client.autoadd.enable_watchdir( selected.id
selected.id );
); checked = true;
checked = true; }
} autoAdd.updateWatchDirs();
autoAdd.updateWatchDirs(); };
};
return ( return (
'<input id="enabled-' + '<input id="enabled-' +
selected.id + selected.id +

5
deluge/plugins/AutoAdd/deluge_autoadd/data/autoadd_options.js
View File

@ -90,9 +90,8 @@ Deluge.ux.AutoAdd.AutoAddWindowBase = Ext.extend(Ext.Window, {
options['enabled'] = Ext.getCmp('enabled').getValue(); options['enabled'] = Ext.getCmp('enabled').getValue();
options['path'] = Ext.getCmp('path').getValue(); options['path'] = Ext.getCmp('path').getValue();
options['download_location'] = Ext.getCmp( options['download_location'] =
'download_location' Ext.getCmp('download_location').getValue();
).getValue();
options['move_completed_path'] = Ext.getCmp( options['move_completed_path'] = Ext.getCmp(
'move_completed_path' 'move_completed_path'
).getValue(); ).getValue();

2
deluge/plugins/AutoAdd/deluge_autoadd/gtkui.py
View File

@ -16,7 +16,7 @@ import os
import gi # isort:skip (Required before Gtk import). import gi # isort:skip (Required before Gtk import).
gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gtk', '3.0')
# isort:imports-thirdparty # isort:imports-thirdparty
from gi.repository import Gtk from gi.repository import Gtk

2
deluge/plugins/Blocklist/deluge_blocklist/gtkui.py
View File

@ -11,7 +11,7 @@ from datetime import datetime
import gi # isort:skip (Required before Gtk import). import gi # isort:skip (Required before Gtk import).
gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gtk', '3.0')
# isort:imports-thirdparty # isort:imports-thirdparty
from gi.repository import Gtk from gi.repository import Gtk

2
deluge/plugins/Execute/deluge_execute/gtkui.py
View File

@ -10,7 +10,7 @@ import logging
import gi # isort:skip (Required before Gtk import). import gi # isort:skip (Required before Gtk import).
gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gtk', '3.0')
# isort:imports-thirdparty # isort:imports-thirdparty
from gi.repository import Gtk from gi.repository import Gtk

2
deluge/plugins/Extractor/deluge_extractor/gtkui.py
View File

@ -14,7 +14,7 @@ import logging
import gi # isort:skip (Required before Gtk import). import gi # isort:skip (Required before Gtk import).
gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gtk', '3.0')
# isort:imports-thirdparty # isort:imports-thirdparty
from gi.repository import Gtk from gi.repository import Gtk

20
deluge/plugins/Label/deluge_label/data/label.js
View File

@ -148,8 +148,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, {
xtype: 'fieldset', xtype: 'fieldset',
border: false, border: false,
labelWidth: 1, labelWidth: 1,
style: style: 'margin-bottom: 0px; padding-bottom: 0px;',
'margin-bottom: 0px; padding-bottom: 0px;',
items: [ items: [
{ {
xtype: 'checkbox', xtype: 'checkbox',
@ -218,8 +217,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, {
xtype: 'fieldset', xtype: 'fieldset',
border: false, border: false,
labelWidth: 1, labelWidth: 1,
style: style: 'margin-bottom: 0px; padding-bottom: 0px;',
'margin-bottom: 0px; padding-bottom: 0px;',
items: [ items: [
{ {
xtype: 'checkbox', xtype: 'checkbox',
@ -260,8 +258,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, {
width: 60, width: 60,
decimalPrecision: 2, decimalPrecision: 2,
incrementValue: 0.1, incrementValue: 0.1,
style: style: 'position: relative; left: 100px',
'position: relative; left: 100px',
disabled: true, disabled: true,
}, },
{ {
@ -285,8 +282,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, {
xtype: 'fieldset', xtype: 'fieldset',
border: false, border: false,
labelWidth: 1, labelWidth: 1,
style: style: 'margin-bottom: 0px; padding-bottom: 0px;',
'margin-bottom: 0px; padding-bottom: 0px;',
items: [ items: [
{ {
xtype: 'checkbox', xtype: 'checkbox',
@ -339,8 +335,7 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, {
xtype: 'fieldset', xtype: 'fieldset',
border: false, border: false,
labelWidth: 1, labelWidth: 1,
style: style: 'margin-bottom: 0px; padding-bottom: 0px;',
'margin-bottom: 0px; padding-bottom: 0px;',
items: [ items: [
{ {
xtype: 'checkbox', xtype: 'checkbox',
@ -408,9 +403,8 @@ Deluge.ux.LabelOptionsWindow = Ext.extend(Ext.Window, {
onOkClick: function () { onOkClick: function () {
var values = this.form.getForm().getFieldValues(); var values = this.form.getForm().getFieldValues();
if (values['auto_add_trackers']) { if (values['auto_add_trackers']) {
values['auto_add_trackers'] = values['auto_add_trackers'].split( values['auto_add_trackers'] =
'\n' values['auto_add_trackers'].split('\n');
);
} }
deluge.client.label.set_options(this.label, values); deluge.client.label.set_options(this.label, values);
this.hide(); this.hide();

2
deluge/plugins/Label/deluge_label/gtkui/sidebar_menu.py
View File

@ -11,7 +11,7 @@ import logging
import gi # isort:skip (Required before Gtk import). import gi # isort:skip (Required before Gtk import).
gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gtk', '3.0')
# isort:imports-thirdparty # isort:imports-thirdparty
from gi.repository import Gtk from gi.repository import Gtk

2
deluge/plugins/Stats/deluge_stats/graph.py
View File

@ -19,7 +19,7 @@ import time
import gi import gi
gi.require_foreign('cairo') # NOQA: E402 gi.require_foreign('cairo')
import cairo # isort:skip (gi checks required before import). import cairo # isort:skip (gi checks required before import).

2
deluge/tests/common.py
View File

@ -153,7 +153,7 @@ class ProcessOutputHandler(protocol.ProcessProtocol):
return result return result
def _kill_watchdogs(self): def _kill_watchdogs(self):
""""Cancel all watchdogs""" """Cancel all watchdogs"""
for w in self.watchdogs: for w in self.watchdogs:
if not w.called and not w.cancelled: if not w.called and not w.cancelled:
w.cancel() w.cancel()

8
deluge/tests/test_common.py
View File

@ -184,10 +184,10 @@ class TestCommon:
('1 MiB', 2 ** (10 * 2)), ('1 MiB', 2 ** (10 * 2)),
('1 GiB', 2 ** (10 * 3)), ('1 GiB', 2 ** (10 * 3)),
('1 GiB', 2 ** (10 * 3)), ('1 GiB', 2 ** (10 * 3)),
('1M', 10 ** 6), ('1M', 10**6),
('1MB', 10 ** 6), ('1MB', 10**6),
('1 GB', 10 ** 9), ('1 GB', 10**9),
('1 TB', 10 ** 12), ('1 TB', 10**12),
] ]
for human_size, byte_size in sizes: for human_size, byte_size in sizes:

4
deluge/tests/test_files_tab.py
View File

@ -44,8 +44,8 @@ class TestFilesTab(BaseTestCase):
root = treestore.get_iter_first() root = treestore.get_iter_first()
level = 1 level = 1
def p_level(s, l): def p_level(s, lvl):
print('{}{}'.format(' ' * l, s)) print('{}{}'.format(' ' * lvl, s))
def _print_treestore_children(i, lvl): def _print_treestore_children(i, lvl):
while i: while i:

2
deluge/ui/console/cmdline/commands/info.py
View File

@ -175,7 +175,7 @@ class Command(BaseCommand):
sort_key = 'name' sort_key = 'name'
sort_reverse = False sort_reverse = False
for key, value in sorted( for key, value in sorted(
list(status.items()), status.items(),
key=lambda x: x[1].get(sort_key), key=lambda x: x[1].get(sort_key),
reverse=sort_reverse, reverse=sort_reverse,
): ):

2
deluge/ui/console/modes/basemode.py
View File

@ -84,7 +84,7 @@ class CursesStdIO:
""" """
def fileno(self): def fileno(self):
""" We want to select on FD 0 """ """We want to select on FD 0"""
return 0 return 0
def doRead(self): # NOQA: N802 def doRead(self): # NOQA: N802

4
deluge/ui/console/utils/format_utils.py
View File

@ -235,11 +235,11 @@ def wrap_string(string, width, min_lines=0, strip_colors=True):
else: else:
cstr = s cstr = s
def append_indent(l, string, offset): def append_indent(line, string, offset):
"""Prepends indent to string if specified""" """Prepends indent to string if specified"""
if indent and offset != 0: if indent and offset != 0:
string = indent + string string = indent + string
l.append(string) line.append(string)
while cstr: while cstr:
# max with for a line. If indent is specified, we account for this # max with for a line. If indent is specified, we account for this

2
deluge/ui/gtk3/files_tab.py
View File

@ -12,7 +12,7 @@ import os.path
import gi # isort:skip (Required before Gtk import). import gi # isort:skip (Required before Gtk import).
gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gtk', '3.0')
# isort:imports-thirdparty # isort:imports-thirdparty
from gi.repository import Gio, Gtk from gi.repository import Gio, Gtk

4
deluge/ui/gtk3/gtkui.py
View File

@ -15,8 +15,8 @@ import time
import gi # isort:skip (Required before Gtk import). import gi # isort:skip (Required before Gtk import).
gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gtk', '3.0')
gi.require_version('Gdk', '3.0') # NOQA: E402 gi.require_version('Gdk', '3.0')
# isort:imports-thirdparty # isort:imports-thirdparty
from gi.repository.GLib import set_prgname from gi.repository.GLib import set_prgname

2
deluge/ui/gtk3/listview.py
View File

@ -76,7 +76,7 @@ class ListView:
} }
def __init__(self, title=None, cell_renderer=None, **args): def __init__(self, title=None, cell_renderer=None, **args):
""" Constructor, see Gtk.TreeViewColumn """ """Constructor, see Gtk.TreeViewColumn"""
Gtk.TreeViewColumn.__init__(self, title, cell_renderer, **args) Gtk.TreeViewColumn.__init__(self, title, cell_renderer, **args)
label = Gtk.Label(label=title) label = Gtk.Label(label=title)
self.set_widget(label) self.set_widget(label)

2
deluge/ui/gtk3/path_combo_chooser.py
View File

@ -1405,7 +1405,7 @@ class PathChooserComboBox(Gtk.Box, StoredValuesPopup, GObject.GObject):
self.set_text(self.get_text()) self.set_text(self.get_text())
def _on_entry_combobox_hbox_realize(self, widget): def _on_entry_combobox_hbox_realize(self, widget):
""" Must do this when the widget is realized """ """Must do this when the widget is realized"""
self.set_filechooser_button_visible(self.filechooser_visible) self.set_filechooser_button_visible(self.filechooser_visible)
self.set_path_entry_visible(self.path_entry_visible) self.set_path_entry_visible(self.path_entry_visible)

6
deluge/ui/gtk3/piecesbar.py
View File

@ -10,9 +10,9 @@ from math import pi
import gi # isort:skip (Version check required before import). import gi # isort:skip (Version check required before import).
gi.require_version('PangoCairo', '1.0') # NOQA: E402 gi.require_version('PangoCairo', '1.0')
gi.require_foreign('cairo') # NOQA: E402 gi.require_foreign('cairo')
gi.require_version('cairo', '1.0') # NOQA: E402 gi.require_version('cairo', '1.0')
# isort:imports-thirdparty # isort:imports-thirdparty
import cairo # Backward compat cairo <= 1.15 import cairo # Backward compat cairo <= 1.15

3
deluge/ui/gtk3/preferences.py
View File

@ -19,6 +19,7 @@ from gi.repository.Gdk import Color
import deluge.common import deluge.common
import deluge.component as component import deluge.component as component
from deluge.configmanager import ConfigManager, get_config_dir from deluge.configmanager import ConfigManager, get_config_dir
from deluge.decorators import maybe_coroutine
from deluge.error import AuthManagerError, NotAuthorizedError from deluge.error import AuthManagerError, NotAuthorizedError
from deluge.i18n import get_languages from deluge.i18n import get_languages
from deluge.ui.client import client from deluge.ui.client import client
@ -1337,8 +1338,6 @@ class Preferences(component.Component):
self.builder.get_object('accounts_edit').set_sensitive(False) self.builder.get_object('accounts_edit').set_sensitive(False)
self.builder.get_object('accounts_delete').set_sensitive(False) self.builder.get_object('accounts_delete').set_sensitive(False)
from deluge.decorators import maybe_coroutine
@maybe_coroutine @maybe_coroutine
async def on_accounts_add_clicked(self, widget): async def on_accounts_add_clicked(self, widget):
dialog = AccountDialog( dialog = AccountDialog(

3
deluge/ui/web/js/deluge-all/AboutWindow.js
View File

@ -104,8 +104,7 @@ Deluge.about.AboutWindow = Ext.extend(Ext.Window, {
{ {
xtype: 'label', xtype: 'label',
style: 'padding-top: 5px; font-size: 12px;', style: 'padding-top: 5px; font-size: 12px;',
html: html: '<a href="https://deluge-torrent.org" target="_blank">deluge-torrent.org</a>',
'<a href="https://deluge-torrent.org" target="_blank">deluge-torrent.org</a>',
}, },
]); ]);
this.addButton(_('Close'), this.onCloseClick, this); this.addButton(_('Close'), this.onCloseClick, this);

3
deluge/ui/web/js/deluge-all/AddTrackerWindow.js
View File

@ -10,7 +10,8 @@
Ext.ns('Deluge'); Ext.ns('Deluge');
// Custom VType validator for tracker urls // Custom VType validator for tracker urls
var trackerUrlTest = /(((^https?)|(^udp)):\/\/([\-\w]+\.)+\w{2,3}(\/[%\-\w]+(\.\w{2,})?)*(([\w\-\.\?\\\/+@&#;`~=%!]*)(\.\w{2,})?)*\/?)/i; var trackerUrlTest =
/(((^https?)|(^udp)):\/\/([\-\w]+\.)+\w{2,3}(\/[%\-\w]+(\.\w{2,})?)*(([\w\-\.\?\\\/+@&#;`~=%!]*)(\.\w{2,})?)*\/?)/i;
Ext.apply(Ext.form.VTypes, { Ext.apply(Ext.form.VTypes, {
trackerUrl: function (val, field) { trackerUrl: function (val, field) {
return trackerUrlTest.test(val); return trackerUrlTest.test(val);

5
deluge/ui/web/js/deluge-all/add/OptionsPanel.js
View File

@ -134,9 +134,8 @@ Deluge.add.OptionsPanel = Ext.extend(Ext.TabPanel, {
nodes, nodes,
function (node) { function (node) {
if (node.attributes.fileindex < 0) return; if (node.attributes.fileindex < 0) return;
var priorities = this.form.optionsManager.get( var priorities =
'file_priorities' this.form.optionsManager.get('file_priorities');
);
priorities[node.attributes.fileindex] = newValue; priorities[node.attributes.fileindex] = newValue;
this.form.optionsManager.update('file_priorities', priorities); this.form.optionsManager.update('file_priorities', priorities);
}, },

3
deluge/ui/web/js/deluge-all/preferences/BandwidthPage.js
View File

@ -117,8 +117,7 @@ Deluge.preferences.Bandwidth = Ext.extend(Ext.form.FormPanel, {
border: false, border: false,
title: '', title: '',
defaultType: 'checkbox', defaultType: 'checkbox',
style: style: 'padding-top: 0px; padding-bottom: 5px; margin-top: 0px; margin-bottom: 0px;',
'padding-top: 0px; padding-bottom: 5px; margin-top: 0px; margin-bottom: 0px;',
autoHeight: true, autoHeight: true,
}); });
om.bind( om.bind(

5
deluge/ui/web/js/extjs/ext-extensions/form/SpinnerGroup.js vendored
View File

@ -80,9 +80,8 @@ Ext.ux.form.SpinnerGroup = Ext.extend(Ext.form.CheckboxGroup, {
// Generate the column configs with the correct width setting // Generate the column configs with the correct width setting
for (var i = 0; i < numCols; i++) { for (var i = 0; i < numCols; i++) {
var cc = Ext.apply({ items: [] }, colCfg); var cc = Ext.apply({ items: [] }, colCfg);
cc[ cc[this.columns[i] <= 1 ? 'columnWidth' : 'width'] =
this.columns[i] <= 1 ? 'columnWidth' : 'width' this.columns[i];
] = this.columns[i];
if (this.defaults) { if (this.defaults) {
cc.defaults = Ext.apply( cc.defaults = Ext.apply(
cc.defaults || {}, cc.defaults || {},

52
packaging/win/delugewin.spec
View File

@ -1,12 +1,15 @@
# -*- mode: python ; coding: utf-8 -*- # -*- mode: python -*-
import os import os
import sys
import deluge.common from PyInstaller.utils.hooks import (
from PyInstaller.utils.hooks import collect_data_files, collect_submodules, copy_metadata collect_data_files,
collect_submodules,
copy_metadata,
)
datas = [] datas = []
binaries = [] binaries = []
hiddenimports = ['pygame','ifaddr'] hiddenimports = ['pygame', 'ifaddr']
# Collect Meta Data # Collect Meta Data
datas += copy_metadata('deluge', recursive=True) datas += copy_metadata('deluge', recursive=True)
@ -16,7 +19,8 @@ datas += copy_metadata('service-identity', recursive=True)
hiddenimports += collect_submodules('deluge') hiddenimports += collect_submodules('deluge')
# Add stdlib as Hidden Imports. # Add stdlib as Hidden Imports.
# This is filtered list that excludes some common examples or stuff not useful in plugins (such as tty, mailbox, turtledemo etc.). # This is filtered list that excludes some common examples or stuff not useful in
# plugins (such as tty, mailbox, turtledemo etc.).
# It is safe to assume that 90% of that list would already be included anyway. # It is safe to assume that 90% of that list would already be included anyway.
stdlib = [ stdlib = [
'string', 'string',
@ -108,46 +112,22 @@ icon = [src for src, dest in package_data if src.endswith('deluge.ico')][0]
# List of executables to produce # List of executables to produce
executables = { executables = {
'deluge-script.pyw': { 'deluge-script.pyw': {'name': 'deluge', 'console': False, 'gtk': True},
'name': 'deluge', 'deluge-gtk-script.pyw': {'name': 'deluge-gtk', 'console': False, 'gtk': True},
'console': False, 'deluge-debug-script.py': {'name': 'deluge-debug', 'console': True, 'gtk': True},
'gtk': True,
},
'deluge-gtk-script.pyw': {
'name': 'deluge-gtk',
'console': False,
'gtk': True,
},
'deluge-debug-script.py': {
'name': 'deluge-debug',
'console': True,
'gtk': True,
},
'deluge-console-script.py': { 'deluge-console-script.py': {
'name': 'deluge-console', 'name': 'deluge-console',
'console': True, 'console': True,
'gtk': False, 'gtk': False,
}, },
'deluged-script.pyw': { 'deluged-script.pyw': {'name': 'deluged', 'console': False, 'gtk': False},
'name': 'deluged', 'deluged-debug-script.py': {'name': 'deluged-debug', 'console': True, 'gtk': False},
'console': False,
'gtk': False,
},
'deluged-debug-script.py': {
'name': 'deluged-debug',
'console': True,
'gtk': False,
},
'deluge-web-debug-script.py': { 'deluge-web-debug-script.py': {
'name': 'deluge-web-debug', 'name': 'deluge-web-debug',
'console': True, 'console': True,
'gtk': False, 'gtk': False,
}, },
'deluge-web-script.pyw': { 'deluge-web-script.pyw': {'name': 'deluge-web', 'console': False, 'gtk': False},
'name': 'deluge-web',
'console': False,
'gtk': False,
},
} }
analysis = {} analysis = {}

1
packaging/win/setup_nsis.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*-
# #
# Copyright (C) 2012-2015 Calum Lind <calumlind@gmail.com> # Copyright (C) 2012-2015 Calum Lind <calumlind@gmail.com>
# Copyright (C) 2010 Damien Churchill <damoxc@gmail.com> # Copyright (C) 2010 Damien Churchill <damoxc@gmail.com>

22
setup.cfg
View File

@ -27,15 +27,19 @@ frameworks = CoreFoundation, Foundation, AppKit
[flake8] [flake8]
max-line-length = 120 max-line-length = 120
builtins = _,_n,__request__ builtins = _,_n,__request__
exclude = .git,.tox,.eggs,dist,build extend-exclude = dist,build
ignore = extend-ignore =
# A003 Class attribute is a python builtin. # flake8-builtins: A003 class attribute is shadowing a python builtin
A003, A003,
# C813, C815, C816: PY3 missing trailing commas. # E203 whitespace before ':'
C813,C815,C816, E203,
# W503 line break before binary operator. # N818 pep8-naming: error suffix in exception names
W503, N818
E203 per-file-ignores =
# import not top of file (gi checks required before import)
deluge/ui/gtk3/*.py : E402
deluge/**/gtkui.py: E402
deluge/**/gtkui/*.py: E402
deluge/plugins/Stats/deluge_stats/graph.py: E402
[pycodestyle] [pycodestyle]
max-line-length = 88 max-line-length = 88