dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use luasql for recordings only if base64 is chosen.

Browse Source
This commit is contained in:
Mark Crane
2015-04-01 05:44:07 +00:00
parent 34e722391a
commit 8048873cd0
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/install/scripts/recordings.lua
+20 -13
View File
@@ -43,7 +43,6 @@
--add functions --add functions
dofile(scripts_dir.."/resources/functions/mkdir.lua"); dofile(scripts_dir.."/resources/functions/mkdir.lua");
dofile(scripts_dir.."/resources/functions/base64.lua");
dofile(scripts_dir.."/resources/functions/explode.lua"); dofile(scripts_dir.."/resources/functions/explode.lua");
--initialize the recordings --initialize the recordings
@@ -52,17 +51,19 @@
--settings --settings
dofile(scripts_dir.."/resources/functions/settings.lua"); dofile(scripts_dir.."/resources/functions/settings.lua");
settings = settings(domain_uuid); settings = settings(domain_uuid);
storage_type = "";
if (settings['recordings']['storage_type'] ~= nil) then if (settings['recordings']['storage_type'] ~= nil) then
if (settings['recordings']['storage_type']['text'] ~= nil) then if (settings['recordings']['storage_type']['text'] ~= nil) then
storage_type = settings['recordings']['storage_type']['text']; storage_type = settings['recordings']['storage_type']['text'];
end end
end end
storage_path = "";
if (settings['recordings']['storage_path'] ~= nil) then if (settings['recordings']['storage_path'] ~= nil) then
if (settings['recordings']['storage_path']['text'] ~= nil) then if (settings['recordings']['storage_path']['text'] ~= nil) then
storage_path = settings['recordings']['storage_path']['text']; storage_path = settings['recordings']['storage_path']['text'];
end end
end end
temp_dir = "";
if (settings['server']['temp'] ~= nil) then if (settings['server']['temp'] ~= nil) then
if (settings['server']['temp']['dir'] ~= nil) then if (settings['server']['temp']['dir'] ~= nil) then
temp_dir = settings['server']['temp']['dir']; temp_dir = settings['server']['temp']['dir'];
@@ -112,8 +113,11 @@
--begin recording --begin recording
if (storage_type == "base64") then if (storage_type == "base64") then
--include the base64 function
dofile(scripts_dir.."/resources/functions/base64.lua");
--make the directory --make the directory
--mkdir(recordings_dir .."/"..domain_uuid); mkdir(recordings_dir);
--record the file to the file system --record the file to the file system
-- syntax is session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs); -- syntax is session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs);
@@ -137,7 +141,7 @@
--get a new uuid --get a new uuid
recording_uuid = api:execute("create_uuid"); recording_uuid = api:execute("create_uuid");
--save the message to the voicemail message --save the message to the voicemail messages
local array = {} local array = {}
table.insert(array, "INSERT INTO v_recordings "); table.insert(array, "INSERT INTO v_recordings ");
table.insert(array, "("); table.insert(array, "(");
@@ -163,15 +167,17 @@
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[recording] SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[recording] SQL: " .. sql .. "\n");
end end
if (storage_type == "base64") then
array = explode("://", database["system"]); array = explode("://", database["system"]);
local luasql = require "luasql.postgres" local luasql = require "luasql.postgres"
local env = assert (luasql.postgres()); local env = assert (luasql.postgres());
local dbh = env:connect(array[2]); local dbh = env:connect(array[2]);
res, serr = dbh:execute(sql); res, serr = dbh:execute(sql);
dbh:close(); dbh:close();
env:close(); env:close();
else
dbh:query(sql);
end
elseif (storage_type == "http_cache") then elseif (storage_type == "http_cache") then
freeswitch.consoleLog("notice", "[voicemail] ".. storage_type .. " ".. storage_path .."\n"); freeswitch.consoleLog("notice", "[voicemail] ".. storage_type .. " ".. storage_path .."\n");
session:execute("record", "http_cache://".. storage_path .."/"..recording_name); session:execute("record", "http_cache://".. storage_path .."/"..recording_name);
@@ -280,4 +286,5 @@ if ( session:ready() ) then
--hangup the call --hangup the call
session:hangup(); session:hangup();
end end