From d21fd04f9514e481eaf3fb48c00506d17a07b678 Mon Sep 17 00:00:00 2001 From: Giovanni Harting Date: Fri, 28 Aug 2015 18:47:57 +0200 Subject: [PATCH] moved find_stripe --- ledd/daemon.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ledd/daemon.py b/ledd/daemon.py index 4e057ae..0bfcd80 100644 --- a/ledd/daemon.py +++ b/ledd/daemon.py @@ -147,15 +147,7 @@ class Daemon: if "stripes" in req_json: for stripe in req_json['stripes']: - def find_stripe(): - for c in self.controllers: - for s in c.stripes: - if s.id == stripe['sid']: - return s - - return None - - found_s = find_stripe() + found_s = self.find_stripe(stripe) if found_s is None: log.warning("Stripe not found: id=%s", stripe['sid']) @@ -163,6 +155,19 @@ class Daemon: found_s.set_color(spectra.hsv(stripe['hsv']['h'], stripe['hsv']['s'], stripe['hsv']['v'])) + def find_stripe(self, jstripe): + """ + Finds a given stripeid in the currently known controllers + :param jstripe: json containing sid + :return: stripe + """ + for c in self.controllers: + for s in c.stripes: + if s.id == jstripe['sid']: + return s + + return None + @ledd_protocol(protocol) def add_controller(self, req_json): """