commit f14488ae768d468e4f4cea19ca3d3df793219313 Author: Arturo Filastò arturo@filasto.net Date: Mon Jan 2 13:34:23 2017 +0000

Add icon support to decks --- data/decks/http-invalid.yaml | 1 + data/decks/im.yaml | 1 + data/decks/tor.yaml | 1 + data/decks/web.yaml | 1 + ooni/__init__.py | 2 +- ooni/deck/deck.py | 2 ++ 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/decks/http-invalid.yaml b/data/decks/http-invalid.yaml index 9690376c..405ec5da 100644 --- a/data/decks/http-invalid.yaml +++ b/data/decks/http-invalid.yaml @@ -2,6 +2,7 @@ name: HTTP Invalid Request Line description: This deck runs HTTP Invalid Request Line test schedule: "@daily" +icon: "fa-gears" tasks: - name: Runs the HTTP Invalid Request Line test ooni: diff --git a/data/decks/im.yaml b/data/decks/im.yaml index 98dc27ae..31c88d3d 100644 --- a/data/decks/im.yaml +++ b/data/decks/im.yaml @@ -2,6 +2,7 @@ name: Instant Messaging deck description: This test deck will check to see if instant messaging applications are working schedule: "@daily" +icon: "fa-comment-o" tasks: - name: Checks to see if WhatsApp is working ooni: diff --git a/data/decks/tor.yaml b/data/decks/tor.yaml index ea6e1a3f..d732f345 100644 --- a/data/decks/tor.yaml +++ b/data/decks/tor.yaml @@ -2,6 +2,7 @@ name: Tor test deck description: This deck runs test related to testing the reachability of the Tor network schedule: "@daily" +icon: "fa-wrench" tasks: - name: Checks if the Tor client works ooni: diff --git a/data/decks/web.yaml b/data/decks/web.yaml index 9232cec1..7e9b9c8f 100644 --- a/data/decks/web.yaml +++ b/data/decks/web.yaml @@ -2,6 +2,7 @@ name: Web test deck description: This deck runs HTTP Header Field Manipulation and the Web Connectivity test schedule: "@daily" +icon: "fa-unlink" tasks: - name: Runs the HTTP Header Field Manipulation test ooni: diff --git a/ooni/__init__.py b/ooni/__init__.py index a0887e07..4b4a1bcb 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*-

__author__ = "Open Observatory of Network Interference" -__version__ = "2.1.0" +__version__ = "2.2.0.dev0"

__all__ = [ 'agent', diff --git a/ooni/deck/deck.py b/ooni/deck/deck.py index 50887b55..07f0799e 100644 --- a/ooni/deck/deck.py +++ b/ooni/deck/deck.py @@ -81,6 +81,7 @@ class NGDeck(object): self.no_collector = no_collector self.name = "" self.description = "" + self.icon = "" self.schedule = None

self.metadata = {} @@ -113,6 +114,7 @@ class NGDeck(object):

self.name = deck_data.pop("name", "Un-named Deck") self.description = deck_data.pop("description", "No description") + self.icon = deck_data.pop("icon", "fa-gears")

bouncer_address = self.global_options.get('bouncer', deck_data.pop("bouncer", None))