Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 17:30:17 +01:00
Code Issues Releases Wiki Activity

Bug2570 residual: Compact should not change last saved state...

Browse Source 
... So that if you save, edit, compact, close without saving, then reopen,
you recover the saved state as expected, not the compacted state.

Implications:

Do not push an undo state for compaction.  Discard redo states instead.

Do not purge undo states after the last saved.  The database still needs them.
So we might reclaim less space than before.
This commit is contained in:
Paul Licameli
2020-11-18 15:01:02 -05:00
parent 16b249ab9f
commit 7edbad3cd1
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/ProjectFileManager.cpp
View File

@@ -1231,15 +1231,23 @@ void ProjectFileManager::Compact()
// Purpose of this is to remove the -wal file.
projectFileIO.ReopenProject();
auto currentTracks = TrackList::Create( nullptr );
auto &tracks = TrackList::Get( project );
for (auto t : tracks.Any())
{
currentTracks->Add(t->Duplicate());
auto savedState = undoManager.GetSavedState();
if (savedState < 0) {
undoManager.StateSaved();
savedState = undoManager.GetSavedState();
if (savedState < 0) {
wxASSERT(false);
savedState = 0;
}
}
std::vector<const TrackList*> trackLists;
undoManager.VisitStates(
[&](auto& elem){ trackLists.push_back(elem.state.tracks.get()); },
savedState,
undoManager.GetCurrentState() + 1);
int64_t total = projectFileIO.GetTotalUsage();
int64_t used = projectFileIO.GetCurrentUsage({currentTracks.get()});
int64_t used = projectFileIO.GetCurrentUsage(trackLists);
auto before = wxFileName::GetSize(projectFileIO.GetFileName());
@@ -1256,27 +1264,21 @@ void ProjectFileManager::Compact()
Internat::FormatSize(total - used)));
if (isBatch || dlg.ShowModal() == wxYES)
{
// Want to do this before removing the states so that it becomes the
// current state.
ProjectHistory::Get(project)
.PushState(XO("Compacted project file"), XO("Compact"), UndoPush::CONSOLIDATE);
// We can remove redo states.
undoManager.AbandonRedo();
// Now we can remove all previous states.
auto numStates = undoManager.GetNumStates();
undoManager.RemoveStates(0, numStates - 1);
// We can remove all states before the last saved.
undoManager.RemoveStates(0, savedState);
// And clear the clipboard, if needed
if (&mProject == clipboard.Project().lock().get())
clipboard.Clear();
// This may also decrease some reference counts on blocks
mLastSavedTracks.reset();
// Refresh the before space usage since it may have changed due to the
// above actions.
auto before = wxFileName::GetSize(projectFileIO.GetFileName());
projectFileIO.Compact( { currentTracks.get() }, true);
projectFileIO.Compact(trackLists, true);
auto after = wxFileName::GetSize(projectFileIO.GetFileName());
@@ -1288,6 +1290,4 @@ void ProjectFileManager::Compact()
XO("Compact Project"));
}
}
mLastSavedTracks = currentTracks;
}