Skip to content

Warn when adding a domain that is already blocked #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TwDover wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Warn when adding a domain that is already blocked #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions usr/lib/linuxmint/mintnanny/mintnanny.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,16 @@ def add_domain(self, widget):
if len(domain.split(".")) == 2:
# domain in the form 'domainname.extension'
prefixes.append("www.")

already_blocked = ["%s%s" % (p, domain) for p in prefixes if self.is_domain_blocked("%s%s" % (p, domain))]
if already_blocked:
dlg = Gtk.MessageDialog(type=Gtk.MessageType.ERROR, buttons=Gtk.ButtonsType.OK, message_format=_("Already Blocked"))
dlg.set_transient_for(self.window)
dlg.format_secondary_text(_("%s is already being blocked.") % already_blocked[0])
dlg.run()
dlg.destroy()
return

for prefix in prefixes:
full_domain = "%s%s" % (prefix, domain)
iter = self.model.insert_before(None, None)
Expand All @@ -136,6 +146,14 @@ def remove_domain(self, widget):
sys.stdout.write(line)
model.remove(iter)

def is_domain_blocked(self, domain):
model_iter = self.model.get_iter_first()
while model_iter is not None:
if self.model.get_value(model_iter, 0) == domain:
return True
model_iter = self.model.iter_next(model_iter)
return False

def is_valid_domain(self, domain):
# Quick sanity check
if domain == '' or "." not in domain:
Expand Down