Merge pull request #310 from NeoCoderMatrix86/299-undo-doesnt-work-if…

…-using-audiofile Initial correction for setting track end after audio file analysis
NeoCoderMatrix86 · May 12, 2023 · 385c861 · 385c861
2 parents eb36dff + bf4cc61
commit 385c861
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 18 deletions.
diff --git a/AudioCuesheetEditor/Extensions/SessionStateContainer.cs b/AudioCuesheetEditor/Extensions/SessionStateContainer.cs
@@ -38,7 +38,7 @@ public class SessionStateContainer
         public SessionStateContainer(TraceChangeManager traceChangeManager)
         {
             _traceChangeManager = traceChangeManager;
-            cuesheet = new Cuesheet();
+            cuesheet = new Cuesheet(_traceChangeManager);
             SetCuesheetReference(cuesheet);
         }
         public Cuesheet Cuesheet 

diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -74,11 +74,12 @@ public class Cuesheet : Validateable<Cuesheet>, ICuesheetEntity, ITraceable
         public event EventHandler<SplitPointAddRemoveEventArgs>? SplitPointRemoved;
         public event EventHandler? CuesheetImported;
 
-        public Cuesheet()
+        public Cuesheet(TraceChangeManager? traceChangeManager = null)
         {
             tracks = new();
             catalogueNumber = new();
             splitPoints = new();
+            TraceChangeManager = traceChangeManager;
         }
 
         [JsonInclude]
@@ -209,6 +210,9 @@ private set
             }
         }
 
+        [JsonIgnore]
+        public TraceChangeManager? TraceChangeManager { get; }
+
         public SplitPoint AddSplitPoint()
         {
             var previousValue = new List<SplitPoint>(splitPoints);
@@ -527,6 +531,7 @@ private void ReCalculateTrackProperties(Track trackToCalculate)
             if ((Audiofile != null) && (Audiofile.Duration.HasValue) && (trackToCalculate.End.HasValue == false))
             {
                 trackToCalculate.End = Audiofile.Duration;
+                TraceChangeManager?.MergeLastEditWithEdit(x => x.Changes.All(y => y.TraceableObject == this && y.TraceableChange.PropertyName == nameof(Audiofile)));
             }
             if (Tracks.Count > 1)
             {
@@ -568,7 +573,7 @@ private void ReCalculateTrackProperties(Track trackToCalculate)
                 {
                     trackToCalculate.Begin = TimeSpan.Zero;
                 }
-            }
+            }            
         }
 
         /// <summary>

diff --git a/AudioCuesheetEditor/Model/UI/TraceChangeManager.cs b/AudioCuesheetEditor/Model/UI/TraceChangeManager.cs
@@ -14,6 +14,8 @@
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
+using AudioCuesheetEditor.Pages;
+using Markdig.Extensions.Yaml;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -50,14 +52,12 @@ public ITraceable? TraceableObject
 
     public class TracedChanges
     {
-        private readonly Stack<TracedChange> _tracedChanges;
-
         public TracedChanges(IEnumerable<TracedChange> changes)
         {
-            _tracedChanges = new(changes);
+            Changes = new(changes);
         }
 
-        public Stack<TracedChange> Changes => _tracedChanges;
+        public List<TracedChange> Changes { get; }
         public Boolean HasTraceableObject { get { return Changes.Any(x => x.TraceableObject != null); } }
     }
 
@@ -135,9 +135,9 @@ public void Undo()
                 if ((changes != null) && changes.HasTraceableObject)
                 {
                     var redoChanges = new List<TracedChange>();
-                    do
+                    for (int i = changes.Changes.Count - 1; i >= 0; i--)
                     {
-                        var change = changes.Changes.Pop();
+                        var change = changes.Changes.ElementAt(i);
                         var tracedObject = change?.TraceableObject;
                         var traceAbleChange = change?.TraceableChange;
                         _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
@@ -156,8 +156,11 @@ public void Undo()
                                 throw new NullReferenceException(String.Format("Property {0} could not be found!", traceAbleChange.PropertyName));
                             }
                         }
+                        if (change != null)
+                        {
+                            changes.Changes.Remove(change);
+                        }
                     }
-                    while (changes.Changes.Count > 0);
                     //Push the old value to redo stack
                     redoStack.Push(new TracedChanges(redoChanges));
                 }
@@ -184,9 +187,9 @@ public void Redo()
                 if ((changes != null) && changes.HasTraceableObject)
                 {
                     var undoChanges = new List<TracedChange>();
-                    do
+                    for (int i = changes.Changes.Count - 1;i >= 0; i--) 
                     {
-                        var change = changes.Changes.Pop();
+                        var change = changes.Changes.ElementAt(i);
                         var tracedObject = change?.TraceableObject;
                         var traceAbleChange = change?.TraceableChange;
                         _logger.LogDebug("tracedObject = {tracedObject}, traceAbleChange = {traceAbleChange}", tracedObject, traceAbleChange);
@@ -205,8 +208,11 @@ public void Redo()
                                 throw new NullReferenceException(String.Format("Property {0} could not be found!", traceAbleChange.PropertyName));
                             }
                         }
+                        if (change != null)
+                        {
+                            changes.Changes.Remove(change);
+                        }
                     }
-                    while (changes.Changes.Count > 0);
                     //Push the old value to redo stack
                     undoStack.Push(new TracedChanges(undoChanges));
                 }
@@ -237,14 +243,35 @@ public Boolean BulkEdit
             }
         }
 
+        public TracedChanges? LastEdit
+        {
+            get
+            {
+                return undoStack.Peek();
+            }
+        }
+
+        public void MergeLastEditWithEdit(Func<TracedChanges, bool> targetEdit)
+        {
+            var edit = undoStack.FirstOrDefault(targetEdit);
+            if (edit != null)
+            {
+                if (undoStack.Count > 0)
+                {
+                    var lastEdits = undoStack.Pop();
+                    edit.Changes.AddRange(lastEdits.Changes);
+                    UndoDone?.Invoke(this, EventArgs.Empty);
+                }
+            }
+        }
+
         private void ResetStack(Stack<TracedChanges> stack)
         {
             while (stack.Count > 0)
             {
                 var tracedChange = stack.Pop();
-                while (tracedChange.Changes.Count > 0)
+                foreach (var change in tracedChange.Changes)
                 {
-                    var change = tracedChange.Changes.Pop();
                     if (change.TraceableObject != null)
                     {
                         change.TraceableObject.TraceablePropertyChanged -= Traceable_TraceablePropertyChanged;

diff --git a/AudioCuesheetEditor/Shared/AudioPlayer.razor b/AudioCuesheetEditor/Shared/AudioPlayer.razor
@@ -378,9 +378,20 @@ along with Foobar.  If not, see
     {
         if (_sessionStateContainer.Cuesheet.Audiofile != null)
         {
-            _sessionStateContainer.Cuesheet.Audiofile.ContentStreamLoaded += AudioFile_ContentStreamLoaded;
+            if (_sessionStateContainer.Cuesheet.Audiofile.IsContentStreamLoaded)
+            {
+                AnalyseAudioFile();
+            }
+            else
+            {
+                TotalTime = null;
+                _sessionStateContainer.Cuesheet.Audiofile.ContentStreamLoaded += AudioFile_ContentStreamLoaded;
+            }
+        }
+        else
+        {
+            TotalTime = null;
         }
-        TotalTime = null;
     }
 
     void AudioFile_ContentStreamLoaded(object? sender, EventArgs args)

diff --git a/AudioCuesheetEditor/Shared/MainLayout.razor b/AudioCuesheetEditor/Shared/MainLayout.razor
@@ -578,7 +578,7 @@ along with Foobar.  If not, see
             void newCuesheetDelegate(object? sender, EventArgs args)
             {
                 _logger.LogInformation("newCuesheetDelegate");
-                _sessionStateContainer.Cuesheet = new Cuesheet();
+                _sessionStateContainer.Cuesheet = new Cuesheet(_traceChangeManager);
                 modalDialog.Confirmed -= newCuesheetDelegate;
                 StateHasChanged();
             };