Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 16:50:13 +01:00
Code Issues Projects Releases Wiki Activity

2017-12-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added an 'RDTempDirectory' class.
	* Fixed a race in the 'Export' Web API call.
This commit is contained in:
Fred Gleason
2017-12-14 13:20:02 -05:00
parent 0e5548f2e3
commit 5b75716f4a
6 changed files with 161 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
web/rdxport/export.cpp
View File

@@ -2,7 +2,7 @@
//
// Rivendell web service portal -- Export service
//
// (C) Copyright 2010-2015 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2017 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -24,14 +24,15 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <rdformpost.h>
#include <rdweb.h>
#include <rdcart.h>
#include <rdaudioconvert.h>
#include <rdsettings.h>
#include <rdcart.h>
#include <rdconf.h>
#include <rdformpost.h>
#include <rdsettings.h>
#include <rdtempdirectory.h>
#include <rdweb.h>
#include <rdxport.h>
#include "rdxport.h"
void Xport::Export()
{
@@ -138,8 +139,12 @@ void Xport::Export()
int fd;
ssize_t n;
uint8_t data[2048];
QString tmpdir=RDTempDir();
QString tmpfile=tmpdir+"/exported_audio";
QString err_msg;
RDTempDirectory *tempdir=new RDTempDirectory("rdxport-export");
if(!tempdir->create(&err_msg)) {
XmlExit("unable to create temporary directory ["+err_msg+"]",500);
}
QString tmpfile=tempdir->path()+"/exported_audio";
RDAudioConvert *conv=new RDAudioConvert(xport_config->stationName());
conv->setSourceFile(RDCut::pathName(cartnum,cutnum));
conv->setDestinationFile(tmpfile);
@@ -179,7 +184,8 @@ void Xport::Export()
}
close(fd);
unlink(tmpfile);
rmdir(tmpdir);
// rmdir(tmpdir);
delete tempdir;
Exit(0);
break;
@@ -208,8 +214,7 @@ void Xport::Export()
if(wavedata!=NULL) {
delete wavedata;
}
unlink(tmpfile);
rmdir(tmpdir);
delete tempdir;
if(resp_code==200) {
Exit(200);
}