diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index efb76deff8..52d3f013ce 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -31,10 +31,21 @@ namespace osu.Game.Database
///
/// The model type.
/// The associated file join type.
- public abstract class ArchiveModelManager : ArchiveModelManager, ICanAcceptFiles, IModelManager
+ public abstract class ArchiveModelManager : ICanAcceptFiles, IModelManager
where TModel : class, IHasFiles, IHasPrimaryKey, ISoftDelete
where TFileModel : INamedFileInfo, new()
{
+ private const int import_queue_request_concurrency = 1;
+
+ ///
+ /// A singleton scheduler shared by all .
+ ///
+ ///
+ /// This scheduler generally performs IO and CPU intensive work so concurrency is limited harshly.
+ /// It is mainly being used as a queue mechanism for large imports.
+ ///
+ private static readonly ThreadedTaskScheduler import_scheduler = new ThreadedTaskScheduler(import_queue_request_concurrency, nameof(ArchiveModelManager));
+
///
/// Set an endpoint for notifications to be posted to.
///
@@ -336,7 +347,7 @@ namespace osu.Game.Database
flushEvents(true);
return item;
- }, cancellationToken, TaskCreationOptions.HideScheduler, IMPORT_SCHEDULER).Unwrap();
+ }, cancellationToken, TaskCreationOptions.HideScheduler, import_scheduler).Unwrap();
///
/// Perform an update of the specified item.
@@ -646,18 +657,4 @@ namespace osu.Game.Database
#endregion
}
-
- public abstract class ArchiveModelManager
- {
- private const int import_queue_request_concurrency = 1;
-
- ///
- /// A singleton scheduler shared by all .
- ///
- ///
- /// This scheduler generally performs IO and CPU intensive work so concurrency is limited harshly.
- /// It is mainly being used as a queue mechanism for large imports.
- ///
- protected static readonly ThreadedTaskScheduler IMPORT_SCHEDULER = new ThreadedTaskScheduler(import_queue_request_concurrency, nameof(ArchiveModelManager));
- }
}