From 90711f34bcd6188665fb1de191db28fa61203c9a Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Fri, 12 Apr 2013 18:46:02 +0000 Subject: [PATCH] Update the lua scripts to use the new mkdir function. --- .../install/scripts/app/conference_center/index.lua | 3 ++- includes/install/scripts/app/voicemail/index.lua | 5 +++-- .../resources/functions/forward_to_extension.lua | 2 +- .../voicemail/resources/functions/record_greeting.lua | 2 +- .../voicemail/resources/functions/record_message.lua | 2 +- .../app/voicemail/resources/functions/record_name.lua | 2 +- includes/install/scripts/call_flow_monitor.lua | 11 +++++------ .../install/scripts/resources/functions/mkdir.lua | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/includes/install/scripts/app/conference_center/index.lua b/includes/install/scripts/app/conference_center/index.lua index 2f8b645480..2781a8b30c 100644 --- a/includes/install/scripts/app/conference_center/index.lua +++ b/includes/install/scripts/app/conference_center/index.lua @@ -46,6 +46,7 @@ dofile(scripts_dir.."/resources/functions/file_exists.lua"); dofile(scripts_dir.."/resources/functions/explode.lua"); dofile(scripts_dir.."/resources/functions/format_seconds.lua"); + dofile(scripts_dir.."/resources/functions/mkdir.lua"); --get the session variables uuid = session:getVariable("uuid"); @@ -565,7 +566,7 @@ if (conference_session_uuid ~= nil) then if (record == "true") then recordings_dir = recordings_dir.."/archive/"..os.date("%Y", start_epoch).."/"..os.date("%b", start_epoch).."/"..os.date("%d", start_epoch); - os.execute("mkdir -p " .. recordings_dir); + mkdir(recordings_dir); recording = recordings_dir.."/"..conference_session_uuid; session:execute("set","recording="..recording); end diff --git a/includes/install/scripts/app/voicemail/index.lua b/includes/install/scripts/app/voicemail/index.lua index ed7becea48..4656a53655 100644 --- a/includes/install/scripts/app/voicemail/index.lua +++ b/includes/install/scripts/app/voicemail/index.lua @@ -152,6 +152,7 @@ dofile(scripts_dir.."/resources/functions/file_exists.lua"); dofile(scripts_dir.."/resources/functions/explode.lua"); dofile(scripts_dir.."/resources/functions/format_seconds.lua"); + dofile(scripts_dir.."/resources/functions/mkdir.lua"); --voicemail functions dofile(scripts_dir.."/app/voicemail/resources/functions/on_dtmf.lua"); @@ -285,7 +286,7 @@ --record the video --records audio only --result = session:execute("set", "enable_file_write_buffering=false"); - --os.execute("mkdir -p " .. voicemail_dir.."/"..voicemail_id); + --mkdir(voicemail_dir.."/"..voicemail_id); --session:recordFile("/tmp/recording.fsv", 200, 200, 200); --records audio and video --result = session:execute("record_fsv", "file.fsv"); @@ -300,7 +301,7 @@ --callback (works with DTMF) --http://wiki.freeswitch.org/wiki/Mod_fsv - --os.execute("mkdir -p " .. voicemail_dir.."/"..voicemail_id); + --mkdir(voicemail_dir.."/"..voicemail_id); --session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs) --session:sayPhrase(macro_name [,macro_data] [,language]); --session:sayPhrase("voicemail_menu", "1:2:3:#", default_language); diff --git a/includes/install/scripts/app/voicemail/resources/functions/forward_to_extension.lua b/includes/install/scripts/app/voicemail/resources/functions/forward_to_extension.lua index 44530cccfd..7536115a00 100644 --- a/includes/install/scripts/app/voicemail/resources/functions/forward_to_extension.lua +++ b/includes/install/scripts/app/voicemail/resources/functions/forward_to_extension.lua @@ -124,7 +124,7 @@ event:fire(); --if local after email is true then copy the recording file - os.execute("mkdir -p " .. voicemail_dir.."/"..forward_voicemail_id); + mkdir(voicemail_dir.."/"..forward_voicemail_id); os.execute("cp "..voicemail_dir.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext.." "..voicemail_dir.."/"..forward_voicemail_id.."/msg_"..uuid.."."..vm_message_ext); --send the email with the voicemail recording attached diff --git a/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua b/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua index 633eee5c01..940fc98f6d 100644 --- a/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua +++ b/includes/install/scripts/app/voicemail/resources/functions/record_greeting.lua @@ -57,7 +57,7 @@ max_len_seconds = 30; silence_threshold = 30; silence_seconds = 5; - os.execute("mkdir -p " .. voicemail_dir.."/"..voicemail_id); + mkdir(voicemail_dir.."/"..voicemail_id); -- syntax is session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs) result = session:recordFile(voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", max_len_seconds, silence_threshold, silence_seconds); --session:execute("record", voicemail_dir.."/"..uuid.." 180 200"); diff --git a/includes/install/scripts/app/voicemail/resources/functions/record_message.lua b/includes/install/scripts/app/voicemail/resources/functions/record_message.lua index bb7adf74d6..cf0877554d 100644 --- a/includes/install/scripts/app/voicemail/resources/functions/record_message.lua +++ b/includes/install/scripts/app/voicemail/resources/functions/record_message.lua @@ -75,7 +75,7 @@ max_len_seconds = 300; silence_threshold = 30; silence_seconds = 5; - os.execute("mkdir -p " .. voicemail_dir.."/"..voicemail_id); + mkdir(voicemail_dir.."/"..voicemail_id); result = session:recordFile(voicemail_dir.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext, max_len_seconds, silence_threshold, silence_seconds); --session:execute("record", voicemail_dir.."/"..uuid.." 180 200"); diff --git a/includes/install/scripts/app/voicemail/resources/functions/record_name.lua b/includes/install/scripts/app/voicemail/resources/functions/record_name.lua index adf4861746..20243c9480 100644 --- a/includes/install/scripts/app/voicemail/resources/functions/record_name.lua +++ b/includes/install/scripts/app/voicemail/resources/functions/record_name.lua @@ -39,7 +39,7 @@ max_len_seconds = 30; silence_threshold = 30; silence_seconds = 5; - os.execute("mkdir -p " .. voicemail_dir.."/"..voicemail_id); + mkdir(voicemail_dir.."/"..voicemail_id); result = session:recordFile(voicemail_dir.."/"..voicemail_id.."/recorded_name.wav", max_len_seconds, silence_threshold, silence_seconds); --session:execute("record", voicemail_dir.."/"..uuid.." 180 200"); diff --git a/includes/install/scripts/call_flow_monitor.lua b/includes/install/scripts/call_flow_monitor.lua index 214fdac98c..3386da68d5 100644 --- a/includes/install/scripts/call_flow_monitor.lua +++ b/includes/install/scripts/call_flow_monitor.lua @@ -35,11 +35,15 @@ scripts_dir = string.sub(debug.getinfo(1).source,2,string.len(debug.getinfo(1).source)-(string.len(argv[0])+1)); dofile(scripts_dir.."/resources/config.lua"); +--general functions + dofile(scripts_dir.."/resources/functions/file_exists.lua"); + dofile(scripts_dir.."/resources/functions/mkdir.lua"); + --connect to the database dbh = freeswitch.Dbh(database["system"]); --make sure the scripts/run dir exists - os.execute("mkdir -p " .. scripts_dir .. "/run"); + mkdir(scripts_dir .. "/run"); --define the run file run_file = scripts_dir .. "/run/call_flow_monitor.tmp"; @@ -53,11 +57,6 @@ h:close() return o end - --check if a file exists - function file_exists(name) - local f=io.open(name,"r") - if f~=nil then io.close(f) return true else return false end - end --used to stop the lua service local file = assert(io.open(run_file, "w")); diff --git a/includes/install/scripts/resources/functions/mkdir.lua b/includes/install/scripts/resources/functions/mkdir.lua index 994f8d43ea..23a2fd2d12 100644 --- a/includes/install/scripts/resources/functions/mkdir.lua +++ b/includes/install/scripts/resources/functions/mkdir.lua @@ -1,7 +1,7 @@ --add the mkdir function function mkdir(dir) - dir = dir:gsub("\\", "/"); + dir = dir:gsub([[\]], "/"); if (package.config:sub(1,1) == "/") then --unix cmd = [[mkdir -p "]] .. dir .. [["]];