\\s*| \\d+ | \\s*(?.*?) | \\s*(?.*?)</td>\\s*<td>(?<StartDateTime>.*?)</td>\\s*</tr>"
- };
- var textImportMemoryStream = new MemoryStream(Resources.Traktor_Export);
- var reader = new StreamReader(textImportMemoryStream);
- var fileContent = reader.ReadToEnd();
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
- var options = new ApplicationOptions
- {
- SelectedImportProfile = profile
- };
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(options);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
- // Act
- var importfile = await service.AnalyseAsync(fileContent);
- // Assert
- Assert.AreEqual(fileContent, importfile.FileContent);
- Assert.IsNull(importfile.AnalyseException);
- Assert.IsNotNull(importfile.AnalysedCuesheet);
- Assert.IsNull(importfile.AnalysedCuesheet.Artist);
- Assert.IsNull(importfile.AnalysedCuesheet.Title);
- Assert.AreEqual(41, importfile.AnalysedCuesheet.Tracks.Count);
- Assert.AreEqual("Nachap", importfile.AnalysedCuesheet.Tracks.First().Artist);
- Assert.AreEqual("Glass", importfile.AnalysedCuesheet.Tracks.First().Title);
- Assert.AreEqual(new DateTime(2025, 1, 29, 18, 52, 10), importfile.AnalysedCuesheet.Tracks.First().StartDateTime);
- Assert.AreEqual("Inache", importfile.AnalysedCuesheet.Tracks.Last().Artist);
- Assert.AreEqual("Andale (MONTA (TN) Remix)", importfile.AnalysedCuesheet.Tracks.Last().Title);
- Assert.AreEqual(new DateTime(2025, 1, 29, 22, 30, 3), importfile.AnalysedCuesheet.Tracks.Last().StartDateTime);
- Assert.IsNotNull(importfile.FileContentRecognized);
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "Sasha Fashion")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "2025/1/29 21:48:55")));
- }
-
- [TestMethod()]
- public async Task AnalyseAsync_WithoutRegularExpression_ReturnsCuesheetAsync()
- {
- // Arrange
- var profile = new Importprofile()
- {
- UseRegularExpression = false,
- SchemeCuesheet = "Artist - Title - Cataloguenumber",
- SchemeTracks = "Artist - Title\tBegin"
- };
- var textImportMemoryStream = new MemoryStream(Resources.Textimport_with_Cuesheetdata);
- var reader = new StreamReader(textImportMemoryStream);
- var fileContent = reader.ReadToEnd();
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
- var options = new ApplicationOptions
- {
- SelectedImportProfile = profile
- };
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(options);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
- // Act
- var importfile = await service.AnalyseAsync(fileContent);
- // Assert
- Assert.IsNull(importfile.AnalyseException);
- Assert.IsNotNull(importfile.AnalysedCuesheet);
- Assert.AreEqual("DJFreezeT", importfile.AnalysedCuesheet.Artist);
- Assert.AreEqual("Rabbit Hole Mix", importfile.AnalysedCuesheet.Title);
- Assert.AreEqual("0123456789123", importfile.AnalysedCuesheet.Cataloguenumber);
- Assert.AreEqual("Adriatique", importfile.AnalysedCuesheet.Tracks.First().Artist);
- Assert.AreEqual("X.", importfile.AnalysedCuesheet.Tracks.First().Title);
- Assert.AreEqual(new TimeSpan(0, 0, 5, 24, 250), importfile.AnalysedCuesheet.Tracks.First().Begin);
- Assert.AreEqual("Nikolay Kirov", importfile.AnalysedCuesheet.Tracks.Last().Artist);
- Assert.AreEqual("Chasing the Sun (Original Mix)", importfile.AnalysedCuesheet.Tracks.Last().Title);
- Assert.IsNull(importfile.AnalysedCuesheet.Tracks.Last().Begin);
- Assert.IsNotNull(importfile.FileContentRecognized);
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "DJFreezeT")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "Rabbit Hole Mix")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "0123456789123")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "Nikolay Kirov")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "Chasing the Sun (Original Mix)")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "SHDW & Obscure Shape")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "Wächter der Nacht (Original Mix)")));
- }
-
- [TestMethod()]
- public async Task AnalyseAsync_TextfileWithStartDateTime_CreatesValidCuesheetAsync()
- {
- // Arrange
- var fileContent = $@"Innellea~The Golden Fort~{new DateTime(2024, 8, 14, 20, 10, 48)}
-Nora En Pure~Diving with Whales (Daniel Portman Remix)~{new DateTime(2024, 8, 14, 20, 15, 21)}
-WhoMadeWho & Adriatique~Miracle (RÜFÜS DU SOL Remix)~{new DateTime(2024, 8, 14, 20, 20, 42)}
-Ella Wild~Poison D'araignee (Original Mix)~{new DateTime(2024, 8, 14, 20, 28, 03)}
-Stil & Bense~On The Edge (Original Mix)~{new DateTime(2024, 8, 14, 20, 32, 42)}
-Nebula~Clairvoyant Dreams~{new DateTime(2024, 8, 14, 20, 39, 1)}
-Valentina Black~I'm a Tree (Extended Mix)~{new DateTime(2024, 8, 14, 20, 47, 08)}
-Nebula~Clairvoyant Dreams~{new DateTime(2024, 8, 14, 20, 53, 20)}
-Kiko & Dave Davis feat. Phoebe~Living in Space (Dub Mix)~{new DateTime(2024, 8, 14, 20, 58, 11)}
-Lilly Palmer~Before Acid~{new DateTime(2024, 8, 14, 21, 03, 53)}
-Sofi Tukker~Drinkee (Vintage Culture & John Summit Extended Mix)~{new DateTime(2024, 8, 14, 21, 09, 52)}
-CID & Truth x Lies~Caroline (Extended Mix)~{new DateTime(2024, 8, 14, 21, 14, 09)}
-Moby~Why Does My Heart Feel So Bad? (Oxia Remix)~{new DateTime(2024, 8, 14, 21, 17, 15)}
-Ammo Avenue~Little Gurl (Extended Mix)~{new DateTime(2024, 8, 14, 21, 22, 46)}
-James Hurr & Smokin Jo & Stealth~Beggin' For Change~{new DateTime(2024, 8, 14, 21, 28, 37)}
-Kristine Blond~Love Shy (Sam Divine & CASSIMM Extended Remix)~{new DateTime(2024, 8, 14, 21, 30, 47)}
-Vanilla Ace~Work On You (Original Mix)~{new DateTime(2024, 8, 14, 21, 36, 28)}
-Truth X Lies~Like This~{new DateTime(2024, 8, 14, 21, 42, 05)}
-Terri-Anne~Round Round~{new DateTime(2024, 8, 14, 21, 44, 07)}
-Joanna Magik~Maneater~{new DateTime(2024, 8, 14, 21, 46, 32)}
-Jen Payne & Kevin McKay~Feed Your Soul~1{new DateTime(2024, 8, 14, 21, 48, 45)}
-Kevin McKay & Eppers & Notelle~On My Own~{new DateTime(2024, 8, 14, 21, 51, 37)}
-Nader Razdar & Kevin McKay~Get Ur Freak On (Kevin McKay Extended Mix)~{new DateTime(2024, 8, 14, 21, 53, 49)}
-Philip Z~Yala (Extended Mix)~{new DateTime(2024, 8, 14, 21, 59, 40)}
-Kyle Kinch & Kevin McKay~Hella~{new DateTime(2024, 8, 14, 22, 05, 53)}
-Roze Wild~B-O-D-Y~{new DateTime(2024, 8, 14, 22, 08, 26)}
-Jey Kurmis~Snoop~{new DateTime(2024, 8, 14, 22, 11, 09)}
-Bootie Brown & Tame Impala & Gorillaz~New Gold (Dom Dolla Remix Extended)~{new DateTime(2024, 8, 14, 22, 16, 23)}
-Eli Brown & Love Regenerator~Don't You Want Me (Original Mix)~{new DateTime(2024, 8, 14, 22, 21, 23)}
-Local Singles~Voices~{new DateTime(2024, 8, 14, 22, 25, 59)}";
-
- var profile = new Importprofile()
- {
- UseRegularExpression = false,
- SchemeTracks = $"{nameof(ImportTrack.Artist)}~{nameof(ImportTrack.Title)}~{nameof(ImportTrack.StartDateTime)}"
- };
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
- var options = new ApplicationOptions
- {
- SelectedImportProfile = profile
- };
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(options);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
- // Act
- var importfile = await service.AnalyseAsync(fileContent);
- // Assert
- Assert.IsNull(importfile.AnalyseException);
- Assert.IsNotNull(importfile.AnalysedCuesheet);
- Assert.AreEqual(30, importfile.AnalysedCuesheet.Tracks.Count);
- Assert.AreEqual("Innellea", importfile.AnalysedCuesheet.Tracks.ElementAt(0).Artist);
- Assert.AreEqual("The Golden Fort", importfile.AnalysedCuesheet.Tracks.ElementAt(0).Title);
- Assert.AreEqual(new DateTime(2024, 8, 14, 20, 10, 48), importfile.AnalysedCuesheet.Tracks.ElementAt(0).StartDateTime);
- Assert.AreEqual("Nora En Pure", importfile.AnalysedCuesheet.Tracks.ElementAt(1).Artist);
- Assert.AreEqual("Diving with Whales (Daniel Portman Remix)", importfile.AnalysedCuesheet.Tracks.ElementAt(1).Title);
- Assert.AreEqual(new DateTime(2024, 8, 14, 20, 15, 21), importfile.AnalysedCuesheet.Tracks.ElementAt(1).StartDateTime);
- Assert.AreEqual("Local Singles", importfile.AnalysedCuesheet.Tracks.ElementAt(29).Artist);
- Assert.AreEqual("Voices", importfile.AnalysedCuesheet.Tracks.ElementAt(29).Title);
- Assert.AreEqual(new DateTime(2024, 8, 14, 22, 25, 59), importfile.AnalysedCuesheet.Tracks.ElementAt(29).StartDateTime);
- }
-
- [TestMethod()]
- public async Task AnalyseAsync_WithCommonDataMatchingMultipleLines_SetsCommonDataOnceAsync()
- {
- // Arrange
- var profile = new Importprofile()
- {
- UseRegularExpression = false,
- SchemeCuesheet = "Artist - Title\tAudiofile",
- SchemeTracks = "Artist - Title\tBegin"
- };
- var textImportMemoryStream = new MemoryStream(Resources.Sample_Inputfile);
- var reader = new StreamReader(textImportMemoryStream);
- var fileContent = reader.ReadToEnd();
- var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
- var options = new ApplicationOptions
- {
- SelectedImportProfile = profile
- };
- localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(options);
- var service = new TextImportService(localStorageOptionsProviderMock.Object);
- // Act
- var importfile = await service.AnalyseAsync(fileContent);
- // Assert
- Assert.IsNull(importfile.AnalyseException);
- Assert.IsNotNull(importfile.AnalysedCuesheet);
- Assert.AreEqual("CuesheetArtist", importfile.AnalysedCuesheet.Artist);
- Assert.AreEqual("CuesheetTitle", importfile.AnalysedCuesheet.Title);
- Assert.AreEqual("c:\\AudioFile.mp3", importfile.AnalysedCuesheet.Audiofile);
- Assert.AreEqual(8, importfile.AnalysedCuesheet.Tracks.Count);
- Assert.IsNotNull(importfile.FileContentRecognized);
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "CuesheetArtist")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "CuesheetTitle")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "c:\\AudioFile.mp3")));
- Assert.IsTrue(importfile.FileContentRecognized.Contains(String.Format(CuesheetConstants.RecognizedMarkHTML, "Sample Artist 8")));
+ string.Format(CuesheetConstants.RecognizedMarkHTML, "04:29:28")), importfile.FileContentRecognized.ElementAt(53));
}
}
}
\ No newline at end of file
diff --git a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
index 155ed70c..76c4e24b 100644
--- a/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
+++ b/AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs
@@ -13,13 +13,21 @@
//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.Data.Options;
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.Entity;
+using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.Options;
+using AudioCuesheetEditor.Model.Utility;
+using AudioCuesheetEditor.Services.IO;
using AudioCuesheetEditor.Services.UI;
+using AudioCuesheetEditor.Tests.Properties;
using AudioCuesheetEditor.Tests.Utility;
using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
namespace AudioCuesheetEditor.Tests.Services.UI
@@ -156,6 +164,115 @@ public void TrackListTest()
Assert.IsFalse(manager.CanRedo);
}
+ [TestMethod()]
+ public void Import_ValidTextfile_IsUndoable()
+ {
+ // Arrange
+ var traceChangeManager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+ var sessionStateContainer = new SessionStateContainer(traceChangeManager);
+ var textImportMemoryStream = new MemoryStream(Resources.Textimport_with_Cuesheetdata);
+ using var reader = new StreamReader(textImportMemoryStream);
+ List<string?> lines = [];
+ while (reader.EndOfStream == false)
+ {
+ lines.Add(reader.ReadLine());
+ }
+ var fileContent = lines.AsReadOnly();
+ var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
+ var textImportScheme = new TextImportScheme()
+ {
+ SchemeCuesheet = "(?'Artist'\\A.*) - (?'Title'[a-zA-Z0-9_ .();äöü&:,]{1,}) - (?'Cataloguenumber'.{1,})",
+ SchemeTracks = TextImportScheme.DefaultSchemeTracks
+ };
+ var timeSpanFormat = new TimeSpanFormat();
+ var options = new ApplicationOptions();
+ localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(options);
+ var fileInputManagerMock = new Mock<IFileInputManager>();
+ var importManager = new ImportManager(sessionStateContainer, localStorageOptionsProviderMock.Object, traceChangeManager, fileInputManagerMock.Object);
+ // Act
+ importManager.ImportText(fileContent, textImportScheme, timeSpanFormat);
+ // Assert
+ Assert.IsFalse(traceChangeManager.CanUndo);
+ Assert.IsFalse(traceChangeManager.CanRedo);
+ Assert.IsNotNull(sessionStateContainer.ImportCuesheet);
+ Assert.AreEqual("DJFreezeT", sessionStateContainer.ImportCuesheet.Artist);
+ Assert.AreEqual("0123456789123", sessionStateContainer.ImportCuesheet.Cataloguenumber);
+ Assert.AreNotEqual(0, sessionStateContainer.ImportCuesheet.Tracks.Count);
+ }
+
+ [TestMethod()]
+ public void UndoImport_ValidTextfile_ResetsToEmptyCuesheet()
+ {
+ // Arrange
+ var traceChangeManager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+ var sessionStateContainer = new SessionStateContainer(traceChangeManager);
+ var textImportMemoryStream = new MemoryStream(Resources.Textimport_with_Cuesheetdata);
+ using var reader = new StreamReader(textImportMemoryStream);
+ List<string?> lines = [];
+ while (reader.EndOfStream == false)
+ {
+ lines.Add(reader.ReadLine());
+ }
+ var fileContent = lines.AsReadOnly();
+ var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
+ var textImportScheme = new TextImportScheme()
+ {
+ SchemeCuesheet = "(?'Artist'\\A.*) - (?'Title'[a-zA-Z0-9_ .();äöü&:,]{1,}) - (?'Cataloguenumber'.{1,})",
+ SchemeTracks = TextImportScheme.DefaultSchemeTracks
+ };
+ var timeSpanFormat = new TimeSpanFormat();
+ var options = new ApplicationOptions();
+ localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(options);
+ var fileInputManagerMock = new Mock<IFileInputManager>();
+ var importManager = new ImportManager(sessionStateContainer, localStorageOptionsProviderMock.Object, traceChangeManager, fileInputManagerMock.Object);
+ importManager.ImportText(fileContent, textImportScheme, timeSpanFormat);
+ importManager.ImportCuesheet();
+ // Act
+ traceChangeManager.Undo();
+ // Assert
+ Assert.AreEqual(0, sessionStateContainer.Cuesheet.Tracks.Count);
+ Assert.IsTrue(string.IsNullOrEmpty(sessionStateContainer.Cuesheet.Artist));
+ Assert.IsTrue(string.IsNullOrEmpty(sessionStateContainer.Cuesheet.Cataloguenumber));
+ Assert.IsFalse(traceChangeManager.CanUndo);
+ Assert.IsTrue(traceChangeManager.CanRedo);
+ }
+
+ [TestMethod()]
+ public void UndoAndRedoImport_ValidTextfile_ResetsTextfileValues()
+ {
+ // Arrange
+ var testhelper = new TestHelper();
+ var traceChangeManager = new TraceChangeManager(TestHelper.CreateLogger<TraceChangeManager>());
+ var sessionStateContainer = new SessionStateContainer(traceChangeManager);
+ var textImportMemoryStream = new MemoryStream(Resources.Textimport_with_Cuesheetdata);
+ using var reader = new StreamReader(textImportMemoryStream);
+ List<string?> lines = [];
+ while (reader.EndOfStream == false)
+ {
+ lines.Add(reader.ReadLine());
+ }
+ var fileContent = lines.AsReadOnly();
+ var localStorageOptionsProviderMock = new Mock<ILocalStorageOptionsProvider>();
+ var textImportScheme = new TextImportScheme()
+ {
+ SchemeCuesheet = "(?'Artist'\\A.*) - (?'Title'[a-zA-Z0-9_ .();äöü&:,]{1,}) - (?'Cataloguenumber'.{1,})",
+ SchemeTracks = TextImportScheme.DefaultSchemeTracks
+ };
+ var timeSpanFormat = new TimeSpanFormat();
+ var options = new ApplicationOptions();
+ localStorageOptionsProviderMock.Setup(x => x.GetOptionsAsync<ApplicationOptions>()).ReturnsAsync(options);
+ var fileInputManagerMock = new Mock<IFileInputManager>();
+ var importManager = new ImportManager(sessionStateContainer, localStorageOptionsProviderMock.Object, traceChangeManager, fileInputManagerMock.Object);
+ importManager.ImportText(fileContent, textImportScheme, timeSpanFormat);
+ traceChangeManager.Undo();
+ // Act
+ traceChangeManager.Redo();
+ // Assert
+ Assert.AreEqual("DJFreezeT", sessionStateContainer.ImportCuesheet?.Artist);
+ Assert.AreEqual("0123456789123", sessionStateContainer.ImportCuesheet?.Cataloguenumber);
+ Assert.AreEqual(39, sessionStateContainer.ImportCuesheet?.Tracks.Count);
+ }
+
[TestMethod()]
public void RemoveTracksTest()
{
diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
index 0b8da88c..826022e8 100644
--- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj
+++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -20,7 +20,6 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="HtmlSanitizer" Version="9.0.886" />
<PackageReference Include="MetaBrainz.MusicBrainz" Version="6.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" PrivateAssets="all" />
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/CuesheetConstants.cs b/AudioCuesheetEditor/Model/AudioCuesheet/CuesheetConstants.cs
index f0121747..2994ab3d 100644
--- a/AudioCuesheetEditor/Model/AudioCuesheet/CuesheetConstants.cs
+++ b/AudioCuesheetEditor/Model/AudioCuesheet/CuesheetConstants.cs
@@ -31,7 +31,6 @@ public class CuesheetConstants
public static readonly String Tab = "\t";
public static readonly String CuesheetCDTextfile = "CDTEXTFILE";
public static readonly String CuesheetCatalogueNumber = "CATALOG";
- public static readonly String MarkHTMLStart = "<Mark>";
- public static readonly String RecognizedMarkHTML = MarkHTMLStart + "{0}" + "</Mark>";
+ public static readonly String RecognizedMarkHTML = "<Mark>{0}</Mark>";
}
}
diff --git a/AudioCuesheetEditor/Model/IO/FileExtensions.cs b/AudioCuesheetEditor/Model/IO/FileExtensions.cs
index 980f574d..439bf6df 100644
--- a/AudioCuesheetEditor/Model/IO/FileExtensions.cs
+++ b/AudioCuesheetEditor/Model/IO/FileExtensions.cs
@@ -21,6 +21,5 @@ public class FileExtensions
public const string Projectfile = ".ace";
public const string Cuesheet = ".cue";
public const string CDTextfile = ".cdt";
- public const string HTML = ".html";
}
}
diff --git a/AudioCuesheetEditor/Model/IO/FileMimeTypes.cs b/AudioCuesheetEditor/Model/IO/FileMimeTypes.cs
index 37483831..1dc3c20d 100644
--- a/AudioCuesheetEditor/Model/IO/FileMimeTypes.cs
+++ b/AudioCuesheetEditor/Model/IO/FileMimeTypes.cs
@@ -17,9 +17,9 @@ namespace AudioCuesheetEditor.Model.IO
{
public static class FileMimeTypes
{
- public const string TextPlain = "text/plain";
+ public const string Text = "text/plain";
public const string Projectfile = "application/x-ace";
public const string Cuesheet = "application/x-cue";
- public const string Text = "text/*";
+ public const string CDTextfile = "text/*";
}
}
diff --git a/AudioCuesheetEditor/Model/IO/Import/IImportfile.cs b/AudioCuesheetEditor/Model/IO/Import/IImportfile.cs
index a10f1d99..b99d07b0 100644
--- a/AudioCuesheetEditor/Model/IO/Import/IImportfile.cs
+++ b/AudioCuesheetEditor/Model/IO/Import/IImportfile.cs
@@ -21,15 +21,15 @@ namespace AudioCuesheetEditor.Model.IO.Import
public interface IImportfile
{
/// <summary>
- /// File content
+ /// File content (each element is a file line)
/// </summary>
- String? FileContent { get; set; }
+ IEnumerable<String?>? FileContent { get; set; }
/// <summary>
/// File content with marking which passages has been reconized by scheme
/// </summary>
- String? FileContentRecognized { get; set; }
+ IEnumerable<String?>? FileContentRecognized { get; set; }
/// <summary>
- /// Exception that has been thrown while reading out the file
+ /// Exception that has been thrown while readinng out the file
/// </summary>
Exception? AnalyseException { get; set; }
/// <summary>
diff --git a/AudioCuesheetEditor/Model/IO/Import/Importfile.cs b/AudioCuesheetEditor/Model/IO/Import/Importfile.cs
index c0726e8e..033e1989 100644
--- a/AudioCuesheetEditor/Model/IO/Import/Importfile.cs
+++ b/AudioCuesheetEditor/Model/IO/Import/Importfile.cs
@@ -20,14 +20,14 @@ namespace AudioCuesheetEditor.Model.IO.Import
{
public class Importfile : IImportfile
{
+ /// <inheritdoc />
+ public IEnumerable<String?>? FileContent { get; set; }
+ /// <inheritdoc />
+ public IEnumerable<String?>? FileContentRecognized { get; set; }
/// <inheritdoc />
public Exception? AnalyseException { get; set; }
/// <inheritdoc />
public ImportCuesheet? AnalysedCuesheet { get; set; }
public ImportFileType FileType { get; set; }
- /// <inheritdoc />
- public string? FileContentRecognized { get; set; }
- /// <inheritdoc />
- public string? FileContent { get; set; }
}
}
diff --git a/AudioCuesheetEditor/Model/IO/Import/Importprofile.cs b/AudioCuesheetEditor/Model/IO/Import/TextImportScheme.cs
similarity index 76%
rename from AudioCuesheetEditor/Model/IO/Import/Importprofile.cs
rename to AudioCuesheetEditor/Model/IO/Import/TextImportScheme.cs
index b1f824c4..e63c3fce 100644
--- a/AudioCuesheetEditor/Model/IO/Import/Importprofile.cs
+++ b/AudioCuesheetEditor/Model/IO/Import/TextImportScheme.cs
@@ -16,26 +16,55 @@
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.AudioCuesheet.Import;
using AudioCuesheetEditor.Model.Entity;
-using AudioCuesheetEditor.Model.Utility;
namespace AudioCuesheetEditor.Model.IO.Import
{
- public class Importprofile : Validateable
+ public class TextImportScheme : Validateable
{
public static readonly IEnumerable<String> AvailableSchemeCuesheet;
public static readonly IEnumerable<String> AvailableSchemesTrack;
- static Importprofile()
+ static TextImportScheme()
{
AvailableSchemeCuesheet = [nameof(Cuesheet.Artist), nameof(Cuesheet.Title), nameof(Cuesheet.Audiofile), nameof(Cuesheet.CDTextfile), nameof(Cuesheet.Cataloguenumber)];
AvailableSchemesTrack = [nameof(Track.Artist), nameof(Track.Title), nameof(Track.Begin), nameof(Track.End), nameof(Track.Length), nameof(Track.Position), nameof(Track.Flags), nameof(Track.PreGap), nameof(Track.PostGap), nameof(ImportTrack.StartDateTime)];
}
- public Guid Id { get; init; } = Guid.NewGuid();
- public String? Name { get; set; }
- public Boolean UseRegularExpression { get; set; }
- public String? SchemeCuesheet { get; set; }
- public String? SchemeTracks { get; set; }
- public TimeSpanFormat? TimeSpanFormat { get; set; }
+
+ public static readonly String DefaultSchemeCuesheet = @"(?'Artist'\w*) - (?'Title'\w*)\t{1,}(?'Audiofile'.*)";
+ public static readonly String DefaultSchemeTracks = @"(?'Artist'.+?) - (?'Title'.+?)\s*\t+(?'End'.+)";
+
+ public static readonly TextImportScheme DefaultTextImportScheme = new()
+ {
+ SchemeCuesheet = DefaultSchemeCuesheet,
+ SchemeTracks = DefaultSchemeTracks
+ };
+
+ private string? schemeTracks;
+ private string? schemeCuesheet;
+
+ public event EventHandler<String>? SchemeChanged;
+
+ public String? SchemeTracks
+ {
+ get { return schemeTracks; }
+ set
+ {
+ schemeTracks = value;
+ SchemeChanged?.Invoke(this, nameof(SchemeTracks));
+ OnValidateablePropertyChanged();
+ }
+ }
+
+ public String? SchemeCuesheet
+ {
+ get { return schemeCuesheet; }
+ set
+ {
+ schemeCuesheet = value;
+ SchemeChanged?.Invoke(this, nameof(SchemeCuesheet));
+ OnValidateablePropertyChanged();
+ }
+ }
public override ValidationResult Validate(string property)
{
ValidationStatus validationStatus = ValidationStatus.NoValidation;
diff --git a/AudioCuesheetEditor/Model/Options/ApplicationOptions.cs b/AudioCuesheetEditor/Model/Options/ApplicationOptions.cs
index db2d3fb3..97af692a 100644
--- a/AudioCuesheetEditor/Model/Options/ApplicationOptions.cs
+++ b/AudioCuesheetEditor/Model/Options/ApplicationOptions.cs
@@ -13,7 +13,6 @@
//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.Model.AudioCuesheet.Import;
using AudioCuesheetEditor.Model.Entity;
using AudioCuesheetEditor.Model.IO;
using AudioCuesheetEditor.Model.IO.Export;
@@ -34,35 +33,6 @@ public enum ViewMode
public class ApplicationOptions : Validateable, IOptions
{
public const LogLevel DefaultLogLevel = LogLevel.Information;
- public static readonly Importprofile DefaultSelectedImportprofile = new()
- {
- Name = "Textfile (common data in first line)",
- UseRegularExpression = false,
- SchemeCuesheet = $"{nameof(ImportCuesheet.Artist)} - {nameof(ImportCuesheet.Title)}\t{nameof(ImportCuesheet.Audiofile)}",
- SchemeTracks = $"{nameof(ImportTrack.Artist)} - {nameof(ImportTrack.Title)}\t{nameof(ImportTrack.End)}"
- };
- public static readonly ICollection<Importprofile> DefaultImportprofiles =
- [
- DefaultSelectedImportprofile,
- new()
- {
- Name = "Textfile (just track data)",
- UseRegularExpression = false,
- SchemeTracks = $"{nameof(ImportTrack.Artist)} - {nameof(ImportTrack.Title)}\t{nameof(ImportTrack.End)}"
- },
- new()
- {
- Name = "Textfile (track data seperated by ~)",
- UseRegularExpression = false,
- SchemeTracks = $"{nameof(ImportTrack.Artist)}~{nameof(ImportTrack.Title)}~{nameof(ImportTrack.StartDateTime)}"
- },
- new()
- {
- Name = "Traktor history",
- UseRegularExpression = true,
- SchemeTracks = @$"<tr>\s*<td>(?<{nameof(ImportTrack.Position)}>\d+)</td>\s*<td>(?<{nameof(ImportTrack.Artist)}>.*?)</td>\s*<td>(?<{nameof(ImportTrack.Title)}>.*?)</td>\s*<td>(?<{nameof(ImportTrack.StartDateTime)}>.*?)</td>\s*</tr>"
- }
- ];
private string? projectFilename = Projectfile.DefaultFilename;
private string? cuesheetFilename = Exportfile.DefaultCuesheetFilename;
public String? CuesheetFilename
@@ -132,29 +102,12 @@ public String? ProjectFilename
}
public TimeSpanFormat? TimeSpanFormat { get; set; }
public Boolean LinkTracks { get; set; } = true;
+ public TextImportScheme ImportScheme { get; set; } = TextImportScheme.DefaultTextImportScheme;
+ public TimeSpanFormat ImportTimeSpanFormat { get; set; } = new();
public uint RecordCountdownTimer { get; set; } = 5;
public Boolean FixedTracksTableHeader { get; set; } = false;
public String? DisplayTimeSpanFormat { get; set; }
public LogLevel MinimumLogLevel { get; set; } = DefaultLogLevel;
- [JsonInclude]
- public Guid? SelectedImportProfileId { get; private set; } = DefaultSelectedImportprofile.Id;
- public ICollection<Importprofile> ImportProfiles { get; set; } = DefaultImportprofiles;
- [JsonIgnore]
- public Importprofile? SelectedImportProfile
- {
- get => SelectedImportProfileId.HasValue ? ImportProfiles.FirstOrDefault(x => x.Id == SelectedImportProfileId) : null;
- set
- {
- if (ImportProfiles.Any(x => x.Id == value?.Id) == false)
- {
- if (value != null)
- {
- ImportProfiles.Add(value);
- }
- }
- SelectedImportProfileId = value?.Id;
- }
- }
public override ValidationResult Validate(string property)
{
diff --git a/AudioCuesheetEditor/Model/Options/ExportOptions.cs b/AudioCuesheetEditor/Model/Options/ExportOptions.cs
index dfa267a2..eb36939b 100644
--- a/AudioCuesheetEditor/Model/Options/ExportOptions.cs
+++ b/AudioCuesheetEditor/Model/Options/ExportOptions.cs
@@ -67,17 +67,7 @@ public ExportOptions(ICollection<Exportprofile> exportProfiles, Guid? selectedPr
public Exportprofile? SelectedExportProfile
{
get => SelectedProfileId.HasValue ? ExportProfiles.FirstOrDefault(x => x.Id == SelectedProfileId) : null;
- set
- {
- if (ExportProfiles.Any(x => x.Id == value?.Id) == false)
- {
- if (value != null)
- {
- ExportProfiles.Add(value);
- }
- }
- SelectedProfileId = value?.Id;
- }
+ set => SelectedProfileId = value?.Id;
}
public Guid? SelectedProfileId { get; private set; }
}
diff --git a/AudioCuesheetEditor/Program.cs b/AudioCuesheetEditor/Program.cs
index 785f743c..a6a022fe 100644
--- a/AudioCuesheetEditor/Program.cs
+++ b/AudioCuesheetEditor/Program.cs
@@ -27,8 +27,10 @@
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using MudBlazor.Services;
+using System.ComponentModel.Design;
using System.Globalization;
using System.Reflection;
+using System.Reflection.Emit;
using Toolbelt.Blazor.Extensions.DependencyInjection;
var builder = WebAssemblyHostBuilder.CreateDefault(args);
@@ -50,7 +52,7 @@
builder.Services.AddScoped<ISessionStateContainer, SessionStateContainer>();
builder.Services.AddScoped<ITraceChangeManager, TraceChangeManager>();
builder.Services.AddScoped<ImportManager>();
-builder.Services.AddScoped<ITextImportService, TextImportService>();
+builder.Services.AddScoped<TextImportService>();
builder.Services.AddScoped<CuesheetImportService>();
builder.Services.AddScoped<CuesheetExportService>();
builder.Services.AddScoped<ApplicationOptionsTimeSpanParser>();
diff --git a/AudioCuesheetEditor/Services/IO/CuesheetImportService.cs b/AudioCuesheetEditor/Services/IO/CuesheetImportService.cs
index 9f6af21d..47ad4494 100644
--- a/AudioCuesheetEditor/Services/IO/CuesheetImportService.cs
+++ b/AudioCuesheetEditor/Services/IO/CuesheetImportService.cs
@@ -16,18 +16,16 @@
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.AudioCuesheet.Import;
using AudioCuesheetEditor.Model.IO.Import;
-using System.Text;
using System.Text.RegularExpressions;
namespace AudioCuesheetEditor.Services.IO
{
public class CuesheetImportService
{
- public static IImportfile Analyse(string fileContent)
+ public static IImportfile Analyse(IEnumerable<String?> fileContent)
{
Importfile importfile = new()
{
- FileContent = fileContent,
FileType = ImportFileType.Cuesheet
};
try
@@ -57,9 +55,11 @@ public static IImportfile Analyse(string fileContent)
var regexCDTextfile = new Regex("^" + CuesheetConstants.CuesheetCDTextfile + " \"(?'" + cuesheetCDTextfileGroupName + "'.{0,})\"");
var regexCatalogueNumber = new Regex("^" + CuesheetConstants.CuesheetCatalogueNumber + " (?'" + cuesheetCatalogueNumberGroupName + "'.{0,})");
ImportTrack? track = null;
- StringBuilder recognizedContent = new();
- foreach (var line in fileContent.Split(Environment.NewLine))
+ List<String?> lines = [];
+ List<String?>? recognizedLines = [];
+ foreach (var line in fileContent)
{
+ lines.Add(line);
String? recognizedLine = line;
if (String.IsNullOrEmpty(line) == false)
{
@@ -277,9 +277,10 @@ public static IImportfile Analyse(string fileContent)
}
}
}
- recognizedContent.AppendLine(recognizedLine);
+ recognizedLines.Add(recognizedLine);
}
- importfile.FileContentRecognized = recognizedContent.ToString().TrimEnd(Environment.NewLine.ToCharArray());
+ importfile.FileContent = lines.AsReadOnly();
+ importfile.FileContentRecognized = recognizedLines.AsReadOnly();
}
catch (Exception ex)
{
diff --git a/AudioCuesheetEditor/Services/IO/FileInputManager.cs b/AudioCuesheetEditor/Services/IO/FileInputManager.cs
index 96129e13..d3ef5d12 100644
--- a/AudioCuesheetEditor/Services/IO/FileInputManager.cs
+++ b/AudioCuesheetEditor/Services/IO/FileInputManager.cs
@@ -27,7 +27,7 @@ public class FileInputManager(IJSRuntime jsRuntime, HttpClient httpClient, ILogg
private readonly HttpClient _httpClient = httpClient;
private readonly ILogger<FileInputManager> _logger = logger;
- public AudioCodec? GetAudioCodec(IBrowserFile browserFile)
+ public static AudioCodec? GetAudioCodec(IBrowserFile browserFile)
{
AudioCodec? foundAudioCodec = null;
var extension = Path.GetExtension(browserFile.Name);
@@ -37,7 +37,7 @@ public class FileInputManager(IJSRuntime jsRuntime, HttpClient httpClient, ILogg
{
foundAudioCodec = audioCodecsFound.FirstOrDefault();
}
- if (foundAudioCodec == null)
+ else
{
// Second search with mime type or file extension
audioCodecsFound = Audiofile.AudioCodecs.Where(x => x.MimeType.Equals(browserFile.ContentType, StringComparison.OrdinalIgnoreCase) || x.FileExtension.Equals(extension, StringComparison.OrdinalIgnoreCase));
@@ -46,35 +46,21 @@ public class FileInputManager(IJSRuntime jsRuntime, HttpClient httpClient, ILogg
return foundAudioCodec;
}
- public bool IsValidAudiofile(IBrowserFile browserFile)
+ public Boolean CheckFileMimeType(IBrowserFile file, String mimeType, String fileExtension)
{
- var codec = GetAudioCodec(browserFile);
- return codec != null;
- }
-
- public Boolean CheckFileMimeType(IBrowserFile file, String mimeType, IEnumerable<String> fileExtensions)
- {
- _logger.LogDebug("CheckFileMimeType called with file: file.Name: '{FileName}', file.ContentType: '{ContentType}', mimeType: '{MimeType}', fileExtensions: '{fileExtensions}'", file.Name, file.ContentType, mimeType, fileExtensions);
+ _logger.LogDebug("CheckFileMimeType called with file: file.Name: '{FileName}', file.ContentType: '{ContentType}', mimeType: '{MimeType}', fileExtension: '{FileExtension}'", file.Name, file.ContentType, mimeType, fileExtension);
Boolean fileMimeTypeMatches = false;
- if ((file != null) && (String.IsNullOrEmpty(mimeType) == false))
+ if ((file != null) && (String.IsNullOrEmpty(mimeType) == false) && (String.IsNullOrEmpty(fileExtension) == false))
{
if (String.IsNullOrEmpty(file.ContentType) == false)
{
- if (mimeType.EndsWith("/*"))
- {
- var mainType = mimeType.Substring(0, mimeType.Length - 1);
- fileMimeTypeMatches = file.ContentType.StartsWith(mainType, StringComparison.CurrentCultureIgnoreCase);
- }
- else
- {
- fileMimeTypeMatches = file.ContentType.Equals(mimeType, StringComparison.CurrentCultureIgnoreCase);
- }
+ fileMimeTypeMatches = file.ContentType.Equals(mimeType, StringComparison.CurrentCultureIgnoreCase);
}
- if ((fileMimeTypeMatches == false) && (fileExtensions.Any()))
+ if (fileMimeTypeMatches == false)
{
//Try to find by file extension
var extension = Path.GetExtension(file.Name);
- fileMimeTypeMatches = fileExtensions.Any(x => x.Equals(extension, StringComparison.CurrentCultureIgnoreCase));
+ fileMimeTypeMatches = extension.Equals(fileExtension, StringComparison.CurrentCultureIgnoreCase);
}
}
return fileMimeTypeMatches;
@@ -115,7 +101,7 @@ public Boolean CheckFileMimeType(IBrowserFile file, String mimeType, IEnumerable
CDTextfile? cdTextfile = null;
if (browserFile != null)
{
- if (CheckFileMimeType(browserFile, FileMimeTypes.Text, [FileExtensions.CDTextfile]))
+ if (CheckFileMimeType(browserFile, FileMimeTypes.CDTextfile, FileExtensions.CDTextfile))
{
cdTextfile = new CDTextfile(browserFile.Name);
}
@@ -126,11 +112,5 @@ public Boolean CheckFileMimeType(IBrowserFile file, String mimeType, IEnumerable
}
return cdTextfile;
}
-
- /// <inheritdoc/>
- public bool IsValidForImportView(IBrowserFile browserFile)
- {
- return CheckFileMimeType(browserFile, FileMimeTypes.Text, [FileExtensions.Text, FileExtensions.HTML]);
- }
}
}
diff --git a/AudioCuesheetEditor/Services/IO/IFileInputManager.cs b/AudioCuesheetEditor/Services/IO/IFileInputManager.cs
index 6bf15fef..7a7326c8 100644
--- a/AudioCuesheetEditor/Services/IO/IFileInputManager.cs
+++ b/AudioCuesheetEditor/Services/IO/IFileInputManager.cs
@@ -22,16 +22,8 @@ namespace AudioCuesheetEditor.Services.IO
{
public interface IFileInputManager
{
- bool IsValidAudiofile(IBrowserFile browserFile);
- AudioCodec? GetAudioCodec(IBrowserFile browserFile);
- bool CheckFileMimeType(IBrowserFile file, string mimeType, IEnumerable<string> fileExtensions);
+ bool CheckFileMimeType(IBrowserFile file, string mimeType, string fileExtension);
Task<Audiofile?> CreateAudiofileAsync(string? fileInputId, IBrowserFile? browserFile, Action<Task<Stream>>? afterContentStreamLoaded = null);
CDTextfile? CreateCDTextfile(IBrowserFile? browserFile);
- /// <summary>
- /// Checks if the file can be used for the import view
- /// </summary>
- /// <param name="browserFile"></param>
- /// <returns></returns>
- bool IsValidForImportView(IBrowserFile browserFile);
}
}
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/IO/ITextImportService.cs b/AudioCuesheetEditor/Services/IO/ITextImportService.cs
deleted file mode 100644
index 3f4f31a6..00000000
--- a/AudioCuesheetEditor/Services/IO/ITextImportService.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//This file is part of AudioCuesheetEditor.
-
-//AudioCuesheetEditor is free software: you can redistribute it and/or modify
-//it under the terms of the GNU General Public License as published by
-//the Free Software Foundation, either version 3 of the License, or
-//(at your option) any later version.
-
-//AudioCuesheetEditor is distributed in the hope that it will be useful,
-//but WITHOUT ANY WARRANTY; without even the implied warranty of
-//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//GNU General Public License for more details.
-
-//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.Model.IO.Import;
-
-namespace AudioCuesheetEditor.Services.IO
-{
- public interface ITextImportService
- {
- Task<IImportfile> AnalyseAsync(string fileContent);
- }
-}
\ No newline at end of file
diff --git a/AudioCuesheetEditor/Services/IO/ImportManager.cs b/AudioCuesheetEditor/Services/IO/ImportManager.cs
index 729392cf..eef38039 100644
--- a/AudioCuesheetEditor/Services/IO/ImportManager.cs
+++ b/AudioCuesheetEditor/Services/IO/ImportManager.cs
@@ -13,10 +13,14 @@
//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.Data.Options;
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.AudioCuesheet.Import;
using AudioCuesheetEditor.Model.IO;
using AudioCuesheetEditor.Model.IO.Audio;
+using AudioCuesheetEditor.Model.IO.Import;
+using AudioCuesheetEditor.Model.Options;
+using AudioCuesheetEditor.Model.Utility;
using AudioCuesheetEditor.Services.UI;
using Microsoft.AspNetCore.Components.Forms;
@@ -30,20 +34,21 @@ public enum ImportFileType
Textfile,
Audiofile
}
- public class ImportManager(ISessionStateContainer sessionStateContainer, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager, ITextImportService textImportService)
+ public class ImportManager(ISessionStateContainer sessionStateContainer, ILocalStorageOptionsProvider localStorageOptionsProvider, ITraceChangeManager traceChangeManager, IFileInputManager fileInputManager)
{
private readonly ISessionStateContainer _sessionStateContainer = sessionStateContainer;
+ private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider = localStorageOptionsProvider;
private readonly ITraceChangeManager _traceChangeManager = traceChangeManager;
private readonly IFileInputManager _fileInputManager = fileInputManager;
- private readonly ITextImportService _textImportService = textImportService;
public async Task<Dictionary<IBrowserFile, ImportFileType>> ImportFilesAsync(IEnumerable<IBrowserFile> files)
{
Dictionary<IBrowserFile, ImportFileType> importFileTypes = [];
foreach (var file in files)
{
- if (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Projectfile, [FileExtensions.Projectfile]))
+ if (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Projectfile, FileExtensions.Projectfile))
{
+ //TODO: can not be undone
var fileContent = await ReadFileContentAsync(file);
var cuesheet = Projectfile.ImportFile(fileContent.ToArray());
if (cuesheet != null)
@@ -52,31 +57,40 @@ public async Task<Dictionary<IBrowserFile, ImportFileType>> ImportFilesAsync(IEn
}
importFileTypes.Add(file, ImportFileType.ProjectFile);
}
- if (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Cuesheet, [FileExtensions.Cuesheet]))
+ if (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Cuesheet, FileExtensions.Cuesheet))
{
var fileContent = await ReadFileContentAsync(file);
fileContent.Position = 0;
using var reader = new StreamReader(fileContent);
- var stringFileContent = reader.ReadToEnd();
- ImportCuesheet(stringFileContent);
+ List<String?> lines = [];
+ while (reader.EndOfStream == false)
+ {
+ lines.Add(reader.ReadLine());
+ }
+ ImportCuesheet(lines);
importFileTypes.Add(file, ImportFileType.Cuesheet);
}
- if (_fileInputManager.IsValidForImportView(file))
+ if (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Text, FileExtensions.Text))
{
var fileContent = await ReadFileContentAsync(file);
fileContent.Position = 0;
using var reader = new StreamReader(fileContent);
- var stringFileContent = reader.ReadToEnd();
- await ImportTextAsync(stringFileContent);
+ List<String?> lines = [];
+ while (reader.EndOfStream == false)
+ {
+ lines.Add(reader.ReadLine());
+ }
+ var options = await _localStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
+ ImportText([.. lines], options.ImportScheme, options.ImportTimeSpanFormat);
importFileTypes.Add(file, ImportFileType.Textfile);
}
}
return importFileTypes;
}
- public async Task ImportTextAsync(string fileContent)
+ public void ImportText(IEnumerable<String?> fileContent, TextImportScheme textImportScheme, TimeSpanFormat timeSpanFormat)
{
- _sessionStateContainer.Importfile = await _textImportService.AnalyseAsync(fileContent);
+ _sessionStateContainer.Importfile = TextImportService.Analyse(textImportScheme, fileContent, timeSpanFormat);
if (_sessionStateContainer.Importfile.AnalysedCuesheet != null)
{
var importCuesheet = new Cuesheet();
@@ -96,7 +110,7 @@ public void ImportCuesheet()
_sessionStateContainer.ResetImport();
}
- private void ImportCuesheet(String fileContent)
+ private void ImportCuesheet(IEnumerable<String?> fileContent)
{
_sessionStateContainer.Importfile = CuesheetImportService.Analyse(fileContent);
if (_sessionStateContainer.Importfile.AnalysedCuesheet != null)
diff --git a/AudioCuesheetEditor/Services/IO/TextImportService.cs b/AudioCuesheetEditor/Services/IO/TextImportService.cs
index 92946a85..5d46e3c4 100644
--- a/AudioCuesheetEditor/Services/IO/TextImportService.cs
+++ b/AudioCuesheetEditor/Services/IO/TextImportService.cs
@@ -14,184 +14,120 @@
//along with Foobar. If not, see
//<http: //www.gnu.org/licenses />.
-using AudioCuesheetEditor.Data.Options;
using AudioCuesheetEditor.Model.AudioCuesheet;
using AudioCuesheetEditor.Model.AudioCuesheet.Import;
using AudioCuesheetEditor.Model.IO.Audio;
using AudioCuesheetEditor.Model.IO.Import;
-using AudioCuesheetEditor.Model.Options;
using AudioCuesheetEditor.Model.Utility;
using System.Reflection;
-using System.Text;
using System.Text.RegularExpressions;
namespace AudioCuesheetEditor.Services.IO
{
- public class TextImportService(ILocalStorageOptionsProvider localStorageOptionsProvider) : ITextImportService
+ public class TextImportService
{
- private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider = localStorageOptionsProvider;
-
- public async Task<IImportfile> AnalyseAsync(string fileContent)
+ public static IImportfile Analyse(TextImportScheme textImportScheme, IEnumerable<String?> fileContent, TimeSpanFormat? timeSpanFormat = null)
{
Importfile importfile = new()
{
- FileContent = fileContent,
- FileContentRecognized = fileContent,
- AnalysedCuesheet = new ImportCuesheet(),
FileType = ImportFileType.Textfile
};
try
{
- var options = await _localStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
- var importprofile = options.SelectedImportProfile ?? throw new InvalidOperationException("Selected import profiles is not set!");
- SearchForCuesheetData(ref importfile, fileContent, importprofile);
- SearchForTrackData(ref importfile, fileContent, importprofile);
- }
- catch (Exception ex)
- {
- importfile.FileContentRecognized = fileContent;
- importfile.AnalyseException = ex;
- importfile.AnalysedCuesheet = null;
- }
- return importfile;
- }
-
- private static string ApplyRegexAndMarkGroups(object entity, Regex regex, string input, TimeSpanFormat? timeSpanFormat)
- {
- return regex.Replace(input, match =>
- {
- string result = match.Value;
- var groupInfos = new List<(int RelIndex, int Length, string Value, string Key)>();
- for (int matchCounter = 1; matchCounter < match.Groups.Count; matchCounter++)
- {
- var group = match.Groups[matchCounter];
- var key = regex.GroupNameFromNumber(matchCounter);
- if (!string.IsNullOrEmpty(key) && key != matchCounter.ToString())
- {
- var property = entity.GetType().GetProperty(key, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
- if (property != null)
- {
- SetValue(entity, property, group.Value, timeSpanFormat);
- }
- int relIndex = group.Index - match.Index;
- groupInfos.Add((relIndex, group.Length, group.Value, key));
- }
- }
- if (groupInfos.Count == 0)
- {
- return result;
- }
- groupInfos.Sort((a, b) => b.RelIndex.CompareTo(a.RelIndex));
- var sb = new StringBuilder(result);
- foreach (var (RelIndex, Length, Value, Key) in groupInfos)
- {
- sb.Remove(RelIndex, Length);
- sb.Insert(RelIndex, string.Format(CuesheetConstants.RecognizedMarkHTML, Value));
- }
- return sb.ToString();
- });
- }
-
- private static void SearchForCuesheetData(ref Importfile importfile, string fileContent, Importprofile importprofile)
- {
- if (string.IsNullOrWhiteSpace(importprofile.SchemeCuesheet) == false)
- {
- var cuesheet = importfile.AnalysedCuesheet;
- Regex regex;
- if (importprofile.UseRegularExpression == true)
+ importfile.FileContent = fileContent;
+ importfile.AnalysedCuesheet = new ImportCuesheet();
+ Boolean cuesheetRecognized = false;
+ List<String?> recognizedFileContent = [];
+ Regex? regExCuesheet = null, regExTracks = null;
+ if (String.IsNullOrEmpty(textImportScheme.SchemeCuesheet) == false)
{
- regex = new Regex(importprofile.SchemeCuesheet, RegexOptions.Multiline);
+ regExCuesheet = CreateCuesheetRegexPattern(textImportScheme.SchemeCuesheet);
}
- else
+ if (String.IsNullOrEmpty(textImportScheme.SchemeTracks) == false)
{
- regex = CreateCuesheetRegexPattern(importprofile.SchemeCuesheet);
+ regExTracks = CreateTrackRegexPattern(textImportScheme.SchemeTracks);
}
-
- if (importprofile.UseRegularExpression)
+ foreach (var line in fileContent)
{
- importfile.FileContentRecognized = ApplyRegexAndMarkGroups(cuesheet!, regex, fileContent, importprofile.TimeSpanFormat);
- }
- else
- {
- var sb = new StringBuilder();
- using (var reader = new StringReader(fileContent))
+ var recognizedLine = line;
+ if (String.IsNullOrEmpty(line) == false)
{
- string? line;
- while ((line = reader.ReadLine()) != null)
+ Boolean recognized = false;
+ if ((recognized == false) && (cuesheetRecognized == false) && (regExCuesheet != null))
{
- var markedLine = ApplyRegexAndMarkGroups(cuesheet!, regex, line, importprofile.TimeSpanFormat);
- sb.AppendLine(markedLine);
- if (!string.Equals(markedLine, line))
- {
- //We found the first occurence, break the loop
- //Attach the rest of the file to FileContentRecognized
- sb.Append(reader.ReadToEnd());
- break;
- }
+ recognizedLine = AnalyseLine(line, importfile.AnalysedCuesheet, regExCuesheet, timeSpanFormat);
+ recognized = recognizedLine != null;
+ cuesheetRecognized = recognizedLine != null;
+ }
+ if ((recognized == false) && (regExTracks != null))
+ {
+ var track = new ImportTrack();
+ recognizedLine = AnalyseLine(line, track, regExTracks, timeSpanFormat);
+ recognized = recognizedLine != null;
+ importfile.AnalysedCuesheet.Tracks.Add(track);
}
}
- importfile.FileContentRecognized = sb.ToString();
+ recognizedFileContent.Add(recognizedLine);
+ }
+ if (recognizedFileContent.Count > 0)
+ {
+ importfile.FileContentRecognized = recognizedFileContent.AsReadOnly();
}
}
+ catch (Exception ex)
+ {
+ importfile.FileContent = fileContent;
+ importfile.FileContentRecognized = fileContent;
+ importfile.AnalyseException = ex;
+ importfile.AnalysedCuesheet = null;
+ }
+ return importfile;
}
- private static void SearchForTrackData(ref Importfile importfile, string fileContent, Importprofile importprofile)
+ private static String? AnalyseLine(String line, object entity, Regex regex, TimeSpanFormat? timeSpanFormat)
{
- if (string.IsNullOrWhiteSpace(importprofile.SchemeTracks) == false)
+ String? recognized = null;
+ string? recognizedLine = line;
+ if (String.IsNullOrEmpty(line) == false)
{
- Regex regex;
- if (importprofile.UseRegularExpression == true)
- {
- regex = new Regex(importprofile.SchemeTracks, RegexOptions.Multiline);
- }
- else
- {
- regex = CreateTrackRegexPattern(importprofile.SchemeTracks);
- }
-
- var cuesheet = importfile.AnalysedCuesheet;
- importfile.FileContentRecognized ??= fileContent;
- if (importprofile.UseRegularExpression)
- {
-
- importfile.FileContentRecognized = regex.Replace(importfile.FileContentRecognized,
- match =>
- {
- var track = new ImportTrack();
- string marked = ApplyRegexAndMarkGroups(track, regex, match.Value, importprofile.TimeSpanFormat);
- cuesheet!.Tracks.Add(track);
- return marked;
- }
- );
- }
- else
+ var match = regex.Match(line);
+ if (match.Success)
{
- var sb = new StringBuilder();
- using (var reader = new StringReader(importfile.FileContentRecognized))
+ for (int groupCounter = 1; groupCounter < match.Groups.Count; groupCounter++)
{
- string? line;
- while ((line = reader.ReadLine()) != null)
+ var key = match.Groups.Keys.ElementAt(groupCounter);
+ var group = match.Groups.GetValueOrDefault(key);
+ if ((group != null) && (group.Success))
{
- // Check if this line is already analyzed
- if (line.Contains(CuesheetConstants.MarkHTMLStart) == false)
+ var property = entity.GetType().GetProperty(key, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+ if (property != null)
{
- var track = new ImportTrack();
- var markedLine = ApplyRegexAndMarkGroups(track, regex, line, importprofile.TimeSpanFormat);
- if (!string.Equals(markedLine, line))
- {
- cuesheet!.Tracks.Add(track);
- }
- sb.AppendLine(markedLine);
+ SetValue(entity, property, group.Value, timeSpanFormat);
+ recognizedLine = string.Concat(recognizedLine.AsSpan(0, group.Index + (13 * (groupCounter - 1)))
+ , String.Format(CuesheetConstants.RecognizedMarkHTML, group.Value)
+ , recognizedLine.AsSpan(group.Index + (13 * (groupCounter - 1)) + group.Length));
}
else
{
- sb.AppendLine(line);
+ throw new NullReferenceException(String.Format("Property '{0}' was not found for line content {1}", key, line));
}
}
+ else
+ {
+ throw new NullReferenceException(String.Format("Group '{0}' could not be found!", key));
+ }
+ }
+ if (recognizedLine.Contains(CuesheetConstants.RecognizedMarkHTML.Substring(0, CuesheetConstants.RecognizedMarkHTML.IndexOf("{0}"))))
+ {
+ recognized = recognizedLine;
}
- importfile.FileContentRecognized = sb.ToString().TrimEnd(Environment.NewLine.ToCharArray());
+ }
+ else
+ {
+ recognized = line;
}
}
+ return recognized;
}
private static void SetValue(object entity, PropertyInfo property, string value, TimeSpanFormat? timeSpanFormat)
@@ -227,135 +163,57 @@ private static void SetValue(object entity, PropertyInfo property, string value,
private static Regex CreateCuesheetRegexPattern(string scheme)
{
- string[] fieldNames =
- [
- nameof(ImportCuesheet.Artist),
- nameof(ImportCuesheet.Title),
- nameof(ImportCuesheet.Audiofile),
- nameof(ImportCuesheet.CDTextfile),
- nameof(ImportCuesheet.Cataloguenumber)
- ];
- var parts = new List<string>();
- int idx = 0;
- while (idx < scheme.Length)
+ var regex = new Regex(scheme);
+ var groupNames = regex.GetGroupNames();
+ //GroupNames always has a group "0", so we count for more than one group
+ if (groupNames.Any(x => x != "0"))
{
- var field = fieldNames.FirstOrDefault(fn => scheme.IndexOf(fn, idx, StringComparison.Ordinal) == idx);
- if (field != null)
- {
- parts.Add(field);
- idx += field.Length;
- }
- else
- {
- int nextFieldIdx = scheme.Length;
- foreach (var fn in fieldNames)
- {
- int pos = scheme.IndexOf(fn, idx, StringComparison.Ordinal);
- if (pos >= 0 && pos < nextFieldIdx)
- {
- nextFieldIdx = pos;
- }
- }
- string separator = scheme.Substring(idx, nextFieldIdx - idx);
- parts.Add(separator);
- idx = nextFieldIdx;
- }
+ return regex;
}
-
- var regexBuilder = new StringBuilder("^");
- for (int i = 0; i < parts.Count; i++)
+ else
{
- var part = parts[i];
- if (fieldNames.Contains(part))
- {
- bool isLast = i == parts.Count - 1 || parts.Skip(i + 1).All(p => !fieldNames.Contains(p));
- if (isLast)
- {
- regexBuilder.Append($@"(?<{part}>.+)");
- }
- else
- {
- regexBuilder.Append($@"(?<{part}>.+?)");
- }
- }
- else
- {
- string sep = Regex.Escape(part).Replace("\\t", @"\t{1,}");
- regexBuilder.Append(sep);
- }
- }
- regexBuilder.Append('$');
+ var regexString = Regex.Escape(scheme);
- return new Regex(regexBuilder.ToString());
+ regexString = regexString.Replace(nameof(Cuesheet.Artist), $"(?<{nameof(Cuesheet.Artist)}>.+)");
+ regexString = regexString.Replace(nameof(Cuesheet.Title), $"(?<{nameof(Cuesheet.Title)}>.+)");
+ regexString = regexString.Replace(nameof(Cuesheet.Audiofile), $"(?<{nameof(Cuesheet.Audiofile)}>.+)");
+ regexString = regexString.Replace(nameof(Cuesheet.CDTextfile), $"(?<{nameof(Cuesheet.CDTextfile)}>.+)");
+ regexString = regexString.Replace(nameof(Cuesheet.Cataloguenumber), $"(?<{nameof(Cuesheet.Cataloguenumber)}>.+)");
+ //Replace tab with non matching group
+ regexString = regexString.Replace("\\t", "(?:...\\t)");
+
+ return new Regex(regexString);
+ }
}
private static Regex CreateTrackRegexPattern(string scheme)
{
- string[] fieldNames =
- [
- nameof(ImportTrack.Artist),
- nameof(ImportTrack.Title),
- nameof(ImportTrack.Begin),
- nameof(ImportTrack.End),
- nameof(ImportTrack.Length),
- nameof(ImportTrack.Position),
- nameof(ImportTrack.Flags),
- nameof(ImportTrack.PreGap),
- nameof(ImportTrack.PostGap),
- nameof(ImportTrack.StartDateTime)
- ];
- var parts = new List<string>();
- int idx = 0;
- while (idx < scheme.Length)
+ var regex = new Regex(scheme);
+ var groupNames = regex.GetGroupNames();
+ //GroupNames always has a group "0", so we count for more than one group
+ if (groupNames.Any(x => x != "0"))
{
- var field = fieldNames.FirstOrDefault(fn => scheme.IndexOf(fn, idx, StringComparison.Ordinal) == idx);
- if (field != null)
- {
- parts.Add(field);
- idx += field.Length;
- }
- else
- {
- int nextFieldIdx = scheme.Length;
- foreach (var fn in fieldNames)
- {
- int pos = scheme.IndexOf(fn, idx, StringComparison.Ordinal);
- if (pos >= 0 && pos < nextFieldIdx)
- {
- nextFieldIdx = pos;
- }
- }
- string separator = scheme.Substring(idx, nextFieldIdx - idx);
- parts.Add(separator);
- idx = nextFieldIdx;
- }
+ return regex;
}
-
- var regexBuilder = new StringBuilder("^");
- for (int i = 0; i < parts.Count; i++)
- {
- var part = parts[i];
- if (fieldNames.Contains(part))
- {
- bool isLast = i == parts.Count - 1 || parts.Skip(i + 1).All(p => !fieldNames.Contains(p));
- if (isLast)
- {
- regexBuilder.Append($@"(?<{part}>.+)");
- }
- else
- {
- regexBuilder.Append($@"(?<{part}>.+?)");
- }
- }
- else
- {
- string sep = Regex.Escape(part).Replace("\\t", @"\t{1,}");
- regexBuilder.Append(sep);
- }
+ else
+ {
+ var regexString = Regex.Escape(scheme);
+
+ regexString = regexString.Replace(nameof(ImportTrack.Artist), $"(?<{nameof(ImportTrack.Artist)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.Title), $"(?<{nameof(ImportTrack.Title)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.Begin), $"(?<{nameof(ImportTrack.Begin)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.End), $"(?<{nameof(ImportTrack.End)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.Length), $"(?<{nameof(ImportTrack.Length)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.Position), $"(?<{nameof(ImportTrack.Position)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.Flags), $"(?<{nameof(ImportTrack.Flags)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.PreGap), $"(?<{nameof(ImportTrack.PreGap)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.PostGap), $"(?<{nameof(ImportTrack.PostGap)}>.+)");
+ regexString = regexString.Replace(nameof(ImportTrack.StartDateTime), $"(?<{nameof(ImportTrack.StartDateTime)}>.+)");
+ //Replace tab with non matching group
+ regexString = regexString.Replace("\\t", "(?:...\\t)");
+
+ return new Regex(regexString);
}
- regexBuilder.Append('$');
-
- return new Regex(regexBuilder.ToString());
}
}
}
diff --git a/AudioCuesheetEditor/Shared/AppBar.razor b/AudioCuesheetEditor/Shared/AppBar.razor
index 522e2cf8..c4413df8 100644
--- a/AudioCuesheetEditor/Shared/AppBar.razor
+++ b/AudioCuesheetEditor/Shared/AppBar.razor
@@ -35,10 +35,10 @@ along with Foobar. If not, see
{
<MudButtonGroup Color="Color.Primary" Variant="Variant.Filled" OverrideStyles>
<MudTooltip Text="@_localizer["Undo last edit"]">
- <MudIconButton Icon="@Icons.Material.Outlined.Undo" aria-label="undo" Disabled="!TraceChangeManager.CanUndo" OnClick="() => TraceChangeManager.Undo()" />
+ <MudIconButton Icon="@Icons.Material.Outlined.Undo" Disabled="!TraceChangeManager.CanUndo" OnClick="() => TraceChangeManager.Undo()" />
</MudTooltip>
<MudTooltip Text="@_localizer["Redo last edit"]">
- <MudIconButton Icon="@Icons.Material.Outlined.Redo" aria-label="redo" Disabled="!TraceChangeManager.CanRedo" OnClick="() => TraceChangeManager.Redo()" />
+ <MudIconButton Icon="@Icons.Material.Outlined.Redo" Disabled="!TraceChangeManager.CanRedo" OnClick="() => TraceChangeManager.Redo()" />
</MudTooltip>
</MudButtonGroup>
}
diff --git a/AudioCuesheetEditor/Shared/Cuesheet/EditSections.razor b/AudioCuesheetEditor/Shared/Cuesheet/EditSections.razor
index 7f5d21f4..412434c1 100644
--- a/AudioCuesheetEditor/Shared/Cuesheet/EditSections.razor
+++ b/AudioCuesheetEditor/Shared/Cuesheet/EditSections.razor
@@ -21,7 +21,6 @@ along with Foobar. If not, see
@inject ApplicationOptionsTimeSpanParser _applicationOptionsTimeSpanParser
@inject ValidationService _validationService
@inject IDialogService _dialogService
-@inject IFileInputManager _fileInputManager
<MudButtonGroup OverrideStyles="false">
<MudTooltip Text="@_localizer["Add new section"]">
@@ -129,9 +128,13 @@ along with Foobar. If not, see
void AudiofileSelected(CuesheetSection section, IBrowserFile? browserFile)
{
- if ((browserFile != null) && (_fileInputManager.IsValidAudiofile(browserFile) == true))
+ if (browserFile != null)
{
- section.AudiofileName = browserFile?.Name;
+ var codec = FileInputManager.GetAudioCodec(browserFile);
+ if (codec != null)
+ {
+ section.AudiofileName = browserFile?.Name;
+ }
}
else
{
diff --git a/AudioCuesheetEditor/Shared/Dialogs/SelectFileDialog.razor b/AudioCuesheetEditor/Shared/Dialogs/SelectFileDialog.razor
index 8198bb4f..68e64b89 100644
--- a/AudioCuesheetEditor/Shared/Dialogs/SelectFileDialog.razor
+++ b/AudioCuesheetEditor/Shared/Dialogs/SelectFileDialog.razor
@@ -51,8 +51,8 @@ along with Foobar. If not, see
invalidDropFileNames.Clear();
foreach (var file in files)
{
- if ((_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Projectfile, [FileExtensions.Projectfile]) == false)
- && (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Cuesheet, [FileExtensions.Cuesheet]) == false))
+ if ((_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Projectfile, FileExtensions.Projectfile) == false)
+ && (_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Cuesheet, FileExtensions.Cuesheet) == false))
{
invalidDropFileNames.Add(file.Name);
}
diff --git a/AudioCuesheetEditor/Shared/Import/ImportFileContent.razor b/AudioCuesheetEditor/Shared/Import/ImportFileContent.razor
index c8c5c83a..d90881ca 100644
--- a/AudioCuesheetEditor/Shared/Import/ImportFileContent.razor
+++ b/AudioCuesheetEditor/Shared/Import/ImportFileContent.razor
@@ -21,34 +21,43 @@ along with Foobar. If not, see
@inject ISessionStateContainer _sessionStateContainer
<MudTabs Rounded ApplyEffectsToContainer Outlined Color="Color.Success">
- <MudTabPanel Text="@_localizer["Analyzed file content"]" Icon="@Icons.Material.Outlined.Analytics">
- <MudField Class="ml-2 mr-2">
- <pre>
- @if (FileContentRecognized != null)
- {
- @((MarkupString)SanitizeHTML(FileContentRecognized))
- }
- </pre>
- </MudField>
- </MudTabPanel>
- <MudTabPanel Text="@_localizer["Edit"]" Icon="@Icons.Material.Outlined.Edit">
- <MudTextField Class="ml-2 mr-2" T="string" AutoGrow Text="@_sessionStateContainer.Importfile?.FileContent" TextChanged="FileContent_TextChangedAsync" />
- </MudTabPanel>
+ @if (FileContentRecognized != null)
+ {
+ <MudTabPanel Text="@_localizer["Analyzed file content"]" Icon="@Icons.Material.Outlined.Analytics">
+ <MudField Class="ml-2 mr-2">
+ <pre>
+ @foreach (var line in FileContentRecognized)
+ {
+ @((MarkupString)String.Format("{0}<br />", line))
+ }
+ </pre>
+ </MudField>
+ </MudTabPanel>
+ <MudTabPanel Text="@_localizer["Edit"]" Icon="@Icons.Material.Outlined.Edit">
+ <MudTextField Class="ml-2 mr-2" T="string" Lines="@FileContentRecognized.Count()" AutoGrow Text="@FileContent" TextChanged="FileContent_TextChangedAsync" />
+ </MudTabPanel>
+ }
</MudTabs>
@code {
[Parameter]
public EventCallback<string> FileContentChanged { get; set; }
- public String? FileContentRecognized => _sessionStateContainer.Importfile?.FileContentRecognized;
-
- async Task FileContent_TextChangedAsync(string newFileContent)
+ public IEnumerable<String?>? FileContentRecognized => _sessionStateContainer.Importfile?.FileContentRecognized;
+ public String FileContent
{
- await FileContentChanged.InvokeAsync(newFileContent);
+ get
+ {
+ String fileContent = String.Empty;
+ if (_sessionStateContainer.Importfile?.FileContent != null)
+ {
+ fileContent = String.Join(Environment.NewLine, _sessionStateContainer.Importfile.FileContent);
+ }
+ return fileContent;
+ }
}
- string SanitizeHTML(string input)
+ async Task FileContent_TextChangedAsync(string newFileContent)
{
- var sanitizer = new HtmlSanitizer();
- return sanitizer.Sanitize(input);
+ await FileContentChanged.InvokeAsync(newFileContent);
}
}
diff --git a/AudioCuesheetEditor/Shared/Import/Importprofiles.de.resx b/AudioCuesheetEditor/Shared/Import/ImportSchemes.de.resx
similarity index 82%
rename from AudioCuesheetEditor/Shared/Import/Importprofiles.de.resx
rename to AudioCuesheetEditor/Shared/Import/ImportSchemes.de.resx
index a7736980..1262de70 100644
--- a/AudioCuesheetEditor/Shared/Import/Importprofiles.de.resx
+++ b/AudioCuesheetEditor/Shared/Import/ImportSchemes.de.resx
@@ -117,8 +117,11 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="Are you sure you want to reset the import profiles to factory default?" xml:space="preserve">
- <value>Möchten Sie wirklich die Importprofile auf Werkseinstellungen zurücksetzen?</value>
+ <data name="Add placeholder" xml:space="preserve">
+ <value>Platzhalter hinzufügen</value>
+ </data>
+ <data name="Are you sure you want to reset the import schemes to factory default?" xml:space="preserve">
+ <value>Möchten Sie wirklich die Importschemata auf Werkseinstellungen zurücksetzen?</value>
</data>
<data name="Artist" xml:space="preserve">
<value>Künstler</value>
@@ -127,7 +130,7 @@
<value>Audiodatei</value>
</data>
<data name="Begin" xml:space="preserve">
- <value>Beginn</value>
+ <value>Start</value>
</data>
<data name="Cataloguenumber" xml:space="preserve">
<value>Katalognummer</value>
@@ -144,26 +147,14 @@
<data name="End" xml:space="preserve">
<value>Ende</value>
</data>
- <data name="Enter the common data scheme for this profile here" xml:space="preserve">
- <value>Geben Sie hier das Allgemeine Informationen Schema für das Profil an</value>
- </data>
- <data name="Enter the name for this profile here" xml:space="preserve">
- <value>Geben Sie hier den Namen für das Profil an</value>
- </data>
- <data name="Enter the time format for this profile here" xml:space="preserve">
- <value>Geben Sie hier das Zeitformat für das Profil an</value>
- </data>
- <data name="Enter the track scheme for this profile here" xml:space="preserve">
- <value>Geben Sie hier das Titel Schema für das Profil an</value>
- </data>
<data name="Flags" xml:space="preserve">
<value>Markierungen</value>
</data>
<data name="Hours" xml:space="preserve">
<value>Stunden</value>
</data>
- <data name="Import profile" xml:space="preserve">
- <value>Import Profil</value>
+ <data name="Import schemes" xml:space="preserve">
+ <value>Importschemata</value>
</data>
<data name="Length" xml:space="preserve">
<value>Länge</value>
@@ -174,12 +165,6 @@
<data name="Minutes" xml:space="preserve">
<value>Minuten</value>
</data>
- <data name="Name" xml:space="preserve">
- <value>Name</value>
- </data>
- <data name="New import profile" xml:space="preserve">
- <value>Neues Importprofil</value>
- </data>
<data name="Position" xml:space="preserve">
<value>Position</value>
</data>
@@ -189,24 +174,18 @@
<data name="PreGap" xml:space="preserve">
<value>Vorlücke</value>
</data>
- <data name="Profile name" xml:space="preserve">
- <value>Profil Name</value>
- </data>
- <data name="Scheme common data" xml:space="preserve">
- <value>Schema Allgemeine Informationen</value>
- </data>
- <data name="Scheme tracks" xml:space="preserve">
- <value>Schema Titel</value>
- </data>
- <data name="Search using regular expressions" xml:space="preserve">
- <value>Suche mit regulären Ausdrücken</value>
- </data>
<data name="Seconds" xml:space="preserve">
<value>Sekunden</value>
</data>
<data name="StartDateTime" xml:space="preserve">
<value>Startzeitpunkt</value>
</data>
+ <data name="Textimport scheme cuesheet" xml:space="preserve">
+ <value>Textimportschema Cuesheet</value>
+ </data>
+ <data name="Textimport scheme tracks" xml:space="preserve">
+ <value>Textimportschema Titel</value>
+ </data>
<data name="Time input format for import" xml:space="preserve">
<value>Zeitformat für den Import</value>
</data>
diff --git a/AudioCuesheetEditor/Shared/Import/ImportSchemes.razor b/AudioCuesheetEditor/Shared/Import/ImportSchemes.razor
new file mode 100644
index 00000000..29de29ff
--- /dev/null
+++ b/AudioCuesheetEditor/Shared/Import/ImportSchemes.razor
@@ -0,0 +1,133 @@
+@using System.Linq.Expressions
+<!--
+This file is part of AudioCuesheetEditor.
+
+AudioCuesheetEditor is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+AudioCuesheetEditor is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar. If not, see
+<http: //www.gnu.org/licenses />.
+-->
+@inherits BaseLocalizedComponent
+
+@inject IStringLocalizer<ImportSchemes> _localizer
+@inject ValidationService _validationService
+@inject IDialogService _dialogService
+
+<MudStack Row AlignItems="AlignItems.Baseline" Justify="Justify.SpaceBetween">
+ <MudText Typo="Typo.h5">@_localizer["Import schemes"]</MudText>
+ <MudIconButton Icon="@Icons.Material.Outlined.LockReset" Color="Color.Warning" Variant="Variant.Filled" OnClick="ResetSchemes" />
+</MudStack>
+<MudStack Row AlignItems="AlignItems.Baseline">
+ <MudTextField T="string" @ref="importSchemeCuesheetTextField" Label="@_localizer["Textimport scheme cuesheet"]" Text="@ApplicationOptions?.ImportScheme.SchemeCuesheet"
+ TextChanged="ImportSchemeCuesheetTextChangedAsync" Clearable Error="String.IsNullOrEmpty(GetValidationErrorMessage(ApplicationOptions?.ImportScheme, nameof(TextImportScheme.SchemeCuesheet))) == false"
+ ErrorText="@GetValidationErrorMessage(ApplicationOptions?.ImportScheme, nameof(TextImportScheme.SchemeCuesheet))" />
+ <MudMenu Label="@_localizer["Add placeholder"]" Color="Color.Primary" Variant="Variant.Filled" EndIcon="@Icons.Material.Outlined.KeyboardArrowDown">
+ @foreach (var scheme in TextImportScheme.AvailableSchemeCuesheet)
+ {
+ <MudMenuItem OnClick="() => AppendPlaceholderToTextField(importSchemeCuesheetTextField, scheme)">@_localizer[scheme]</MudMenuItem>
+ }
+ </MudMenu>
+</MudStack>
+<MudStack Row AlignItems="AlignItems.Baseline">
+ <MudTextField T="string" @ref="importSchemeTracksTextField" Label="@_localizer["Textimport scheme tracks"]" Text="@ApplicationOptions?.ImportScheme.SchemeTracks"
+ TextChanged="ImportSchemeTracksTextChangedAsync" Clearable Error="String.IsNullOrEmpty(GetValidationErrorMessage(ApplicationOptions?.ImportScheme, nameof(TextImportScheme.SchemeTracks))) == false"
+ ErrorText="@GetValidationErrorMessage(ApplicationOptions?.ImportScheme, nameof(TextImportScheme.SchemeTracks))" />
+ <MudMenu Label="@_localizer["Add placeholder"]" Color="Color.Primary" Variant="Variant.Filled" EndIcon="@Icons.Material.Outlined.KeyboardArrowDown">
+ @foreach (var scheme in TextImportScheme.AvailableSchemesTrack)
+ {
+ <MudMenuItem OnClick="() => AppendPlaceholderToTextField(importSchemeTracksTextField, scheme)">@_localizer[scheme]</MudMenuItem>
+ }
+ </MudMenu>
+</MudStack>
+<MudStack Row AlignItems="AlignItems.Baseline">
+ <MudTextField T="string" @ref="importTimeInputFormatTextField" Label="@_localizer["Time input format for import"]" Text="@ApplicationOptions?.ImportTimeSpanFormat?.Scheme"
+ TextChanged="ImportTimeInputFormatChangedAsync" Clearable Error="String.IsNullOrEmpty(GetValidationErrorMessage(ApplicationOptions?.ImportTimeSpanFormat, nameof(TimeSpanFormat.Scheme))) == false"
+ ErrorText="@GetValidationErrorMessage(ApplicationOptions?.ImportTimeSpanFormat, nameof(TimeSpanFormat.Scheme))" />
+ <MudMenu Label="@_localizer["Add placeholder"]" Color="Color.Primary" Variant="Variant.Filled" EndIcon="@Icons.Material.Outlined.KeyboardArrowDown">
+ @foreach (var scheme in TimeSpanFormat.AvailableTimespanScheme)
+ {
+ <MudMenuItem OnClick="() => AppendPlaceholderToTextField(importTimeInputFormatTextField, scheme)">@_localizer[scheme]</MudMenuItem>
+ }
+ </MudMenu>
+</MudStack>
+
+@code {
+ [Parameter]
+ public EventCallback<string> ImportSchemeCuesheetChanged { get; set; }
+
+ [Parameter]
+ public EventCallback<string> ImportSchemeTracksChanged { get; set; }
+
+ [Parameter]
+ public EventCallback<string> ImportTimeInputFormatChanged { get; set; }
+
+ MudTextField<string>? importSchemeCuesheetTextField, importSchemeTracksTextField, importTimeInputFormatTextField;
+
+ void AppendPlaceholderToTextField(MudTextField<string>? mudTextField, string placeholder)
+ {
+ mudTextField?.SetText($"{mudTextField.Text}{placeholder}");
+ }
+
+ async Task ImportSchemeCuesheetTextChangedAsync(string newScheme)
+ {
+ await LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.ImportScheme.SchemeCuesheet, newScheme);
+ await ImportSchemeCuesheetChanged.InvokeAsync(newScheme);
+ }
+
+ async Task ImportSchemeTracksTextChangedAsync(string newScheme)
+ {
+ await LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.ImportScheme.SchemeTracks, newScheme);
+ await ImportSchemeTracksChanged.InvokeAsync(newScheme);
+ }
+
+ async Task ImportTimeInputFormatChangedAsync(string newScheme)
+ {
+ await LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.ImportTimeSpanFormat.Scheme, newScheme);
+ await ImportTimeInputFormatChanged.InvokeAsync(newScheme);
+ }
+
+ String? GetValidationErrorMessage(object? model, string propertyName)
+ {
+ String? validationErrorMessage = null;
+ if (model != null)
+ {
+ var validationMessages = _validationService.Validate(model, propertyName);
+ if (validationMessages.Count() > 0)
+ {
+ validationErrorMessage = String.Join(Environment.NewLine, validationMessages);
+ }
+ }
+ return validationErrorMessage;
+ }
+
+ async Task ResetSchemes()
+ {
+ if (ApplicationOptions != null)
+ {
+ var parameters = new DialogParameters<ConfirmDialog>
+ {
+ { x => x.ConfirmText, _localizer["Are you sure you want to reset the import schemes to factory default?"] },
+ };
+ var dialog = await _dialogService.ShowAsync<ConfirmDialog>(_localizer["Confirm"], parameters);
+ var result = await dialog.Result;
+ if (result?.Canceled == false)
+ {
+ ApplicationOptions.ImportScheme = TextImportScheme.DefaultTextImportScheme;
+ ApplicationOptions.ImportTimeSpanFormat = new();
+ await LocalStorageOptionsProvider.SaveOptionsAsync(ApplicationOptions);
+ await ImportSchemeCuesheetChanged.InvokeAsync(ApplicationOptions.ImportScheme.SchemeCuesheet);
+ await ImportSchemeTracksChanged.InvokeAsync(ApplicationOptions.ImportScheme.SchemeTracks);
+ await ImportTimeInputFormatChanged.InvokeAsync(ApplicationOptions.ImportTimeSpanFormat.Scheme);
+ }
+ }
+ }
+}
diff --git a/AudioCuesheetEditor/Shared/Import/Importprofiles.resx b/AudioCuesheetEditor/Shared/Import/ImportSchemes.resx
similarity index 83%
rename from AudioCuesheetEditor/Shared/Import/Importprofiles.resx
rename to AudioCuesheetEditor/Shared/Import/ImportSchemes.resx
index 5bd62cc2..e6597bc9 100644
--- a/AudioCuesheetEditor/Shared/Import/Importprofiles.resx
+++ b/AudioCuesheetEditor/Shared/Import/ImportSchemes.resx
@@ -117,8 +117,11 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="Are you sure you want to reset the import profiles to factory default?" xml:space="preserve">
- <value>Are you sure you want to reset the import profiles to factory default?</value>
+ <data name="Add placeholder" xml:space="preserve">
+ <value>Add placeholder</value>
+ </data>
+ <data name="Are you sure you want to reset the import schemes to factory default?" xml:space="preserve">
+ <value>Are you sure you want to reset the import schemes to factory default?</value>
</data>
<data name="Artist" xml:space="preserve">
<value>Artist</value>
@@ -144,26 +147,14 @@
<data name="End" xml:space="preserve">
<value>End</value>
</data>
- <data name="Enter the common data scheme for this profile here" xml:space="preserve">
- <value>Enter the common data scheme for this profile here</value>
- </data>
- <data name="Enter the name for this profile here" xml:space="preserve">
- <value>Enter the name for this profile here</value>
- </data>
- <data name="Enter the time format for this profile here" xml:space="preserve">
- <value>Enter the time format for this profile here</value>
- </data>
- <data name="Enter the track scheme for this profile here" xml:space="preserve">
- <value>Enter the track scheme for this profile here</value>
- </data>
<data name="Flags" xml:space="preserve">
<value>Flags</value>
</data>
<data name="Hours" xml:space="preserve">
<value>Hours</value>
</data>
- <data name="Import profile" xml:space="preserve">
- <value>Import profile</value>
+ <data name="Import schemes" xml:space="preserve">
+ <value>Import schemes</value>
</data>
<data name="Length" xml:space="preserve">
<value>Length</value>
@@ -174,12 +165,6 @@
<data name="Minutes" xml:space="preserve">
<value>Minutes</value>
</data>
- <data name="Name" xml:space="preserve">
- <value>Name</value>
- </data>
- <data name="New import profile" xml:space="preserve">
- <value>New import profile</value>
- </data>
<data name="Position" xml:space="preserve">
<value>Position</value>
</data>
@@ -189,24 +174,18 @@
<data name="PreGap" xml:space="preserve">
<value>PreGap</value>
</data>
- <data name="Profile name" xml:space="preserve">
- <value>Profile name</value>
- </data>
- <data name="Scheme common data" xml:space="preserve">
- <value>Scheme common data</value>
- </data>
- <data name="Scheme tracks" xml:space="preserve">
- <value>Scheme tracks</value>
- </data>
- <data name="Search using regular expressions" xml:space="preserve">
- <value>Search using regular expressions</value>
- </data>
<data name="Seconds" xml:space="preserve">
<value>Seconds</value>
</data>
<data name="StartDateTime" xml:space="preserve">
<value>StartDateTime</value>
</data>
+ <data name="Textimport scheme cuesheet" xml:space="preserve">
+ <value>Textimport scheme cuesheet</value>
+ </data>
+ <data name="Textimport scheme tracks" xml:space="preserve">
+ <value>Textimport scheme tracks</value>
+ </data>
<data name="Time input format for import" xml:space="preserve">
<value>Time input format for import</value>
</data>
diff --git a/AudioCuesheetEditor/Shared/Import/Importprofiles.razor b/AudioCuesheetEditor/Shared/Import/Importprofiles.razor
deleted file mode 100644
index 9925e1c2..00000000
--- a/AudioCuesheetEditor/Shared/Import/Importprofiles.razor
+++ /dev/null
@@ -1,200 +0,0 @@
-@using System.Linq.Expressions
-<!--
-This file is part of AudioCuesheetEditor.
-
-AudioCuesheetEditor is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-AudioCuesheetEditor is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar. If not, see
-<http: //www.gnu.org/licenses />.
--->
-@inherits BaseLocalizedComponent
-
-@inject IStringLocalizer<Importprofiles> _localizer
-@inject ValidationService _validationService
-@inject IDialogService _dialogService
-
-@if (ApplicationOptions != null)
-{
- <MudStack Row>
- <MudSelect T="Importprofile" Variant="Variant.Outlined" Label="@_localizer["Import profile"]" Value="ApplicationOptions.SelectedImportProfile" ValueChanged="SelectedImportProfileChangedAsync">
- @foreach (var profile in ApplicationOptions.ImportProfiles)
- {
- <MudSelectItem Value="profile">@profile.Name</MudSelectItem>
- }
- </MudSelect>
- <MudButtonGroup OverrideStyles="false" Class="mt-2" Style="height: 56px;">
- <MudIconButton Color="Color.Primary" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Add" OnClick="AddImportprofileClick" />
- <MudIconButton Color="Color.Warning" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.Delete" Disabled="ApplicationOptions.SelectedImportProfile == null" OnClick="DeleteImportprofileClick" />
- <MudIconButton Color="Color.Error" Variant="Variant.Filled" Icon="@Icons.Material.Outlined.LockReset" OnClick="ResetSchemes" />
- </MudButtonGroup>
- </MudStack>
- <MudTextField T="string" Value="ApplicationOptions.SelectedImportProfile?.Name" Disabled="ApplicationOptions.SelectedImportProfile == null" ValueChanged="(newValue) => LocalStorageOptionsProvider.SaveNestedOptionValueAsync<ApplicationOptions, Importprofile?, String?>(x => x.SelectedImportProfile, x => x!.Name, newValue)" Error="String.IsNullOrEmpty(GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile, nameof(Importprofile.Name))) == false" ErrorText="@GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile, nameof(Importprofile.Name))" Label="@_localizer["Profile name"]" Placeholder="@_localizer["Enter the name for this profile here"]" Variant="Variant.Outlined" />
- <MudSwitch T="Boolean?" Color="Color.Secondary" Value="ApplicationOptions.SelectedImportProfile?.UseRegularExpression" Disabled="ApplicationOptions.SelectedImportProfile == null" ValueChanged="UseRegularExpressionChangedAsync" Label="@_localizer["Search using regular expressions"]" />
- <MudStack Row>
- <MudTextField T="string" @ref="schemeCuesheetTextField" Text="@ApplicationOptions.SelectedImportProfile?.SchemeCuesheet" TextChanged="SchemeCuesheetChangedAsync"
- Error="String.IsNullOrEmpty(GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile, nameof(Importprofile.SchemeCuesheet))) == false" ErrorText="@GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile, nameof(Importprofile.SchemeCuesheet))"
- Label="@_localizer["Scheme common data"]" Placeholder="@_localizer["Enter the common data scheme for this profile here"]" Variant="Variant.Outlined"
- Clearable Disabled="ApplicationOptions.SelectedImportProfile == null" />
- <MudMenu Icon="@Icons.Material.Outlined.Add" Color="Color.Primary" Variant="Variant.Filled" Disabled="ApplicationOptions.SelectedImportProfile == null" Class="mt-1" Style="height: 56px;">
- @foreach (var scheme in Importprofile.AvailableSchemeCuesheet)
- {
- <MudMenuItem OnClick="() => AppendPlaceholderToTextField(schemeCuesheetTextField, scheme)">@_localizer[scheme]</MudMenuItem>
- }
- </MudMenu>
- </MudStack>
- <MudStack Row>
- <MudTextField T="string" @ref="schemeTracksTextField" Text="@ApplicationOptions.SelectedImportProfile?.SchemeTracks" TextChanged="SchemeTracksChangedAsync"
- Error="String.IsNullOrEmpty(GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile, nameof(Importprofile.SchemeTracks))) == false" ErrorText="@GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile, nameof(Importprofile.SchemeTracks))"
- Label="@_localizer["Scheme tracks"]" Placeholder="@_localizer["Enter the track scheme for this profile here"]" Variant="Variant.Outlined"
- Clearable Disabled="ApplicationOptions.SelectedImportProfile == null" />
- <MudMenu Icon="@Icons.Material.Outlined.Add" Color="Color.Primary" Variant="Variant.Filled" Disabled="ApplicationOptions.SelectedImportProfile == null" Class="mt-1" Style="height: 56px;">
- @foreach (var scheme in Importprofile.AvailableSchemesTrack)
- {
- <MudMenuItem OnClick="() => AppendPlaceholderToTextField(schemeTracksTextField, scheme)">@_localizer[scheme]</MudMenuItem>
- }
- </MudMenu>
- </MudStack>
- <MudStack Row>
- <MudTextField T="string" @ref="timeSpanFormatTextField" Text="@ApplicationOptions.SelectedImportProfile?.TimeSpanFormat?.Scheme" TextChanged="ImportTimeInputFormatChangedAsync"
- Error="String.IsNullOrEmpty(GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile?.TimeSpanFormat, nameof(TimeSpanFormat.Scheme))) == false" ErrorText="@GetValidationErrorMessage(ApplicationOptions.SelectedImportProfile?.TimeSpanFormat, nameof(TimeSpanFormat.Scheme))"
- Label="@_localizer["Time input format for import"]" Placeholder="@_localizer["Enter the time format for this profile here"]" Variant="Variant.Outlined"
- Clearable Disabled="ApplicationOptions.SelectedImportProfile == null" />
- <MudMenu Icon="@Icons.Material.Outlined.Add" Color="Color.Primary" Variant="Variant.Filled" Disabled="ApplicationOptions.SelectedImportProfile == null" Class="mt-1" Style="height: 56px;">
- @foreach (var scheme in TimeSpanFormat.AvailableTimespanScheme)
- {
- <MudMenuItem OnClick="() => AppendPlaceholderToTextField(timeSpanFormatTextField, scheme)">@_localizer[scheme]</MudMenuItem>
- }
- </MudMenu>
- </MudStack>
-}
-
-@code {
- [Parameter]
- public EventCallback ImportprofileChanged { get; set; }
-
- MudTextField<string>? schemeCuesheetTextField, schemeTracksTextField, timeSpanFormatTextField;
-
- void AppendPlaceholderToTextField(MudTextField<string>? mudTextField, string placeholder)
- {
- mudTextField?.SetText($"{mudTextField.Text}{placeholder}");
- }
-
- async Task SelectedImportProfileChangedAsync(Importprofile? newSelectedProfile)
- {
- await LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.SelectedImportProfile, newSelectedProfile);
- await ImportprofileChanged.InvokeAsync();
- }
-
- async Task UseRegularExpressionChangedAsync(Boolean? newValue)
- {
- await LocalStorageOptionsProvider.SaveNestedOptionValueAsync<ApplicationOptions, Importprofile?, Boolean>(x => x.SelectedImportProfile, x => x!.UseRegularExpression, newValue!.Value);
- await ImportprofileChanged.InvokeAsync();
- }
-
- async Task SchemeCuesheetChangedAsync(string newScheme)
- {
- await LocalStorageOptionsProvider.SaveNestedOptionValueAsync<ApplicationOptions, Importprofile?, String?>(x => x.SelectedImportProfile, x => x!.SchemeCuesheet, newScheme);
- await ImportprofileChanged.InvokeAsync();
- }
-
- async Task SchemeTracksChangedAsync(string newScheme)
- {
- await LocalStorageOptionsProvider.SaveNestedOptionValueAsync<ApplicationOptions, Importprofile?, String?>(x => x.SelectedImportProfile, x => x!.SchemeTracks, newScheme);
- await ImportprofileChanged.InvokeAsync();
- }
-
- async Task ImportTimeInputFormatChangedAsync(string newScheme)
- {
- var profile = ApplicationOptions?.SelectedImportProfile;
- if (profile != null)
- {
- TimeSpanFormat? format = null;
- if (string.IsNullOrEmpty(newScheme))
- {
- format = null;
- }
- else
- {
- format = new() { Scheme = newScheme };
- }
- await LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.SelectedImportProfile!.TimeSpanFormat, format);
- await ImportprofileChanged.InvokeAsync();
- }
- }
-
- String? GetValidationErrorMessage(object? model, string propertyName)
- {
- String? validationErrorMessage = null;
- if (model != null)
- {
- var validationMessages = _validationService.Validate(model, propertyName);
- if (validationMessages.Count() > 0)
- {
- validationErrorMessage = String.Join(Environment.NewLine, validationMessages);
- }
- }
- return validationErrorMessage;
- }
-
- async Task ResetSchemes()
- {
- var parameters = new DialogParameters<ConfirmDialog>
- {
- { x => x.ConfirmText, _localizer["Are you sure you want to reset the import profiles to factory default?"] },
- };
- var dialog = await _dialogService.ShowAsync<ConfirmDialog>(_localizer["Confirm"], parameters);
- var result = await dialog.Result;
- if (result?.Canceled == false)
- {
- ApplicationOptions!.ImportProfiles = ApplicationOptions.DefaultImportprofiles;
- ApplicationOptions!.SelectedImportProfile = ApplicationOptions.DefaultSelectedImportprofile;
- await LocalStorageOptionsProvider.SaveOptionsAsync(ApplicationOptions);
- await ImportprofileChanged.InvokeAsync();
- }
- }
-
- async Task AddImportprofileClick()
- {
- var newProfilesNames = ApplicationOptions!.ImportProfiles.Where(x => x.Name?.StartsWith(_localizer["New import profile"]) == true).Select(x => x.Name);
- var regex = new System.Text.RegularExpressions.Regex(@"(\d+)$");
- int maxNumber = newProfilesNames
- .Select(name =>
- {
- var match = regex.Match(name ?? "");
- return match.Success ? int.Parse(match.Value) : 0;
- })
- .DefaultIfEmpty(0)
- .Max();
- var profile = new Importprofile()
- {
- Name = $"{_localizer["New import profile"]} {maxNumber + 1}"
- };
- ApplicationOptions!.SelectedImportProfile = profile;
- await LocalStorageOptionsProvider.SaveOptionsAsync(ApplicationOptions);
- await ImportprofileChanged.InvokeAsync();
- }
-
- async Task DeleteImportprofileClick()
- {
- var selectedProfile = ApplicationOptions?.SelectedImportProfile;
- if (selectedProfile != null)
- {
- ApplicationOptions!.ImportProfiles.Remove(selectedProfile);
- var lastProfile = ApplicationOptions.ImportProfiles.LastOrDefault();
- if (lastProfile != null)
- {
- ApplicationOptions!.SelectedImportProfile = lastProfile;
- }
- await LocalStorageOptionsProvider.SaveOptionsAsync(ApplicationOptions);
- }
- }
-}
diff --git a/AudioCuesheetEditor/Shared/Import/SelectImportFiles.razor b/AudioCuesheetEditor/Shared/Import/SelectImportFiles.razor
index 94f9b212..590b8275 100644
--- a/AudioCuesheetEditor/Shared/Import/SelectImportFiles.razor
+++ b/AudioCuesheetEditor/Shared/Import/SelectImportFiles.razor
@@ -29,7 +29,7 @@ along with Foobar. If not, see
</CardHeaderContent>
</MudCardHeader>
<MudCardContent id="@dropFileInputId">
- <DropFileInput OnFilesSelected="InputFilesChanged" Filter="@FileMimeTypes.TextPlain" />
+ <DropFileInput OnFilesSelected="InputFilesChanged" Filter="@FileMimeTypes.Text" />
@foreach (var invalidFileName in invalidDropFileNames)
{
<MudAlert Variant="Variant.Filled" Severity="Severity.Error" ShowCloseIcon CloseIconClicked="() => CloseInvalidFileClicked(invalidFileName)">
@@ -54,7 +54,8 @@ along with Foobar. If not, see
invalidDropFileNames.Clear();
foreach (var file in files)
{
- if (_fileInputManager.IsValidForImportView(file) == false)
+ if ((_fileInputManager.CheckFileMimeType(file, FileMimeTypes.Text, FileExtensions.Text) == false)
+ && (FileInputManager.GetAudioCodec(file) == null))
{
invalidDropFileNames.Add(file.Name);
}
@@ -76,7 +77,7 @@ along with Foobar. If not, see
// Audio file is handled seperatly
foreach (var file in files)
{
- var codec = _fileInputManager.GetAudioCodec(file);
+ var codec = FileInputManager.GetAudioCodec(file);
if (codec != null)
{
var audiofile = await _fileInputManager.CreateAudiofileAsync(dropFileInputId, file);
diff --git a/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.razor b/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.razor
index 4404698a..470d5c84 100644
--- a/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.razor
+++ b/AudioCuesheetEditor/Shared/ViewModes/ViewModeImport.razor
@@ -33,7 +33,7 @@ along with Foobar. If not, see
</TitleContent>
<ChildContent>
<ImportFileContent FileContentChanged="ImportFileContent_FileContentChanged" />
- <Importprofiles ImportprofileChanged="ReanalyseImportfile" />
+ <ImportSchemes ImportSchemeCuesheetChanged="ReanalyseImportfile" ImportSchemeTracksChanged="ReanalyseImportfile" ImportTimeInputFormatChanged="ReanalyseImportfile" />
@if (_sessionStateContainer.Importfile?.AnalyseException != null)
{
<MudAlert Severity="Severity.Error" Variant="Variant.Filled">
@@ -68,17 +68,18 @@ along with Foobar. If not, see
Boolean fileContentExpanded = false, cuesheetDataExpanded = false, cuesheetTracksExpanded = false;
Boolean selectFilesStepCompleted = false, selectFilesStepError = false;
- async Task ImportFileContent_FileContentChanged(string newFileContent)
+ void ImportFileContent_FileContentChanged(string newFileContent)
{
- await _importManager.ImportTextAsync(newFileContent);
+ var textToAnalyse = newFileContent.Split(Environment.NewLine);
+ _importManager.ImportText(textToAnalyse, ApplicationOptions!.ImportScheme, ApplicationOptions!.ImportTimeSpanFormat);
}
- async Task ReanalyseImportfile()
+ void ReanalyseImportfile()
{
var fileContent = _sessionStateContainer.Importfile?.FileContent;
if (fileContent != null)
{
- await _importManager.ImportTextAsync(fileContent);
+ _importManager.ImportText(fileContent, ApplicationOptions!.ImportScheme, ApplicationOptions.ImportTimeSpanFormat);
}
}
diff --git a/AudioCuesheetEditor/_Imports.razor b/AudioCuesheetEditor/_Imports.razor
index 4dd0e275..4cd9df9e 100644
--- a/AudioCuesheetEditor/_Imports.razor
+++ b/AudioCuesheetEditor/_Imports.razor
@@ -43,5 +43,4 @@
@using Howler.Blazor.Components
@using Markdig
@using Toolbelt.Blazor.HotKeys2
-@using MudBlazor
-@using Ganss.Xss
\ No newline at end of file
+@using MudBlazor
\ No newline at end of file
|