ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For all AST_CRON_audio step 1 and 2 scripts, added --HTTPS option to use https instead of http in local location

Browse Source 
git-svn-id: svn://192.168.202.10@2539 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2016-05-23 11:32:40 +00:00
parent 72194cb754
commit ff75c0f865
4 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/bin/AST_CRON_audio_2_compress.pl
+15 -5
View File
@@ -26,7 +26,7 @@
#
# This program assumes that recordings are saved by Asterisk as .wav
#
# Copyright (C) 2015 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
#
#
# 80302-1958 - First Build
@@ -34,9 +34,11 @@
# 90727-1417 - Added GSW format option
# 101207-1024 - Change to GSW option because of SoX flag changes in 14.3.0
# 110524-1059 - Added run-check concurrency check option
# 160523-0652 - Added --HTTPS option to use https instead of http in local location
#
$GSM=0; $MP3=0; $OGG=0; $GSW=0;
$HTTPS=0;
$maxfiles = 100000;
### begin parsing run-time options ###
@@ -60,6 +62,7 @@ if (length($ARGV[0])>1)
print " [--MP3] = compress into MPEG-Layer-3 codec\n";
print " [--OGG] = compress into OGG Vorbis codec\n";
print " [--GSW] = compress into GSM codec with RIFF headers and .wav extension\n";
print " [--HTTPS] = use https instead of http in local location\n";
print " [--run-check] = concurrency check, die if another instance is running\n";
print " [--max-files=x] = maximum number of files to process, default is 100000\n";
print "\n";
@@ -93,6 +96,11 @@ if (length($ARGV[0])>1)
$maxfiles = $data_in[1];
$maxfiles =~ s/ .*$//gi;
}
if ($args =~ /--HTTPS/i)
{
$HTTPS=1;
if ($DB) {print "HTTPS location option enabled\n";}
}
if ($args =~ /--GSM/i)
{
$GSM=1;
@@ -298,6 +306,8 @@ foreach(@FILES)
}
$sthA->finish();
$HTTP='http';
if ($HTTPS > 0) {$HTTP='https';}
if ($GSM > 0)
{
@@ -308,7 +318,7 @@ foreach(@FILES)
`$soxbin "$dir2/$ALLfile" "$dir2/GSM/$GSMfile"`;
$stmtA = "UPDATE recording_log set location='http://$server_ip/RECORDINGS/GSM/$GSMfile' where recording_id='$recording_id';";
$stmtA = "UPDATE recording_log set location='$HTTP://$server_ip/RECORDINGS/GSM/$GSMfile' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
}
@@ -322,7 +332,7 @@ foreach(@FILES)
`$soxbin "$dir2/$ALLfile" "$dir2/OGG/$OGGfile"`;
$stmtA = "UPDATE recording_log set location='http://$server_ip/RECORDINGS/OGG/$OGGfile' where recording_id='$recording_id';";
$stmtA = "UPDATE recording_log set location='$HTTP://$server_ip/RECORDINGS/OGG/$OGGfile' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
}
@@ -336,7 +346,7 @@ foreach(@FILES)
`$lamebin -b 16 -m m --silent "$dir2/$ALLfile" "$dir2/MP3/$MP3file"`;
$stmtA = "UPDATE recording_log set location='http://$server_ip/RECORDINGS/MP3/$MP3file' where recording_id='$recording_id';";
$stmtA = "UPDATE recording_log set location='$HTTP://$server_ip/RECORDINGS/MP3/$MP3file' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
}
@@ -352,7 +362,7 @@ foreach(@FILES)
# for SoX versions 14.3.0 and after
`$soxbin "$dir2/$ALLfile" -e gsm-full-rate "$dir2/GSW/$GSWfile"`;
$stmtA = "UPDATE recording_log set location='http://$server_ip/RECORDINGS/GSW/$GSWfile' where recording_id='$recording_id';";
$stmtA = "UPDATE recording_log set location='$HTTP://$server_ip/RECORDINGS/GSW/$GSWfile' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
}