RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 08:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make beatmap importing async.

Browse Source
This commit is contained in:
Dean Herbert 2017-02-24 18:10:37 +09:00
parent 65a24dfe5d
commit 5ff4028c29
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop/OsuGameDesktop.cs
View File

@ -56,7 +56,7 @@ namespace osu.Desktop
// this method will only be executed if e.Effect in dragEnter gets set to something other that None. // this method will only be executed if e.Effect in dragEnter gets set to something other that None.
var dropData = e.Data.GetData(DataFormats.FileDrop) as object[]; var dropData = e.Data.GetData(DataFormats.FileDrop) as object[];
var filePaths = dropData.Select(f => f.ToString()).ToArray(); var filePaths = dropData.Select(f => f.ToString()).ToArray();
ImportBeatmaps(filePaths); ImportBeatmapsAsync(filePaths);
} }
private void dragEnter(DragEventArgs e) private void dragEnter(DragEventArgs e)

7
osu.Game/OsuGame.cs
View File

@ -25,6 +25,7 @@ using OpenTK;
using System.Linq; using System.Linq;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks;
using osu.Game.Overlays.Notifications; using osu.Game.Overlays.Notifications;
namespace osu.Game namespace osu.Game
@ -81,7 +82,7 @@ namespace osu.Game
if (args?.Length > 0) if (args?.Length > 0)
{ {
var paths = args.Where(a => !a.StartsWith(@"-")); var paths = args.Where(a => !a.StartsWith(@"-"));
ImportBeatmaps(paths); ImportBeatmapsAsync(paths);
} }
Dependencies.Cache(this); Dependencies.Cache(this);
@ -89,9 +90,9 @@ namespace osu.Game
PlayMode = LocalConfig.GetBindable<PlayMode>(OsuConfig.PlayMode); PlayMode = LocalConfig.GetBindable<PlayMode>(OsuConfig.PlayMode);
} }
public void ImportBeatmaps(IEnumerable<string> paths) protected async void ImportBeatmapsAsync(IEnumerable<string> paths)
{ {
Schedule(delegate { Dependencies.Get<BeatmapDatabase>().Import(paths); }); await Task.Run(() => BeatmapDatabase.Import(paths));
} }
protected override void LoadComplete() protected override void LoadComplete()

4
osu.Game/OsuGameBase.cs
View File

@ -23,6 +23,8 @@ namespace osu.Game
{ {
protected OsuConfigManager LocalConfig; protected OsuConfigManager LocalConfig;
protected BeatmapDatabase BeatmapDatabase;
protected override string MainResourceFile => @"osu.Game.Resources.dll"; protected override string MainResourceFile => @"osu.Game.Resources.dll";
public APIAccess API; public APIAccess API;
@ -40,7 +42,7 @@ namespace osu.Game
{ {
Dependencies.Cache(this); Dependencies.Cache(this);
Dependencies.Cache(LocalConfig); Dependencies.Cache(LocalConfig);
Dependencies.Cache(new BeatmapDatabase(Host.Storage, Host)); Dependencies.Cache(BeatmapDatabase = new BeatmapDatabase(Host.Storage, Host));
Dependencies.Cache(new OsuColour()); Dependencies.Cache(new OsuColour());
//this completely overrides the framework default. will need to change once we make a proper FontStore. //this completely overrides the framework default. will need to change once we make a proper FontStore.