PR#375: Filter out widgets that have been disabled - fedora-hubs

Aurélien Bompard • 6 years ago

6aa5e8f

Aurélien Bompard • 6 years ago

97171f7

check-cache-coverage.py

file modified

		`@@ -29,6 +29,8 @@`
		`hubs.widgets.registry.register_list(hubs.app.app.config["WIDGETS"])`

		`for w_instance in session.query(hubs.models.Widget).all():`
		`+ if not w_instance.enabled:`
		`+ continue`
		`for fn_name, fn_class in w_instance.module.get_cached_functions().items():`
		`if fn_class(w_instance).is_cached():`
		`full += 1`

hubs/backend/triage.py

file modified

		`@@ -91,6 +91,8 @@`
		`# Get a list of all our widgets:`
		`log.debug("Querying for all widgets.")`
		`widgets = session.query(hubs.models.Widget).all()`
		`+ # Filter out widgets that have been disabled.`
		`+ widgets = [w for w in widgets if w.enabled]`
		`# Randomize so that all the triage daemons work on widgets in different`
		`# orders. This should hopefully prevent cache thrashing.`
		`log.debug("Randomizing list of all widgets.")`

hubs/models.py

file modified

		`@@ -456,6 +456,10 @@`
		`def edit_url(self):`
		`return self.module.get_edit_url(self.hub, self)`

		`+ @property`
		`+ def enabled(self):`
		`+ return self.plugin in hubs.widgets.registry`
		`+`

		`class User(BASE):`
		`__tablename__ = 'users'`

hubs/tests/backend/__init__.py

file added

empty or binary file added

hubs/tests/backend/test_triage.py

file added

+28

		`@@ -0,0 +1,28 @@`
		`+ from __future__ import unicode_literals`
		`+`
		`+ from hubs.app import app`
		`+ from hubs.backend import triage`
		`+ from hubs.models import Hub, Widget`
		`+ from hubs.tests import APPTest`
		`+`
		`+`
		`+ class TriageTest(APPTest):`
		`+`
		`+ def setUp(self):`
		`+ super(TriageTest, self).setUp()`
		`+ # Set the session`
		`+ triage.session = self.session`
		`+`
		`+`
		`+ def test_get_widgets(self):`
		`+ # Get all widgets except those whose module isn't installed.`
		`+ hub = Hub.by_name('ralph')`
		`+ widget = Widget(`
		`+ plugin='non-existant',`
		`+ index=500,`
		`+ _config="{}",`
		`+ )`
		`+ hub.widgets.append(widget)`
		`+ module_names = [w.plugin for w in triage.get_widgets()]`
		`+ self.assertNotIn("non-existant", module_names)`
		`+ self.assertEqual(len(module_names), 59)`

hubs/tests/test_models.py

file modified

		`@@ -229,3 +229,9 @@`
		`widget.visibility = "restricted"`
		`self.assertEqual(`
		`widget._get_auth_permission_name("view"), "widget.restricted.view")`
		`+`
		`+ def test_widget_enabled(self):`
		`+ hub = hubs.models.Hub.get("ralph")`
		`+ widget = hubs.models.Widget(hub=hub, plugin="does-not-exist")`
		`+ self.session.add(widget)`
		`+ self.assertFalse(widget.enabled)`

smart_cache_invalidator.py

file modified

		`@@ -27,6 +27,8 @@`
		`def do_list(args):`
		`''' List the different widget for which there is data cached. '''`
		`for w_instance in session.query(hubs.models.Widget).all():`
		`+ if not w_instance.enabled:`
		`+ continue`
		`widget = w_instance.module`
		`for fn_name, fn_class in widget.get_cached_functions().items():`
		`if fn_class(w_instance).is_cached():`