sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused lowPriority flag from one Import method

Browse Source
This commit is contained in:
Dean Herbert 2022-06-14 19:52:30 +09:00
parent ca0765a932
commit 9f599a5ab4
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Online/TestSceneOnlinePlayBeatmapAvailabilityTracker.cs
View File

@ -225,10 +225,10 @@ namespace osu.Game.Tests.Online
this.testBeatmapManager = testBeatmapManager; this.testBeatmapManager = testBeatmapManager;
} }
public override Live<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) public override Live<BeatmapSetInfo> Import(BeatmapSetInfo item, ArchiveReader archive = null, CancellationToken cancellationToken = default)
{ {
testBeatmapManager.AllowImport.Task.WaitSafely(); testBeatmapManager.AllowImport.Task.WaitSafely();
return (testBeatmapManager.CurrentImport = base.Import(item, archive, lowPriority, cancellationToken)); return (testBeatmapManager.CurrentImport = base.Import(item, archive, cancellationToken));
} }
} }
} }

2
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -374,7 +374,7 @@ namespace osu.Game.Beatmaps
public Live<BeatmapSetInfo>? Import(BeatmapSetInfo item, ArchiveReader? archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) public Live<BeatmapSetInfo>? Import(BeatmapSetInfo item, ArchiveReader? archive = null, bool lowPriority = false, CancellationToken cancellationToken = default)
{ {
return beatmapModelManager.Import(item, archive, lowPriority, cancellationToken); return beatmapModelManager.Import(item, archive, cancellationToken);
} }
public IEnumerable<string> HandledExtensions => beatmapModelManager.HandledExtensions; public IEnumerable<string> HandledExtensions => beatmapModelManager.HandledExtensions;

2
osu.Game/Scoring/ScoreManager.cs
View File

@ -280,7 +280,7 @@ namespace osu.Game.Scoring
public Task<IEnumerable<Live<ScoreInfo>>> Import(ProgressNotification notification, params ImportTask[] tasks) => scoreModelManager.Import(notification, tasks); public Task<IEnumerable<Live<ScoreInfo>>> Import(ProgressNotification notification, params ImportTask[] tasks) => scoreModelManager.Import(notification, tasks);
public Live<ScoreInfo> Import(ScoreInfo item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) => scoreModelManager.Import(item, archive, lowPriority, cancellationToken); public Live<ScoreInfo> Import(ScoreInfo item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) => scoreModelManager.Import(item, archive, cancellationToken);
public bool IsAvailableLocally(ScoreInfo model) => scoreModelManager.IsAvailableLocally(model); public bool IsAvailableLocally(ScoreInfo model) => scoreModelManager.IsAvailableLocally(model);

2
osu.Game/Skinning/SkinManager.cs
View File

@ -282,7 +282,7 @@ namespace osu.Game.Skinning
skinModelManager.Import(archive, lowPriority, cancellationToken); skinModelManager.Import(archive, lowPriority, cancellationToken);
public Live<SkinInfo> Import(SkinInfo item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) => public Live<SkinInfo> Import(SkinInfo item, ArchiveReader archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) =>
skinModelManager.Import(item, archive, lowPriority, cancellationToken); skinModelManager.Import(item, archive, cancellationToken);
#endregion #endregion

5
osu.Game/Stores/RealmArchiveModelImporter.cs
View File

@ -250,7 +250,7 @@ namespace osu.Game.Stores
return null; return null;
} }
var scheduledImport = Task.Factory.StartNew(() => Import(model, archive, lowPriority, cancellationToken), var scheduledImport = Task.Factory.StartNew(() => Import(model, archive, cancellationToken),
cancellationToken, cancellationToken,
TaskCreationOptions.HideScheduler, TaskCreationOptions.HideScheduler,
lowPriority ? import_scheduler_low_priority : import_scheduler); lowPriority ? import_scheduler_low_priority : import_scheduler);
@ -318,9 +318,8 @@ namespace osu.Game.Stores
/// </summary> /// </summary>
/// <param name="item">The model to be imported.</param> /// <param name="item">The model to be imported.</param>
/// <param name="archive">An optional archive to use for model population.</param> /// <param name="archive">An optional archive to use for model population.</param>
/// <param name="lowPriority">Whether this is a low priority import.</param>
/// <param name="cancellationToken">An optional cancellation token.</param> /// <param name="cancellationToken">An optional cancellation token.</param>
public virtual Live<TModel>? Import(TModel item, ArchiveReader? archive = null, bool lowPriority = false, CancellationToken cancellationToken = default) public virtual Live<TModel>? Import(TModel item, ArchiveReader? archive = null, CancellationToken cancellationToken = default)
{ {
return Realm.Run(realm => return Realm.Run(realm =>
{ {