From 6542062bb8d1b4660485b52da38fd2f2377be4e0 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Sun, 25 Jul 2021 01:47:42 +0200
Subject: [PATCH] Fixing task services resolving

---
 Kyoo.Common/Models/WatchItem.cs   | 1 +
 Kyoo.Common/Module.cs             | 2 +-
 Kyoo.Postgresql/PostgresModule.cs | 2 +-
 Kyoo/Controllers/TaskManager.cs   | 2 +-
 Kyoo/Tasks/Crawler.cs             | 4 +---
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Kyoo.Common/Models/WatchItem.cs b/Kyoo.Common/Models/WatchItem.cs
index 241ed9a9..158563a8 100644
--- a/Kyoo.Common/Models/WatchItem.cs
+++ b/Kyoo.Common/Models/WatchItem.cs
@@ -178,6 +178,7 @@ namespace Kyoo.Models
 				EpisodeID = ep.ID,
 				Slug = ep.Slug,
 				ShowSlug = ep.Show.Slug,
+				ShowTitle = ep.Show.Title,
 				SeasonNumber = ep.SeasonNumber,
 				EpisodeNumber = ep.EpisodeNumber,
 				AbsoluteNumber = ep.AbsoluteNumber,
diff --git a/Kyoo.Common/Module.cs b/Kyoo.Common/Module.cs
index 0e8de063..7fb9bdbc 100644
--- a/Kyoo.Common/Module.cs
+++ b/Kyoo.Common/Module.cs
@@ -20,7 +20,7 @@ namespace Kyoo
 			RegisterTask<T>(this ContainerBuilder builder)
 			where T : class, ITask
 		{
-			return builder.RegisterType<T>().As<ITask>().SingleInstance();
+			return builder.RegisterType<T>().As<ITask>();
 		}
 
 		/// <summary>
diff --git a/Kyoo.Postgresql/PostgresModule.cs b/Kyoo.Postgresql/PostgresModule.cs
index 70d62f74..124df770 100644
--- a/Kyoo.Postgresql/PostgresModule.cs
+++ b/Kyoo.Postgresql/PostgresModule.cs
@@ -75,7 +75,7 @@ namespace Kyoo.Postgresql
 			DatabaseContext context = provider.GetRequiredService<DatabaseContext>();
 			context.Database.Migrate();
 
-			NpgsqlConnection conn = (NpgsqlConnection)context.Database.GetDbConnection();
+			using NpgsqlConnection conn = (NpgsqlConnection)context.Database.GetDbConnection();
 			conn.Open();
 			conn.ReloadTypes();
 		}
diff --git a/Kyoo/Controllers/TaskManager.cs b/Kyoo/Controllers/TaskManager.cs
index 54d724f0..8b5650a6 100644
--- a/Kyoo/Controllers/TaskManager.cs
+++ b/Kyoo/Controllers/TaskManager.cs
@@ -192,7 +192,7 @@ namespace Kyoo.Controllers
 			Dictionary<string, object> arguments,
 			CancellationToken? cancellationToken = null)
 		{
-			using (_logger.BeginScope("Task: {Task}", task.Metadata.Name)) 
+			using (_logger.BeginScope("Task: {Task}", task.Metadata.Name))
 			{
 				await using Owned<ITask> taskObj = task.Factory.Invoke();
 				ICollection<TaskParameter> all = taskObj.Value.GetParameters();
diff --git a/Kyoo/Tasks/Crawler.cs b/Kyoo/Tasks/Crawler.cs
index 191fa27d..333710a3 100644
--- a/Kyoo/Tasks/Crawler.cs
+++ b/Kyoo/Tasks/Crawler.cs
@@ -138,7 +138,6 @@ namespace Kyoo.Tasks
 					_taskManager.StartTask<RegisterEpisode>(reporter, new Dictionary<string, object>
 					{
 						["path"] = episodePath,
-						["relativePath"] = episodePath[path.Length..],
 						["library"] = library
 					}, cancellationToken);
 					percent += 100f / paths.Length;
@@ -161,8 +160,7 @@ namespace Kyoo.Tasks
 				{
 					_taskManager.StartTask<RegisterSubtitle>(reporter, new Dictionary<string, object>
 					{
-						["path"] = trackPath,
-						["relativePath"] = trackPath[path.Length..]
+						["path"] = trackPath
 					}, cancellationToken);
 					percent += 100f / subtitles.Length;
 				}