Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-18 17:10:55 +02:00
Code Issues Releases Wiki Activity

When saving compressed fails, clean up partial results

Browse Source
This commit is contained in:
Paul Licameli 2017-10-23 16:48:26 -04:00
parent 7f7c7795e7
commit 874d8da025
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Project.cpp
View File

@ -3807,25 +3807,42 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
return false; return false;
} }
} }
bool success = true;
wxString project, projName, projPath;
auto cleanup = finally( [&] { auto cleanup = finally( [&] {
if (safetyFileName != wxT("")) { if (safetyFileName != wxT("")) {
if (wxFileExists(mFileName)) if (wxFileExists(mFileName))
wxRemove(mFileName); wxRemove(mFileName);
wxRename(safetyFileName, mFileName); wxRename(safetyFileName, mFileName);
} }
// mStrOtherNamesArray is a temporary array of file names, used only when
// saving compressed
if (!success) {
// Make the export of tracks succeed all-or-none.
auto dir = project + wxT("_data");
for ( auto &name : mStrOtherNamesArray )
wxRemoveFile( dir + wxFileName::GetPathSeparator() + name);
// This has effect only if the folder is empty
wxFileName::Rmdir( dir );
}
// Success or no, we can forget the names
mStrOtherNamesArray.clear();
} ); } );
if (fromSaveAs || mDirManager->GetProjectName() == wxT("")) { if (fromSaveAs || mDirManager->GetProjectName() == wxT("")) {
// Write the tracks. // Write the tracks.
// This block of code is duplicated in WriteXML, for now... // This block of code is duplicated in WriteXML, for now...
wxString project = mFileName; project = mFileName;
if (project.Len() > 4 && project.Mid(project.Len() - 4) == wxT(".aup")) if (project.Len() > 4 && project.Mid(project.Len() - 4) == wxT(".aup"))
project = project.Mid(0, project.Len() - 4); project = project.Mid(0, project.Len() - 4);
wxString projName = wxFileNameFromPath(project) + wxT("_data"); projName = wxFileNameFromPath(project) + wxT("_data");
wxString projPath = wxPathOnly(project); projPath = wxPathOnly(project);
bool success = false; success = false;
if( !wxDir::Exists( projPath ) ){ if( !wxDir::Exists( projPath ) ){
wxMessageBox(wxString::Format( wxMessageBox(wxString::Format(
@ -3840,6 +3857,7 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
{ {
//v Move this condition into SaveCompressedWaveTracks() if want to support other formats. //v Move this condition into SaveCompressedWaveTracks() if want to support other formats.
#ifdef USE_LIBVORBIS #ifdef USE_LIBVORBIS
// This populates the array mStrOtherNamesArray
success = this->SaveCompressedWaveTracks(project); success = this->SaveCompressedWaveTracks(project);
#endif #endif
} }
@ -3880,13 +3898,12 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
} }
} }
auto success = GuardedCall< bool >( [&] { success = GuardedCall< bool >( [&] {
// Write the AUP file. // Write the AUP file.
XMLFileWriter saveFile{ mFileName, _("Error Saving Project") }; XMLFileWriter saveFile{ mFileName, _("Error Saving Project") };
WriteXMLHeader(saveFile); WriteXMLHeader(saveFile);
WriteXML(saveFile, bWantSaveCompressed); WriteXML(saveFile, bWantSaveCompressed);
mStrOtherNamesArray.Clear();
saveFile.Commit(); saveFile.Commit();
@ -4023,6 +4040,11 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
// Export all WaveTracks to OGG. // Export all WaveTracks to OGG.
bool bSuccess = true; bool bSuccess = true;
// This accumulates the names of the .ogg files, to be written as
// dependencies in the .aup file
mStrOtherNamesArray.clear();
Exporter theExporter; Exporter theExporter;
Track* pRightTrack; Track* pRightTrack;
wxFileName uniqueTrackFileName; wxFileName uniqueTrackFileName;
@ -4048,6 +4070,8 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
pTrack->GetStartTime(), pTrack->GetEndTime()); pTrack->GetStartTime(), pTrack->GetEndTime());
if (!bSuccess) if (!bSuccess)
// If only some exports succeed, the cleanup is not done here
// but trusted to the caller
break; break;
} }
} }