diff --git a/src/Ethereal.Application.UnitTests/Tests/VideoDescriptionTests.cs b/src/Ethereal.Application.UnitTests/Tests/VideoDescriptionTests.cs
index c165308..948f4a6 100644
--- a/src/Ethereal.Application.UnitTests/Tests/VideoDescriptionTests.cs
+++ b/src/Ethereal.Application.UnitTests/Tests/VideoDescriptionTests.cs
@@ -23,64 +23,91 @@ public class VideoDescriptionTests
5. Cutting Crew - (I Just) Died in Your Arms 03:17:21
6. Roxy Music - More Than This 03:21:40
- 7. Toto - Africa 03:28:00";
+ 7. Toto - Africa 03:28:00
+ 7. Toto - Africa 04:30:00
+ 7. Toto - Africa 05:30:00";
private readonly VideoChapter[] expectedChapters =
{
- new VideoChapter
+ new()
{
Original = "1. (0:00) KOPI / KOBASOLO – Swayed in Spring Reiniscence",
Name = "1. KOPI KOBASOLO – Swayed in Spring Reiniscence",
+ UniqueName = "1. KOPI KOBASOLO – Swayed in Spring Reiniscence",
StartTimespan = new TimeSpan(00, 00, 00),
- EndTimespan = new TimeSpan(00, 09, 13)
+ EndTimespan = new TimeSpan(00, 09, 13),
},
- new VideoChapter
+ new()
{
Original = "2. (09:13) Memai Siren -Nisemono no Utage",
Name = "2. Memai Siren -Nisemono no Utage",
+ UniqueName = "2. Memai Siren -Nisemono no Utage",
StartTimespan = new TimeSpan(00, 09, 13),
EndTimespan = new TimeSpan(00, 34, 36)
},
- new VideoChapter
+ new()
{
Original = "3. (34:36) Vivid Undress – Sayonara Dilemma",
Name = "3. Vivid Undress – Sayonara Dilemma",
+ UniqueName = "3. Vivid Undress – Sayonara Dilemma",
StartTimespan = new TimeSpan(00, 34, 36),
EndTimespan = new TimeSpan(01, 23, 31)
},
- new VideoChapter
+ new()
{
Original = "4. (1:23:31) Vivid Undress – Yours",
Name = "4. Vivid Undress – Yours",
+ UniqueName = "4. Vivid Undress – Yours",
StartTimespan = new TimeSpan(01, 23, 31),
EndTimespan = new TimeSpan(03, 17, 21)
},
- new VideoChapter
+ new()
{
Original = "5. Cutting Crew - (I Just) Died in Your Arms 03:17:21",
Name = "5. Cutting Crew - (I Just) Died in Your Arms",
+ UniqueName = "5. Cutting Crew - (I Just) Died in Your Arms",
StartTimespan = new TimeSpan(03, 17, 21),
EndTimespan = new TimeSpan(03, 21, 40)
},
- new VideoChapter
+ new()
{
Original = "6. Roxy Music - More Than This 03:21:40",
Name = "6. Roxy Music - More Than This",
+ UniqueName = "6. Roxy Music - More Than This",
StartTimespan = new TimeSpan(03, 21, 40),
EndTimespan = new TimeSpan(03, 28, 00)
},
- new VideoChapter
+ new()
{
Original = "7. Toto - Africa 03:28:00",
Name = "7. Toto - Africa",
- StartTimespan = new TimeSpan(03, 28, 00)
- }
+ UniqueName = "7. Toto - Africa",
+ StartTimespan = new TimeSpan(03, 28, 00),
+ EndTimespan = new TimeSpan(04, 30, 00)
+ },
+
+ new()
+ {
+ Original = "7. Toto - Africa 04:30:00",
+ Name = "7. Toto - Africa",
+ UniqueName = "7. Toto - Africa (2)",
+ StartTimespan = new TimeSpan(04, 30, 00),
+ EndTimespan = new TimeSpan(05, 30, 00)
+ },
+
+ new()
+ {
+ Original = "7. Toto - Africa 05:30:00",
+ Name = "7. Toto - Africa",
+ UniqueName = "7. Toto - Africa (3)",
+ StartTimespan = new TimeSpan(05, 30, 00)
+ },
};
[Test]
diff --git a/src/Ethereal.Application.UnitTests/WithInMemoryDatabaseTestBase.cs b/src/Ethereal.Application.UnitTests/WithInMemoryDatabaseTestBase.cs
index 135833e..2041ff0 100644
--- a/src/Ethereal.Application.UnitTests/WithInMemoryDatabaseTestBase.cs
+++ b/src/Ethereal.Application.UnitTests/WithInMemoryDatabaseTestBase.cs
@@ -8,7 +8,7 @@
namespace Ethereal.Application.UnitTests;
-public class WithInMemoryDatabaseTestBase
+public abstract class WithInMemoryDatabaseTestBase
{
protected TestSettings Settings;
diff --git a/src/Ethereal.Application/Commands/FetchYoutubeVideoCommand.cs b/src/Ethereal.Application/Commands/FetchYoutubeVideoCommand.cs
index 4282922..ba629c6 100644
--- a/src/Ethereal.Application/Commands/FetchYoutubeVideoCommand.cs
+++ b/src/Ethereal.Application/Commands/FetchYoutubeVideoCommand.cs
@@ -42,6 +42,7 @@ public async Task ExecuteAsync(Guid jobId)
var cts = new CancellationTokenSource();
var timeoutDate = DateTime.UtcNow.Add(settings.DownloadingTimeout);
+ // todo: refactor this
var thread = new Thread(async () =>
{
while (true)
diff --git a/src/Ethereal.Application/Extensions/ProcessingJobExtensions.cs b/src/Ethereal.Application/Extensions/ProcessingJobExtensions.cs
index ebf9b4a..f3383b8 100644
--- a/src/Ethereal.Application/Extensions/ProcessingJobExtensions.cs
+++ b/src/Ethereal.Application/Extensions/ProcessingJobExtensions.cs
@@ -23,7 +23,7 @@ public static string GetArchivePath(this ProcessingJob job)
public static string GetChapterLocalFilePath(this ProcessingJob job, VideoChapter chapter)
{
- return Path.Combine(job.LocalPath, $"{chapter.Name.RemoveIllegalCharacters()}.mp4");
+ return Path.Combine(job.LocalPath, $"{chapter.UniqueName.RemoveIllegalCharacters()}.mp4");
}
public static string GetChapterLocalThumbnailFilePath(this ProcessingJob job, VideoChapter chapter, IEtherealSettings settings)
diff --git a/src/Ethereal.Application/VideoChapter.cs b/src/Ethereal.Application/VideoChapter.cs
index 7378a99..bb824f7 100644
--- a/src/Ethereal.Application/VideoChapter.cs
+++ b/src/Ethereal.Application/VideoChapter.cs
@@ -21,6 +21,8 @@ public VideoChapter(string original, string name, TimeSpan timespan)
public string Name { get; set; }
+ public string UniqueName { get; set; }
+
public TimeSpan StartTimespan { get; set; }
public TimeSpan? EndTimespan { get; set; }
diff --git a/src/Ethereal.Application/VideoDescription.cs b/src/Ethereal.Application/VideoDescription.cs
index 21071d1..5666f68 100644
--- a/src/Ethereal.Application/VideoDescription.cs
+++ b/src/Ethereal.Application/VideoDescription.cs
@@ -56,10 +56,20 @@ public IReadOnlyCollection
ParseChapters()
StartTimespan = timespan,
Name = line.RemoveTimespan().RemoveIllegalCharacters()
};
+
+ chapter.UniqueName = chapter.Name;
+
+ var duplicatesCount = chapters.Count(s => s.Name == chapter.Name);
+ if (duplicatesCount > 0)
+ {
+ chapter.UniqueName += $" ({duplicatesCount + 1})";
+ }
+
chapters.Add(chapter);
}
catch
{
+ // ignored
}
}
diff --git a/src/Ethereal.WebAPI/Frontend/index.html b/src/Ethereal.WebAPI/Frontend/index.html
index 92f33b0..f105661 100644
--- a/src/Ethereal.WebAPI/Frontend/index.html
+++ b/src/Ethereal.WebAPI/Frontend/index.html
@@ -9,7 +9,7 @@
-
+
@@ -17,6 +17,6 @@
-
+