RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Info to Model

This commit is contained in:
naoey 2019-06-12 21:56:36 +05:30
parent 9cd5519da3
commit 7ba676ad31
No known key found for this signature in database
GPG Key ID: 670DA9BE3DF7EE60
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Database/DownloadableArchiveModelManager.cs
View File

@ -79,7 +79,7 @@ public bool Download(TModel model, params object[] extra)
/// <returns>Whether the <see cref="TModel"/> exists locally.</returns> /// <returns>Whether the <see cref="TModel"/> exists locally.</returns>
public virtual bool IsAvailableLocally(TModel model) => modelStore.ConsumableItems.Any(m => m.Equals(model) && !m.DeletePending); public virtual bool IsAvailableLocally(TModel model) => modelStore.ConsumableItems.Any(m => m.Equals(model) && !m.DeletePending);
public ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model) => currentDownloads.Find(r => r.Info.Equals(model)); public ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model) => currentDownloads.Find(r => r.Model.Equals(model));
private bool canDownload(TModel model) => GetExistingDownload(model) == null && api != null; private bool canDownload(TModel model) => GetExistingDownload(model) == null && api != null;
@ -87,7 +87,7 @@ private void performDownloadWithRequest(ArchiveDownloadRequest<TModel> request)
{ {
DownloadNotification notification = new DownloadNotification DownloadNotification notification = new DownloadNotification
{ {
Text = $"Downloading {request.Info}", Text = $"Downloading {request.Model}",
}; };
request.DownloadProgressed += progress => request.DownloadProgressed += progress =>

4
osu.Game/Online/API/ArchiveDownloadRequest.cs
View File

@ -8,7 +8,7 @@ namespace osu.Game.Online.API
public abstract class ArchiveDownloadRequest<TModel> : APIDownloadRequest public abstract class ArchiveDownloadRequest<TModel> : APIDownloadRequest
where TModel : class where TModel : class
{ {
public readonly TModel Info; public readonly TModel Model;
public float Progress; public float Progress;
@ -16,7 +16,7 @@ public abstract class ArchiveDownloadRequest<TModel> : APIDownloadRequest
protected ArchiveDownloadRequest(TModel model) protected ArchiveDownloadRequest(TModel model)
{ {
Info = model; Model = model;
Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total); Progressed += (current, total) => DownloadProgressed?.Invoke(Progress = (float)current / total);
} }

2
osu.Game/Overlays/Direct/DownloadTrackingComposite.cs
View File

@ -49,7 +49,7 @@ private void load(BeatmapManager beatmaps)
beatmaps.DownloadBegan += download => beatmaps.DownloadBegan += download =>
{ {
if (download.Info.OnlineBeatmapSetID == BeatmapSet.Value?.OnlineBeatmapSetID) if (download.Model.OnlineBeatmapSetID == BeatmapSet.Value?.OnlineBeatmapSetID)
attachDownload(download); attachDownload(download);
}; };