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

In step 2 compression audio processing script, added --file-sorting option to put files into dated directories (THIS WILL NOT ALLOW STEP 3 FTP ARCHIVING), Issue #990

Browse Source 
git-svn-id: svn://192.168.202.10@2667 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2017-02-12 12:49:40 +00:00
parent 424e0aa67c
commit 7677ec7736
1 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/bin/AST_CRON_audio_2_compress.pl
+43 -15
View File
@@ -24,9 +24,11 @@
# make sure that the following directories exist: # make sure that the following directories exist:
# /var/spool/asterisk/monitorDONE # where the mixed -all files are put # /var/spool/asterisk/monitorDONE # where the mixed -all files are put
# #
# NOTE: If the "--file-sorting" flag is use, the step 3 FTP archiving scripts cannot be used.
#
# This program assumes that recordings are saved by Asterisk as .wav # This program assumes that recordings are saved by Asterisk as .wav
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# #
# 80302-1958 - First Build # 80302-1958 - First Build
@@ -35,11 +37,13 @@
# 101207-1024 - Change to GSW option because of SoX flag changes in 14.3.0 # 101207-1024 - Change to GSW option because of SoX flag changes in 14.3.0
# 110524-1059 - Added run-check concurrency check option # 110524-1059 - Added run-check concurrency check option
# 160523-0652 - Added --HTTPS option to use https instead of http in local location # 160523-0652 - Added --HTTPS option to use https instead of http in local location
# 170212-0732 - Added --file-sorting option to put files into dated directories (THIS WILL NOT ALLOW FTP ARCHIVING)
# #
$GSM=0; $MP3=0; $OGG=0; $GSW=0; $GSM=0; $MP3=0; $OGG=0; $GSW=0;
$HTTPS=0; $HTTPS=0;
$maxfiles = 100000; $maxfiles = 100000;
$location='';
### begin parsing run-time options ### ### begin parsing run-time options ###
if (length($ARGV[0])>1) if (length($ARGV[0])>1)
@@ -65,6 +69,7 @@ if (length($ARGV[0])>1)
print " [--HTTPS] = use https instead of http in local location\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 " [--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 " [--max-files=x] = maximum number of files to process, default is 100000\n";
print " [--file-sorting] = sort files into subfolders in YYYY-MM-DD format (THIS WILL NOT ALLOW FTP ARCHIVING)\n";
print "\n"; print "\n";
exit; exit;
} }
@@ -96,6 +101,11 @@ if (length($ARGV[0])>1)
$maxfiles = $data_in[1]; $maxfiles = $data_in[1];
$maxfiles =~ s/ .*$//gi; $maxfiles =~ s/ .*$//gi;
} }
if ($args =~ /--file-sorting/i)
{
$FILESORT=1;
if ($DB) {print "Dated file sorting option enabled\n";}
}
if ($args =~ /--HTTPS/i) if ($args =~ /--HTTPS/i)
{ {
$HTTPS=1; $HTTPS=1;
@@ -294,7 +304,7 @@ foreach(@FILES)
$SQLFILE = $FILES[$i]; $SQLFILE = $FILES[$i];
$SQLFILE =~ s/-all\.wav|-all\.gsm//gi; $SQLFILE =~ s/-all\.wav|-all\.gsm//gi;
$stmtA = "select recording_id from recording_log where filename='$SQLFILE' order by recording_id desc LIMIT 1;"; $stmtA = "select recording_id, LEFT(start_time,10) AS file_date from recording_log where filename='$SQLFILE' order by recording_id desc LIMIT 1;";
if($DBX){print STDERR "\n|$stmtA|\n";} if($DBX){print STDERR "\n|$stmtA|\n";}
$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
$sthA->execute or die "executing: $stmtA ", $dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -303,22 +313,38 @@ foreach(@FILES)
{ {
@aryA = $sthA->fetchrow_array; @aryA = $sthA->fetchrow_array;
$recording_id = "$aryA[0]"; $recording_id = "$aryA[0]";
$file_date = "$aryA[1]";
} }
$sthA->finish(); $sthA->finish();
$HTTP='http'; $HTTP='http';
if ($HTTPS > 0) {$HTTP='https';} if ($HTTPS > 0) {$HTTP='https';}
### In case --file-sorting is ON, we check if we need to create the location
if ($MP3 > 0)
{$location = "MP3/";}
if ($GSM > 0)
{$location = "GSM/";}
if ($OGG > 0)
{$location = "OGG/";}
if ($GSW > 0)
{$location = "GSW/";}
### We try to create the destination folder (in case it doesn't exist). If we fail, we die
if ($FILESORT) {$location = "$location$file_date/";}
if (! -d "$dir2/$location") {mkdir "$dir2/$location";}
if (! -d "$dir2/$location") {die("Cannot create $dir2/$location");}
if ($GSM > 0) if ($GSM > 0)
{ {
$GSMfile = $FILES[$i]; $GSMfile = $FILES[$i];
$GSMfile =~ s/-all\.wav/-all.gsm/gi; $GSMfile =~ s/-all\.wav/-all.gsm/gi;
if ($DB) {print "|$recording_id|$ALLfile|$GSMfile| |$SQLfile|\n";} if ($DB) {print "|$recording_id|$ALLfile|$dir2/$location$GSMfile| |$SQLfile|\n";}
`$soxbin "$dir2/$ALLfile" "$dir2/GSM/$GSMfile"`; `$soxbin "$dir2/$ALLfile" "$dir2/$location$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/$location$GSMfile' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";} if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
} }
@@ -328,11 +354,11 @@ foreach(@FILES)
$OGGfile = $FILES[$i]; $OGGfile = $FILES[$i];
$OGGfile =~ s/-all\.wav/-all.ogg/gi; $OGGfile =~ s/-all\.wav/-all.ogg/gi;
if ($DB) {print "|$recording_id|$ALLfile|$OGGfile| |$SQLfile|\n";} if ($DB) {print "|$recording_id|$ALLfile|$dir2/$location$OGGfile| |$SQLfile|\n";}
`$soxbin "$dir2/$ALLfile" "$dir2/OGG/$OGGfile"`; `$soxbin "$dir2/$ALLfile" "$dir2/$location$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/$location$OGGfile' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";} if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
} }
@@ -342,11 +368,11 @@ foreach(@FILES)
$MP3file = $FILES[$i]; $MP3file = $FILES[$i];
$MP3file =~ s/-all\.wav/-all.mp3/gi; $MP3file =~ s/-all\.wav/-all.mp3/gi;
if ($DB) {print "|$recording_id|$ALLfile|$MP3file| |$SQLfile|\n";} if ($DB) {print "|$recording_id|$ALLfile|$dir2/$location$MP3file| |$SQLfile|\n";}
`$lamebin -b 16 -m m --silent "$dir2/$ALLfile" "$dir2/MP3/$MP3file"`; `$lamebin -b 16 -m m --silent "$dir2/$ALLfile" "$dir2/$location$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/$location$MP3file' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";} if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
} }
@@ -355,14 +381,14 @@ foreach(@FILES)
{ {
$GSWfile = $FILES[$i]; $GSWfile = $FILES[$i];
if ($DB) {print "|$recording_id|$ALLfile|$GSWfile| |$SQLfile|$soxbin \"$dir2/$ALLfile\" -e gsm-full-rate \"$dir2/GSW/$GSWfile\"|\n";} if ($DB) {print "|$recording_id|$ALLfile|$GSWfile| |$SQLfile|$soxbin \"$dir2/$ALLfile\" -e gsm-full-rate \"$dir2/$location$GSWfile\"|\n";}
# for SoX versions before 14.3.X # for SoX versions before 14.3.X
# `$soxbin "$dir2/$ALLfile" -g -b "$dir2/GSW/$GSWfile"`; # `$soxbin "$dir2/$ALLfile" -g -b "$dir2/GSW/$GSWfile"`;
# for SoX versions 14.3.0 and after # for SoX versions 14.3.0 and after
`$soxbin "$dir2/$ALLfile" -e gsm-full-rate "$dir2/GSW/$GSWfile"`; `$soxbin "$dir2/$ALLfile" -e gsm-full-rate "$dir2/$location$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/$location$GSWfile' where recording_id='$recording_id';";
if($DBX){print STDERR "\n|$stmtA|\n";} if($DBX){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n"; $affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
} }
@@ -370,7 +396,9 @@ foreach(@FILES)
if (!$T) if (!$T)
{ {
`mv -f "$dir2/$ALLfile" "$dir2/ORIG/$ALLfile"`; if (! -d "$dir2/ORIG/$file_date") {mkdir "$dir2/ORIG/$file_date";}
if (! -d "$dir2/ORIG/$file_date") {die("Cannot create $dir2/ORIG/$file_date");}
`mv -f "$dir2/$ALLfile" "$dir2/ORIG/$file_date/$ALLfile"`;
} }
### sleep for twenty hundredths of a second to not flood the server with disk activity ### sleep for twenty hundredths of a second to not flood the server with disk activity