use browser api to calculate duration

NeoCoderMatrix86 · NeoCoderMatrix86 · commit b0d81e4d8223 · 2026-03-18T14:45:27.000+01:00
diff --git a/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs b/AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs
@@ -673,12 +673,9 @@ public void StartRecording_WithAudiofile_ShouldStartRecording()
         public void RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration()
         {
             // Arrange
-            var audiofileMock = new Mock<IAudiofile>();
-            audiofileMock.SetupGet(a => a.Duration).Returns(TimeSpan.FromMinutes(5));
-
             var cuesheet = new Cuesheet
             {
-                Audiofile = audiofileMock.Object
+                Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
             };
             var track = new Track { Position = 1, Begin = TimeSpan.Zero };
             cuesheet.AddTrack(track);
@@ -712,12 +709,9 @@ public void RecalculateLastTrackEnd_MultipleTracks_EndSetCorrectly()
         public void RecalculateLastTrackEnd_MultipleTracksWithAudiofile_LastTrackEndSetToAudiofileDuration()
         {
             // Arrange
-            var audiofileMock = new Mock<IAudiofile>();
-            audiofileMock.SetupGet(a => a.Duration).Returns(TimeSpan.FromMinutes(5));
-
             var cuesheet = new Cuesheet
             {
-                Audiofile = audiofileMock.Object
+                Audiofile = new("Test.mp3", nameof(RecalculateLastTrackEnd_SingleTrackWithAudiofile_EndSetToAudiofileDuration), new AudioCodec("audio/mpeg", ".mp3", "AudioCodec MP3"), TimeSpan.FromMinutes(5))
             };
             var track1 = new Track { Position = 1, Begin = TimeSpan.Zero, End = TimeSpan.FromMinutes(2) };
             var track2 = new Track { Position = 2, Begin = TimeSpan.FromMinutes(2) };
diff --git a/AudioCuesheetEditor.Tests/Model/IO/Audio/AudiofileTests.cs b/AudioCuesheetEditor.Tests/Model/IO/Audio/AudiofileTests.cs
@@ -26,8 +26,6 @@ public class AudiofileTests
         public void AudioFileTest()
         {
             var audioFile = new Audiofile("test.mp3");
-            Assert.IsNull(audioFile.ContentStream);
-            Assert.IsFalse(audioFile.IsContentStreamLoaded);
             Assert.IsNotNull(audioFile.Name);
             Assert.AreEqual("MP3", audioFile.AudioFileType);
             audioFile = new Audiofile("Test");
diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -31,7 +31,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.4" />
     <PackageReference Include="MudBlazor" Version="9.1.0" />
     <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.2.0" />
-    <PackageReference Include="z440.atl.core" Version="7.11.0" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/AudioCuesheetEditor/Extensions/InterfaceConverter.cs b/AudioCuesheetEditor/Extensions/InterfaceConverter.cs
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Cuesheet.cs
@@ -38,7 +38,7 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet
         private List<Track> tracks = [];
         private String? artist;
         private String? title;
-        private IAudiofile? audiofile;
+        private Audiofile? audiofile;
         private CDTextfile? cDTextfile;
         private String? catalogueNumber;
         private readonly List<KeyValuePair<String, Track>> currentlyHandlingLinkedTrackPropertyChange = [];
@@ -89,7 +89,7 @@ public String? Title
                 FireEvents(previousValue, propertyName: nameof(Title));
             }
         }
-        public IAudiofile? Audiofile
+        public Audiofile? Audiofile
         {
             get => audiofile;
             set 
diff --git a/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs b/AudioCuesheetEditor/Model/IO/Audio/Audiofile.cs
@@ -18,7 +18,7 @@
 namespace AudioCuesheetEditor.Model.IO.Audio
 {
     [method: JsonConstructor]
-    public class Audiofile(String name) : IDisposable, IAudiofile
+    public class Audiofile(String name)
     {
         public static readonly AudioCodec AudioCodecWEBM = new("audio/webm", ".webm", "AudioCodec WEBM");
 
@@ -35,20 +35,17 @@ public class Audiofile(String name) : IDisposable, IAudiofile
         ];
 
         private AudioCodec? audioCodec;
-        private Stream? contentStream;
         private String name = name;
-        private bool disposedValue;
 
-        public event EventHandler? ContentStreamLoaded;
-
-        public Audiofile(String name, String objectURL, AudioCodec? audioCodec) : this(name)
+        public Audiofile(String name, String objectURL, AudioCodec? audioCodec, TimeSpan? duration = null) : this(name)
         {
             if (String.IsNullOrEmpty(objectURL))
             {
                 throw new ArgumentNullException(nameof(objectURL));
             }
             ObjectURL = objectURL;
             AudioCodec = audioCodec;
+            Duration = duration;
         }
 
         public String Name
@@ -71,32 +68,6 @@ public String Name
         [JsonIgnore]
         public String? ObjectURL { get; private set; }
         /// <summary>
-        /// Boolean indicating if the stream has fully been loaded
-        /// </summary>
-        [JsonIgnore]
-        public Boolean IsContentStreamLoaded
-        {
-            get { return ContentStream != null; }
-        }
-        /// <summary>
-        /// File content stream. Be carefully, this stream is loaded asynchronously. Connect to the StreamLoaded for checking if loading has already been done!
-        /// </summary>
-        [JsonIgnore]
-        public Stream? ContentStream
-        {
-            get => contentStream;
-            set
-            {
-                contentStream = value;
-                if ((ContentStream != null) && (AudioCodec != null))
-                {
-                    var track = new ATL.Track(ContentStream, AudioCodec.MimeType);
-                    Duration = new TimeSpan(0, 0, track.Duration);
-                    ContentStreamLoaded?.Invoke(this, EventArgs.Empty);
-                }
-            }
-        }
-        /// <summary>
         /// Duration of the audio file
         /// </summary>
         public TimeSpan? Duration { get; private set; }
@@ -144,30 +115,5 @@ public Boolean PlaybackPossible
                 return playbackPossible;
             }
         }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!disposedValue)
-            {
-                if (disposing)
-                {
-                    if (ContentStream != null)
-                    {
-                        ContentStream.Close();
-                        ContentStream.Dispose();
-                        ContentStream = null;
-                    }
-                }
-
-                disposedValue = true;
-            }
-        }
-
-        public void Dispose()
-        {
-            // Ändern Sie diesen Code nicht. Fügen Sie Bereinigungscode in der Methode "Dispose(bool disposing)" ein.
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
     }
 }
diff --git a/AudioCuesheetEditor/Model/IO/Audio/IAudiofile.cs b/AudioCuesheetEditor/Model/IO/Audio/IAudiofile.cs
diff --git a/AudioCuesheetEditor/Model/IO/Projectfile.cs b/AudioCuesheetEditor/Model/IO/Projectfile.cs
@@ -13,9 +13,7 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
-using AudioCuesheetEditor.Extensions;
 using AudioCuesheetEditor.Model.AudioCuesheet;
-using AudioCuesheetEditor.Model.IO.Audio;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -32,8 +30,7 @@ public class Projectfile(Cuesheet cuesheet)
             ReferenceHandler = ReferenceHandler.IgnoreCycles,
             Converters =
             {
-                new JsonStringEnumConverter(),
-                new InterfaceConverter<IAudiofile, Audiofile>() // Add a custom converter for IAudiofile  
+                new JsonStringEnumConverter()
             }
         };
 
diff --git a/AudioCuesheetEditor/Services/Audio/PlaybackService.cs b/AudioCuesheetEditor/Services/Audio/PlaybackService.cs
@@ -26,7 +26,7 @@ public class PlaybackService : IDisposable
         private readonly IHowl _howl;
 
         private int? soundId;
-        private IAudiofile? currentlyPlayingAudiofile;
+        private Audiofile? currentlyPlayingAudiofile;
         private Timer? updateTimer;
         private bool disposedValue;
         private readonly Lock timerLock = new();
@@ -71,7 +71,7 @@ public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)
         public async Task PlayOrPauseAsync()
         {
             //Reset if the last played audiofile is not the current one
-            if (currentlyPlayingAudiofile !=cuesheet.Audiofile)
+            if (currentlyPlayingAudiofile != cuesheet.Audiofile)
             {
                 soundId = null;
             }
diff --git a/AudioCuesheetEditor/Services/IO/FileInputManager.cs b/AudioCuesheetEditor/Services/IO/FileInputManager.cs
@@ -92,22 +92,13 @@ public bool CheckFileMimeType(string? fileContentType, string fileName, string m
                 var codec = GetAudioCodec(fileUpload.ContentType, fileUpload.Name);
                 if (codec != null)
                 {
-                    audiofile = new Audiofile(fileUpload.Name, fileUpload.ObjectUrl, codec);
+                    TimeSpan? duration = null;
                     if (String.IsNullOrEmpty(fileUpload.ObjectUrl) == false)
                     {
-                        var request = new HttpRequestMessage(HttpMethod.Get, fileUpload.ObjectUrl);
-                        //TODO: Enable when https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/524 gets done
-                        request.SetBrowserRequestStreamingEnabled(false);
-
-                        var response = await _httpClient.SendAsync(request);
-                        var loadContentStreamTask = response.Content.ReadAsStreamAsync()
-                                .ContinueWith(x => audiofile.ContentStream = x.Result);
-                        if (afterContentStreamLoaded != null)
-                        {
-                            _ = loadContentStreamTask
-                                .ContinueWith(afterContentStreamLoaded);
-                        }
+                        var durationSeconds = await _jsRuntime.InvokeAsync<double>("getAudioDurationFromFile", fileUpload.ObjectUrl);
+                        duration = TimeSpan.FromSeconds(durationSeconds);
                     }
+                    audiofile = new Audiofile(fileUpload.Name, fileUpload.ObjectUrl, codec, duration); 
                 }
                 else
                 {
diff --git a/AudioCuesheetEditor/wwwroot/scripts/library.js b/AudioCuesheetEditor/wwwroot/scripts/library.js
@@ -39,4 +39,21 @@ function beforeunload(e) {
 
 function removeBeforeunload() {
     window.removeEventListener('beforeunload', beforeunload);
+}
+
+function getAudioDurationFromFile(url) {
+    return new Promise((resolve, reject) => {
+        const audio = new Audio();
+
+        audio.preload = "metadata";
+        audio.src = url;
+
+        audio.onloadedmetadata = () => {
+            resolve(audio.duration);
+        };
+
+        audio.onerror = (e) => {
+            reject(e);
+        };
+    });
 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ public class AudiofileTests`
`26`	`26`	`public void AudioFileTest()`
`27`	`27`	`{`
`28`	`28`	`var audioFile = new Audiofile("test.mp3");`
`29`		`- Assert.IsNull(audioFile.ContentStream);`
`30`		`- Assert.IsFalse(audioFile.IsContentStreamLoaded);`
`31`	`29`	`Assert.IsNotNull(audioFile.Name);`
`32`	`30`	`Assert.AreEqual("MP3", audioFile.AudioFileType);`
`33`	`31`	`audioFile = new Audiofile("Test");`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class Cuesheet() : Validateable, ITraceable, ICuesheet`
`38`	`38`	`private List<Track> tracks = [];`
`39`	`39`	`private String? artist;`
`40`	`40`	`private String? title;`
`41`		`- private IAudiofile? audiofile;`
	`41`	`+ private Audiofile? audiofile;`
`42`	`42`	`private CDTextfile? cDTextfile;`
`43`	`43`	`private String? catalogueNumber;`
`44`	`44`	`private readonly List<KeyValuePair<String, Track>> currentlyHandlingLinkedTrackPropertyChange = [];`
`@@ -89,7 +89,7 @@ public String? Title`
`89`	`89`	`FireEvents(previousValue, propertyName: nameof(Title));`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`- public IAudiofile? Audiofile`
	`92`	`+ public Audiofile? Audiofile`
`93`	`93`	`{`
`94`	`94`	`get => audiofile;`
`95`	`95`	`set`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class PlaybackService : IDisposable`
`26`	`26`	`private readonly IHowl _howl;`
`27`	`27`
`28`	`28`	`private int? soundId;`
`29`		`- private IAudiofile? currentlyPlayingAudiofile;`
	`29`	`+ private Audiofile? currentlyPlayingAudiofile;`
`30`	`30`	`private Timer? updateTimer;`
`31`	`31`	`private bool disposedValue;`
`32`	`32`	`private readonly Lock timerLock = new();`
`@@ -71,7 +71,7 @@ public PlaybackService(ISessionStateContainer sessionStateContainer, IHowl howl)`
`71`	`71`	`public async Task PlayOrPauseAsync()`
`72`	`72`	`{`
`73`	`73`	`//Reset if the last played audiofile is not the current one`
`74`		`- if (currentlyPlayingAudiofile !=cuesheet.Audiofile)`
	`74`	`+ if (currentlyPlayingAudiofile != cuesheet.Audiofile)`
`75`	`75`	`{`
`76`	`76`	`soundId = null;`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,22 +92,13 @@ public bool CheckFileMimeType(string? fileContentType, string fileName, string m`
`92`	`92`	`var codec = GetAudioCodec(fileUpload.ContentType, fileUpload.Name);`
`93`	`93`	`if (codec != null)`
`94`	`94`	`{`
`95`		`- audiofile = new Audiofile(fileUpload.Name, fileUpload.ObjectUrl, codec);`
	`95`	`+ TimeSpan? duration = null;`
`96`	`96`	`if (String.IsNullOrEmpty(fileUpload.ObjectUrl) == false)`
`97`	`97`	`{`
`98`		`- var request = new HttpRequestMessage(HttpMethod.Get, fileUpload.ObjectUrl);`
`99`		`- //TODO: Enable when https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/524 gets done`
`100`		`- request.SetBrowserRequestStreamingEnabled(false);`
`101`		`-`
`102`		`- var response = await _httpClient.SendAsync(request);`
`103`		`- var loadContentStreamTask = response.Content.ReadAsStreamAsync()`
`104`		`- .ContinueWith(x => audiofile.ContentStream = x.Result);`
`105`		`- if (afterContentStreamLoaded != null)`
`106`		`- {`
`107`		`- _ = loadContentStreamTask`
`108`		`- .ContinueWith(afterContentStreamLoaded);`
`109`		`- }`
	`98`	`+ var durationSeconds = await _jsRuntime.InvokeAsync<double>("getAudioDurationFromFile", fileUpload.ObjectUrl);`
	`99`	`+ duration = TimeSpan.FromSeconds(durationSeconds);`
`110`	`100`	`}`
	`101`	`+ audiofile = new Audiofile(fileUpload.Name, fileUpload.ObjectUrl, codec, duration);`
`111`	`102`	`}`
`112`	`103`	`else`
`113`	`104`	`{`