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

updating audio recording transfer scripts to not mix and compress files if the FTP server does not Ping

Browse Source 
git-svn-id: svn://192.168.202.10@683 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2007-10-05 03:38:46 +00:00
parent e60ab72cab
commit 125e3901d1
5 changed files with 116 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/bin/AST_CRON_mix_recordings.pl
+10 -9
View File
@@ -31,6 +31,7 @@
# 51122-1458 - Added soxmix binary path check
# 60318-0921 - Added ability to mix gsm audio files
# 60807-1308 - Modified to use /etc/astguiclient.conf for settings
# 71004-1124 - Changed to not move ORIG recordings if FTP server does not Ping
#
@@ -133,21 +134,21 @@ foreach(@FILES)
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
### BEGIN Remote file transfer
$p = Net::Ping->new();
$ping_good = $p->ping("$FTP_host");
if ($ping_good)
{
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
$ftp = Net::FTP->new("$FTP_host", Port => 21);
$ftp->login("$FTP_user","$FTP_pass");
$ftp->cwd("$FTP_dir");
agc_2-X/trunk/bin/AST_CRON_mix_recordings_GSM.pl
+29 -28
View File
@@ -31,6 +31,7 @@
# 51021-1058 - Added quotes around CLI executed commands
# 51122-1455 - Added soxmix and sox binary path check
# 60807-1308 - Modified to use /etc/astguiclient.conf for settings
# 71004-1124 - Changed to not move ORIG recordings if FTP server does not Ping
#
@@ -144,42 +145,42 @@ foreach(@FILES)
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
else
{
`cp -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
`$soxbin "$dir1/DONE/$ALLfile" "$dir1/DONE/$GSMfile"`;
if (!$T)
{
`rm -f "$dir1/DONE/$ALLfile"`;
}
if($DB){print STDERR "\n|/usr/bin/sox $live_folder/$filename[$k]$WAV $arch_folder/$filename[$k]$GSM|\n";}
chmod 0755, "$dir1/DONE/$GSMfile";
### BEGIN Remote file transfer
# $p = Net::Ping->new();
# $ping_good = $p->ping("$FTP_host");
$p = Net::Ping->new();
$ping_good = $p->ping("$FTP_host");
if ($ping_good)
{
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
else
{
`cp -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
`$soxbin "$dir1/DONE/$ALLfile" "$dir1/DONE/$GSMfile"`;
if (!$T)
{
`rm -f "$dir1/DONE/$ALLfile"`;
}
if($DB){print STDERR "\n|/usr/bin/sox $live_folder/$filename[$k]$WAV $arch_folder/$filename[$k]$GSM|\n";}
chmod 0755, "$dir1/DONE/$GSMfile";
# if ($ping_good)
# {
$ftp = Net::FTP->new("$FTP_host", Port => $FTP_port, Debug => 0, Passive => 1);
$ftp->login("$FTP_user","$FTP_pass");
$ftp->cwd("$FTP_dir");
$ftp->binary();
$ftp->put("$dir1/DONE/$GSMfile", "$GSMfile");
$ftp->quit;
# }
}
### END Remote file transfer
}
agc_2-X/trunk/bin/AST_CRON_mix_recordings_MP3.pl
+30 -28
View File
@@ -32,6 +32,7 @@
# 51122-1455 - Added soxmix and sox binary path check
# 60616-1027 - Modified to convert to MP3 format
# 60807-1308 - Modified to use /etc/astguiclient.conf for settings
# 71004-1124 - Changed to not move ORIG recordings if FTP server does not Ping
#
@@ -145,42 +146,43 @@ foreach(@FILES)
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
else
{
`cp -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
`$lamebin -b 16 -m m --silent "$dir1/DONE/$ALLfile" "$dir1/DONE/$MP3file"`;
if (!$T)
{
`rm -f "$dir1/DONE/$ALLfile"`;
}
if($DB){print STDERR "\n|/usr/bin/sox $live_folder/$filename[$k]$WAV $arch_folder/$filename[$k]$GSM|\n";}
chmod 0755, "$dir1/DONE/$MP3file";
### BEGIN Remote file transfer
# $p = Net::Ping->new();
# $ping_good = $p->ping("$FTP_host");
$p = Net::Ping->new();
$ping_good = $p->ping("$FTP_host");
if ($ping_good)
{
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
`$lamebin -b 16 -m m --silent "$dir1/$ALLfile" "$dir1/$MP3file"`;
if($DB){print STDERR "\n|/usr/bin/sox $live_folder/$filename[$k]$WAV $arch_folder/$filename[$k]$GSM|\n";}
chmod 0755, "$dir1/DONE/$MP3file";
# if ($ping_good)
# {
$ftp = Net::FTP->new("$FTP_host", Port => $FTP_port, Debug => 0, Passive => 1);
$ftp->login("$FTP_user","$FTP_pass");
$ftp->cwd("$FTP_dir");
$ftp->binary();
$ftp->put("$dir1/DONE/$MP3file", "$MP3file");
$ftp->quit;
# }
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
else
{
`cp -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
if (!$T)
{
`rm -f "$dir1/DONE/$ALLfile"`;
}
}
### END Remote file transfer
}
agc_2-X/trunk/bin/AST_CRON_mix_recordings_MP3_DATE.pl
+36 -36
View File
@@ -44,6 +44,7 @@
# 60616-1027 - Modified to convert to MP3 format
# - Creates Directory on target FTP server based on <Todays Date>.
# 60807-1308 - Modified to use /etc/astguiclient.conf for settings
# 71004-1124 - Changed to not move ORIG recordings if FTP server does not Ping
#
#verbose
@@ -163,33 +164,33 @@ foreach(@FILES)
$MP3file = $ALLfile;
$MP3file =~ s/-all\.wav/-all.mp3/gi;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
else
{
`cp -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
`$lamebin -b 16 -m m --silent "$dir1/DONE/$ALLfile" "$dir1/DONE/$MP3file"`;
if($DB){print STDERR "\n|$lamebin -b 16 -m m --silent \"$dir1/DONE/$ALLfile\" \"$dir1/DONE/$MP3file\"\n";}
chmod 0755, "$dir1/DONE/$MP3file";
### BEGIN Remote file transfer
# $p = Net::Ping->new();
# $ping_good = $p->ping("$FTP_host");
$p = Net::Ping->new();
$ping_good = $p->ping("$FTP_host");
if ($ping_good)
{
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
`$soxmixbin "$dir1/$INfile" "$dir1/$OUTfile" "$dir1/$ALLfile"`;
if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";}
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
`mv -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
else
{
`cp -f "$dir1/$ALLfile" "$dir1/DONE/$ALLfile"`;
}
`$lamebin -b 16 -m m --silent "$dir1/DONE/$ALLfile" "$dir1/DONE/$MP3file"`;
if($DB){print STDERR "\n|$lamebin -b 16 -m m --silent \"$dir1/DONE/$ALLfile\" \"$dir1/DONE/$MP3file\"\n";}
chmod 0755, "$dir1/DONE/$MP3file";
# if ($ping_good)
# {
$ftp = Net::FTP->new("$FTP_host", Port => $FTP_port, Debug => ($v? 1 : 0), Passive => 1);
$ftp->login("$FTP_user","$FTP_pass");
#$ftp->cwd("$FTP_dir");
@@ -198,18 +199,17 @@ foreach(@FILES)
$ftp->binary();
$ftp->put("$dir1/DONE/$MP3file", "$MP3file");
$ftp->quit;
# }
### END Remote file transfer
# clean up
if (!$T)
{
`rm -f "$dir1/ORIG/$INfile"`;
`rm -f "$dir1/ORIG/$OUTfile"`;
`rm -f "$dir1/DONE/$ALLfile"`;
`rm -f "$dir1/DONE/$MP3file"`;
}
# clean up
if (!$T)
{
`rm -f "$dir1/ORIG/$INfile"`;
`rm -f "$dir1/ORIG/$OUTfile"`;
`rm -f "$dir1/DONE/$ALLfile"`;
`rm -f "$dir1/DONE/$MP3file"`;
}
}
### END Remote file transfer
}
}
$i++;
agc_2-X/trunk/bin/AST_CRON_mix_recordings_VDonly_DATE.pl
+11 -11
View File
@@ -30,6 +30,7 @@
# 60318-0921 - Added ability to mix gsm audio files
# 60807-1308 - Modified to use /etc/astguiclient.conf for settings
# 70702-1139 - Removed mixing, and added dated folder storage on FTP server
# 71004-1124 - Changed to not move ORIG recordings if FTP server does not Ping
#
# Customize variables for FTP
@@ -155,19 +156,18 @@ foreach(@FILES)
$ftp->binary();
$ftp->put("$dir1/$INfile", "$ALLfile");
$ftp->quit;
$stmtA = "UPDATE recording_log set location='$HTTP_path/$start_date/$ALLfile' where recording_id='$recording_id';";
if($DB){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
}
}
### END Remote file transfer
$stmtA = "UPDATE recording_log set location='$HTTP_path/$start_date/$ALLfile' where recording_id='$recording_id';";
if($DB){print STDERR "\n|$stmtA|\n";}
$affected_rows = $dbhA->do($stmtA); # or die "Couldn't execute query:|$stmtA|\n";
if (!$T)
{
`mv -f "$dir1/$INfile" "$dir1/ORIG/$INfile"`;
`mv -f "$dir1/$OUTfile" "$dir1/ORIG/$OUTfile"`;
}
}
}
$i++;