sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 12:57:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rename BeatmapCollectionManager -> CollectionManager

Browse Source
This commit is contained in:
smoogipoo 2020-09-09 15:31:08 +09:00
parent 5d9ce0df98
commit 4ddf5f054b
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Tests/Collections/IO/ImportCollectionsTest.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Tests.Collections.IO
{ {
var osu = loadOsu(host); var osu = loadOsu(host);
var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>(); var collectionManager = osu.Dependencies.Get<CollectionManager>();
await collectionManager.Import(new MemoryStream()); await collectionManager.Import(new MemoryStream());
Assert.That(collectionManager.Collections.Count, Is.Zero); Assert.That(collectionManager.Collections.Count, Is.Zero);
@ -48,7 +48,7 @@ namespace osu.Game.Tests.Collections.IO
{ {
var osu = loadOsu(host); var osu = loadOsu(host);
var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>(); var collectionManager = osu.Dependencies.Get<CollectionManager>();
await collectionManager.Import(TestResources.OpenResource("Collections/collections.db")); await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
Assert.That(collectionManager.Collections.Count, Is.EqualTo(2)); Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
@ -75,7 +75,7 @@ namespace osu.Game.Tests.Collections.IO
{ {
var osu = loadOsu(host, true); var osu = loadOsu(host, true);
var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>(); var collectionManager = osu.Dependencies.Get<CollectionManager>();
await collectionManager.Import(TestResources.OpenResource("Collections/collections.db")); await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
Assert.That(collectionManager.Collections.Count, Is.EqualTo(2)); Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
@ -107,7 +107,7 @@ namespace osu.Game.Tests.Collections.IO
var osu = loadOsu(host, true); var osu = loadOsu(host, true);
var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>(); var collectionManager = osu.Dependencies.Get<CollectionManager>();
using (var ms = new MemoryStream()) using (var ms = new MemoryStream())
{ {
@ -143,7 +143,7 @@ namespace osu.Game.Tests.Collections.IO
{ {
var osu = loadOsu(host, true); var osu = loadOsu(host, true);
var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>(); var collectionManager = osu.Dependencies.Get<CollectionManager>();
await collectionManager.Import(TestResources.OpenResource("Collections/collections.db")); await collectionManager.Import(TestResources.OpenResource("Collections/collections.db"));
// Move first beatmap from second collection into the first. // Move first beatmap from second collection into the first.
@ -165,7 +165,7 @@ namespace osu.Game.Tests.Collections.IO
{ {
var osu = loadOsu(host, true); var osu = loadOsu(host, true);
var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>(); var collectionManager = osu.Dependencies.Get<CollectionManager>();
Assert.That(collectionManager.Collections.Count, Is.EqualTo(2)); Assert.That(collectionManager.Collections.Count, Is.EqualTo(2));
@ -192,7 +192,7 @@ namespace osu.Game.Tests.Collections.IO
waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time"); waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
var collectionManager = osu.Dependencies.Get<BeatmapCollectionManager>(); var collectionManager = osu.Dependencies.Get<CollectionManager>();
waitForOrAssert(() => collectionManager.DatabaseLoaded, "Collection database did not load in a reasonable amount of time"); waitForOrAssert(() => collectionManager.DatabaseLoaded, "Collection database did not load in a reasonable amount of time");
return osu; return osu;
@ -220,7 +220,7 @@ namespace osu.Game.Tests.Collections.IO
protected override void AddInternal(Drawable drawable) protected override void AddInternal(Drawable drawable)
{ {
// The beatmap must be imported just before the collection manager is loaded. // The beatmap must be imported just before the collection manager is loaded.
if (drawable is BeatmapCollectionManager && withBeatmap) if (drawable is CollectionManager && withBeatmap)
BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait(); BeatmapManager.Import(TestResources.GetTestBeatmapForImport()).Wait();
base.AddInternal(drawable); base.AddInternal(drawable);

4
osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Collections
private readonly Container content; private readonly Container content;
private readonly DialogOverlay dialogOverlay; private readonly DialogOverlay dialogOverlay;
private readonly BeatmapCollectionManager manager; private readonly CollectionManager manager;
private RulesetStore rulesets; private RulesetStore rulesets;
private BeatmapManager beatmapManager; private BeatmapManager beatmapManager;
@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Collections
{ {
base.Content.AddRange(new Drawable[] base.Content.AddRange(new Drawable[]
{ {
manager = new BeatmapCollectionManager(LocalStorage), manager = new CollectionManager(LocalStorage),
content = new Container { RelativeSizeAxes = Axes.Both }, content = new Container { RelativeSizeAxes = Axes.Both },
dialogOverlay = new DialogOverlay() dialogOverlay = new DialogOverlay()
}); });

4
osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
View File

@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.SongSelect
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
private readonly Container content; private readonly Container content;
private readonly BeatmapCollectionManager collectionManager; private readonly CollectionManager collectionManager;
private RulesetStore rulesets; private RulesetStore rulesets;
private BeatmapManager beatmapManager; private BeatmapManager beatmapManager;
@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
base.Content.AddRange(new Drawable[] base.Content.AddRange(new Drawable[]
{ {
collectionManager = new BeatmapCollectionManager(LocalStorage), collectionManager = new CollectionManager(LocalStorage),
content = new Container { RelativeSizeAxes = Axes.Both } content = new Container { RelativeSizeAxes = Axes.Both }
}); });
} }

4
osu.Game/Collections/BeatmapCollectionManager.cs → osu.Game/Collections/CollectionManager.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Collections
/// This is currently reading and writing from the osu-stable file format. This is a temporary arrangement until we refactor the /// This is currently reading and writing from the osu-stable file format. This is a temporary arrangement until we refactor the
/// database backing the game. Going forward writing should be done in a similar way to other model stores. /// database backing the game. Going forward writing should be done in a similar way to other model stores.
/// </remarks> /// </remarks>
public class BeatmapCollectionManager : Component public class CollectionManager : Component
{ {
/// <summary> /// <summary>
/// Database version in stable-compatible YYYYMMDD format. /// Database version in stable-compatible YYYYMMDD format.
@ -53,7 +53,7 @@ namespace osu.Game.Collections
private readonly Storage storage; private readonly Storage storage;
public BeatmapCollectionManager(Storage storage) public CollectionManager(Storage storage)
{ {
this.storage = storage; this.storage = storage;
} }

8
osu.Game/Collections/DrawableCollectionListItem.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Collections
private const float button_width = item_height * 0.75f; private const float button_width = item_height * 0.75f;
/// <summary> /// <summary>
/// Whether the <see cref="BeatmapCollection"/> currently exists inside the <see cref="BeatmapCollectionManager"/>. /// Whether the <see cref="BeatmapCollection"/> currently exists inside the <see cref="CollectionManager"/>.
/// </summary> /// </summary>
public IBindable<bool> IsCreated => isCreated; public IBindable<bool> IsCreated => isCreated;
@ -38,7 +38,7 @@ namespace osu.Game.Collections
/// Creates a new <see cref="DrawableCollectionListItem"/>. /// Creates a new <see cref="DrawableCollectionListItem"/>.
/// </summary> /// </summary>
/// <param name="item">The <see cref="BeatmapCollection"/>.</param> /// <param name="item">The <see cref="BeatmapCollection"/>.</param>
/// <param name="isCreated">Whether <paramref name="item"/> currently exists inside the <see cref="BeatmapCollectionManager"/>.</param> /// <param name="isCreated">Whether <paramref name="item"/> currently exists inside the <see cref="CollectionManager"/>.</param>
public DrawableCollectionListItem(BeatmapCollection item, bool isCreated) public DrawableCollectionListItem(BeatmapCollection item, bool isCreated)
: base(item) : base(item)
{ {
@ -63,7 +63,7 @@ namespace osu.Game.Collections
private readonly BeatmapCollection collection; private readonly BeatmapCollection collection;
[Resolved] [Resolved]
private BeatmapCollectionManager collectionManager { get; set; } private CollectionManager collectionManager { get; set; }
private Container textBoxPaddingContainer; private Container textBoxPaddingContainer;
private ItemTextBox textBox; private ItemTextBox textBox;
@ -159,7 +159,7 @@ namespace osu.Game.Collections
private DialogOverlay dialogOverlay { get; set; } private DialogOverlay dialogOverlay { get; set; }
[Resolved] [Resolved]
private BeatmapCollectionManager collectionManager { get; set; } private CollectionManager collectionManager { get; set; }
private readonly BeatmapCollection collection; private readonly BeatmapCollection collection;

2
osu.Game/Collections/ManageCollectionsDialog.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Collections
private const double exit_duration = 200; private const double exit_duration = 200;
[Resolved] [Resolved]
private BeatmapCollectionManager collectionManager { get; set; } private CollectionManager collectionManager { get; set; }
public ManageCollectionsDialog() public ManageCollectionsDialog()
{ {

4
osu.Game/OsuGameBase.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game
protected BeatmapManager BeatmapManager; protected BeatmapManager BeatmapManager;
protected BeatmapCollectionManager CollectionManager; protected CollectionManager CollectionManager;
protected ScoreManager ScoreManager; protected ScoreManager ScoreManager;
@ -228,7 +228,7 @@ namespace osu.Game
dependencies.Cache(difficultyManager); dependencies.Cache(difficultyManager);
AddInternal(difficultyManager); AddInternal(difficultyManager);
dependencies.Cache(CollectionManager = new BeatmapCollectionManager(Storage)); dependencies.Cache(CollectionManager = new CollectionManager(Storage));
AddInternal(CollectionManager); AddInternal(CollectionManager);
dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore)); dependencies.Cache(KeyBindingStore = new KeyBindingStore(contextFactory, RulesetStore));

2
osu.Game/Overlays/Settings/Sections/Maintenance/GeneralSettings.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Settings.Sections.Maintenance
private TriangleButton undeleteButton; private TriangleButton undeleteButton;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, BeatmapCollectionManager collectionManager, DialogOverlay dialogOverlay) private void load(BeatmapManager beatmaps, ScoreManager scores, SkinManager skins, CollectionManager collectionManager, DialogOverlay dialogOverlay)
{ {
if (beatmaps.SupportsImportFromStable) if (beatmaps.SupportsImportFromStable)
{ {

2
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Screens.Select.Carousel
private BeatmapDifficultyManager difficultyManager { get; set; } private BeatmapDifficultyManager difficultyManager { get; set; }
[Resolved] [Resolved]
private BeatmapCollectionManager collectionManager { get; set; } private CollectionManager collectionManager { get; set; }
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private ManageCollectionsDialog manageCollectionsDialog { get; set; } private ManageCollectionsDialog manageCollectionsDialog { get; set; }

2
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Screens.Select.Carousel
private DialogOverlay dialogOverlay { get; set; } private DialogOverlay dialogOverlay { get; set; }
[Resolved] [Resolved]
private BeatmapCollectionManager collectionManager { get; set; } private CollectionManager collectionManager { get; set; }
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private ManageCollectionsDialog manageCollectionsDialog { get; set; } private ManageCollectionsDialog manageCollectionsDialog { get; set; }

2
osu.Game/Screens/Select/CollectionFilterDropdown.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Select
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(BeatmapCollectionManager collectionManager) private void load(CollectionManager collectionManager)
{ {
collections.BindTo(collectionManager.Collections); collections.BindTo(collectionManager.Collections);
collections.CollectionChanged += (_, __) => collectionsChanged(); collections.CollectionChanged += (_, __) => collectionsChanged();