Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
domotikad
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
domotika
domotikad
Commits
42c87512
Commit
42c87512
authored
Jan 28, 2014
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Little fix in database coherence
parent
72ab1e97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
domotika.py
domotika/domotika.py
+11
-8
No files found.
domotika/domotika.py
View file @
42c87512
...
...
@@ -1667,13 +1667,8 @@ class domotikaService(service.Service):
and
converWday
(
loctime
.
tm_wday
)
in
timedict
[
"dows"
]
and
loctime
.
tm_hour
in
timedict
[
"hours"
]
and
loctime
.
tm_min
in
timedict
[
"minutes"
]):
if
(
time
.
time
()
-
float
(
ract
.
lastrun
))
<
float
(
ract
.
min_time
):
continue
ract
.
lastrun
=
time
.
time
()
ract
.
save
()
# Do nothing mean "ok, maybe it's to be executed
pass
else
:
continue
...
...
@@ -1702,8 +1697,14 @@ class domotikaService(service.Service):
continue
else
:
continue
if
(
time
.
time
()
-
float
(
ract
.
lastrun
))
<
float
(
ract
.
min_time
):
continue
# if we are here, the actions is to be executed!
ract
.
lastrun
=
time
.
time
()
ract
.
save
()
if
genutils
.
isTrue
(
ract
.
ikapacket
):
self
.
sendCommand
(
ract
.
ikap_dst
,
act
=
ract
.
ikap_act
,
ctx
=
ract
.
ikap_ctx
,
msgtype
=
ract
.
ikap_msgtype
,
arg
=
ract
.
ikap_arg
,
src
=
ract
.
ikap_src
,
ipdst
=
str
(
ract
.
ipdest
))
...
...
@@ -1712,6 +1713,8 @@ class domotikaService(service.Service):
if
genutils
.
isTrue
(
ract
.
launch_sequence
)
and
ract
.
launch_sequence_name
!=
None
:
reactor
.
callLater
(
ract
.
retard
,
self
.
launchSequence
,
ract
.
launch_sequence_name
,
'statuses'
)
def
launchSequence
(
self
,
name
,
sequencecaller
=
'unknown'
):
return
dmdb
.
getSequence
(
name
)
.
addCallback
(
self
.
manageSequence
,
sequencecaller
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment