Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-10 14:46:24 +01:00
Code Issues Releases Wiki Activity

Avoid repeated calls to BlockFile::GetFileName...

Browse Source 
... because wxFileName is not a featherweight.
This commit is contained in:
Paul Licameli
2016-04-11 09:40:30 -04:00
parent f7d9f78732
commit df28289058
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/DirManager.cpp
View File

@@ -951,6 +951,8 @@ bool DirManager::ContainsBlockFile(const wxString &filepath) const
// the BlockFile. // the BlockFile.
BlockFile *DirManager::CopyBlockFile(BlockFile *b) BlockFile *DirManager::CopyBlockFile(BlockFile *b)
{ {
const auto &fn = b->GetFileName();
if (!b->IsLocked()) { if (!b->IsLocked()) {
b->Ref(); b->Ref();
//mchinen:July 13 2009 - not sure about this, but it needs to be added to the hash to be able to save if not locked. //mchinen:July 13 2009 - not sure about this, but it needs to be added to the hash to be able to save if not locked.
@@ -958,14 +960,14 @@ BlockFile *DirManager::CopyBlockFile(BlockFile *b)
//but it's something to watch out for. //but it's something to watch out for.
// //
// LLL: Except for silent block files which have uninitialized filename. // LLL: Except for silent block files which have uninitialized filename.
if (b->GetFileName().IsOk()) if (fn.IsOk())
mBlockFileHash[b->GetFileName().GetName()]=b; mBlockFileHash[fn.GetName()]=b;
return b; return b;
} }
// Copy the blockfile // Copy the blockfile
BlockFile *b2; BlockFile *b2;
if (!b->GetFileName().IsOk()) if (!fn.IsOk())
// Block files with uninitialized filename (i.e. SilentBlockFile) // Block files with uninitialized filename (i.e. SilentBlockFile)
// just need an in-memory copy. // just need an in-memory copy.
b2 = b->Copy(wxFileName()); b2 = b->Copy(wxFileName());
@@ -975,13 +977,13 @@ BlockFile *DirManager::CopyBlockFile(BlockFile *b)
// We assume that the NEW file should have the same extension // We assume that the NEW file should have the same extension
// as the existing file // as the existing file
newFile.SetExt(b->GetFileName().GetExt()); newFile.SetExt(fn.GetExt());
//some block files such as ODPCMAliasBlockFIle don't always have //some block files such as ODPCMAliasBlockFIle don't always have
//a summary file, so we should check before we copy. //a summary file, so we should check before we copy.
if(b->IsSummaryAvailable()) if(b->IsSummaryAvailable())
{ {
if( !wxCopyFile(b->GetFileName().GetFullPath(), if( !wxCopyFile(fn.GetFullPath(),
newFile.GetFullPath()) ) newFile.GetFullPath()) )
return NULL; return NULL;
} }
@@ -1104,26 +1106,30 @@ bool DirManager::HandleXMLTag(const wxChar *tag, const wxChar **attrs)
bool DirManager::MoveOrCopyToNewProjectDirectory(BlockFile *f, bool copy) bool DirManager::MoveOrCopyToNewProjectDirectory(BlockFile *f, bool copy)
{ {
const auto oldFileName = f->GetFileName();
// Check that this BlockFile corresponds to a file on disk // Check that this BlockFile corresponds to a file on disk
//ANSWER-ME: Is this checking only for SilentBlockFiles, in which case //ANSWER-ME: Is this checking only for SilentBlockFiles, in which case
// (!f->GetFileName().IsOk()) is a more correct check? // (!oldFileName.IsOk()) is a more correct check?
if (f->GetFileName().GetName().IsEmpty()) { if (oldFileName.GetName().IsEmpty()) {
return true; return true;
} }
wxFileName newFileName; wxFileName newFileName;
wxFileName oldFileName=f->GetFileName(); if (!this->AssignFile(newFileName, oldFileName.GetFullName(), false))
if (!this->AssignFile(newFileName, f->GetFileName().GetFullName(), false))
return false; return false;
if (newFileName != f->GetFileName()) { if (newFileName != oldFileName) {
//check to see that summary exists before we copy. //check to see that summary exists before we copy.
bool summaryExisted = f->IsSummaryAvailable(); bool summaryExisted = f->IsSummaryAvailable();
if (summaryExisted) { if (summaryExisted) {
if(!copy && !wxRenameFile(f->GetFileName().GetFullPath(), newFileName.GetFullPath())) auto oldPath = oldFileName.GetFullPath();
auto newPath = newFileName.GetFullPath();
auto success = copy
? wxCopyFile(oldPath, newPath)
: wxRenameFile(oldPath, newPath);
if (!success)
return false; return false;
if(copy && !wxCopyFile(f->GetFileName().GetFullPath(), newFileName.GetFullPath()))
return false;
} }
f->SetFileName(newFileName); f->SetFileName(newFileName);
@@ -1142,6 +1148,8 @@ bool DirManager::MoveOrCopyToNewProjectDirectory(BlockFile *f, bool copy)
bool ok = wxCopyFile(oldFileName.GetFullPath(), bool ok = wxCopyFile(oldFileName.GetFullPath(),
newFileName.GetFullPath()); newFileName.GetFullPath());
if(ok && !copy) if(ok && !copy)
// PRL: Is this a bug? Shouldn't it be the old path that
// is removed?
wxRemoveFile(f->GetFileName().GetFullPath()); wxRemoveFile(f->GetFileName().GetFullPath());
else if (!ok) else if (!ok)
return false; return false;