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
cd1ccf75
Commit
cd1ccf75
authored
Jul 26, 2014
by
nextime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed asterisk actions in aliases
parent
9fec3c8e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
fastagi.py
domotika/asterisk/fastagi.py
+5
-1
domotika.py
domotika/domotika.py
+3
-0
No files found.
domotika/asterisk/fastagi.py
View file @
cd1ccf75
...
@@ -31,7 +31,7 @@ import os, logging, time, sys
...
@@ -31,7 +31,7 @@ import os, logging, time, sys
from
domotika.clouds.google
import
tts
,
speech
from
domotika.clouds.google
import
tts
,
speech
import
tempfile
import
tempfile
from
txscheduling.cron
import
CronSchedule
,
parseCronLine
from
txscheduling.cron
import
CronSchedule
,
parseCronLine
from
dmlib.utils
import
genutils
log
=
logging
.
getLogger
(
'FastAGI'
)
log
=
logging
.
getLogger
(
'FastAGI'
)
...
@@ -329,6 +329,8 @@ class CheckIn(BaseCheck):
...
@@ -329,6 +329,8 @@ class CheckIn(BaseCheck):
def
checkAlias
(
self
,
res
):
def
checkAlias
(
self
,
res
):
if
res
:
if
res
:
alias
=
res
alias
=
res
if
genutils
.
isTrue
(
res
.
launch_voipaction
):
self
.
core
.
manageAction
(
alias
.
voip_action_name
)
return
self
.
fagi
.
goTo
(
alias
.
contextto
,
alias
.
aliasto
)
return
self
.
fagi
.
goTo
(
alias
.
contextto
,
alias
.
aliasto
)
return
self
.
close
()
return
self
.
close
()
...
@@ -347,6 +349,8 @@ class CheckInternals(BaseCheck):
...
@@ -347,6 +349,8 @@ class CheckInternals(BaseCheck):
def
checkAlias
(
self
,
res
):
def
checkAlias
(
self
,
res
):
if
res
:
if
res
:
alias
=
res
alias
=
res
if
genutils
.
isTrue
(
res
.
launch_voipaction
):
self
.
core
.
manageAction
(
alias
.
voip_action_name
)
return
self
.
fagi
.
goTo
(
alias
.
contextto
,
alias
.
aliasto
)
return
self
.
fagi
.
goTo
(
alias
.
contextto
,
alias
.
aliasto
)
self
.
getAction
()
self
.
getAction
()
...
...
domotika/domotika.py
View file @
cd1ccf75
...
@@ -2734,6 +2734,9 @@ class domotikaService(service.Service):
...
@@ -2734,6 +2734,9 @@ class domotikaService(service.Service):
def
fagi_on_getTriggerWord
(
self
):
def
fagi_on_getTriggerWord
(
self
):
return
str
(
self
.
config
.
get
(
"voiceui"
,
"triggerword"
))
.
lower
()
return
str
(
self
.
config
.
get
(
"voiceui"
,
"triggerword"
))
.
lower
()
def
fagi_on_manageAction
(
self
,
action
):
return
dmdb
.
checkAsteriskActionByName
(
action
)
.
addCallback
(
self
.
manageAsteriskAction
)
def
fagi_on_getStopWord
(
self
):
def
fagi_on_getStopWord
(
self
):
return
str
(
self
.
config
.
get
(
"voiceui"
,
"stopword"
))
.
lower
()
return
str
(
self
.
config
.
get
(
"voiceui"
,
"stopword"
))
.
lower
()
...
...
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