From d71a0472c6637e94675ff6bea1dcc6ccc3538bee Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Sun, 24 Jan 2016 09:37:02 +0100 Subject: [PATCH] fixed bug in logic --- controller/state/__init__.py | 5 +++++ controller/state/changer.py | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/controller/state/__init__.py b/controller/state/__init__.py index af6b5a5..b5aa52f 100644 --- a/controller/state/__init__.py +++ b/controller/state/__init__.py @@ -8,12 +8,17 @@ def sync(): local = File(config.STATE_FILE) server_state = server.get_state() + + if local.present(): local.load() + print "local present: " + local.data else: local.data = server_state + print "local not present, server: " + local.data local.save() + local_state = local.data changer = Changer(local_state, server_state) diff --git a/controller/state/changer.py b/controller/state/changer.py index 2d396ad..687f6ae 100644 --- a/controller/state/changer.py +++ b/controller/state/changer.py @@ -19,10 +19,9 @@ class Changer(object): def process_change(self): self.validate_states() - if self.local_state['out_valve'] != self.remote_state['out_valve']: - change = self.states.get(self.remote_state['out_valve'], None ) - if change is not None: - change() + change = self.states.get(self.remote_state['out_valve'], None ) + if change is not None: + change() return self.local_state def open_valve():