h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 08:52:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #5001 from naoey/generic-download-tracking-composite

Browse Source 
Make a generic model download tracking Drawable
This commit is contained in:
Dean Herbert 2019-06-27 03:26:27 +09:00 committed by GitHub
commit d5c8680d8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 75 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/BeatmapSetInfo.cs
View File

@ -9,7 +9,7 @@ using osu.Game.Database;
namespace osu.Game.Beatmaps
{
public class BeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete
public class BeatmapSetInfo : IHasPrimaryKey, IHasFiles<BeatmapSetFileInfo>, ISoftDelete, IEquatable<BeatmapSetInfo>
{
public int ID { get; set; }
@ -49,5 +49,7 @@ namespace osu.Game.Beatmaps
public override string ToString() => Metadata?.ToString() ?? base.ToString();
public bool Protected { get; set; }
public bool Equals(BeatmapSetInfo other) => OnlineBeatmapSetID == other?.OnlineBeatmapSetID;
}
}

2
osu.Game/Overlays/Direct/DownloadState.cs → osu.Game/Online/DownloadState.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
namespace osu.Game.Overlays.Direct
namespace osu.Game.Online
{
public enum DownloadState
{

87
osu.Game/Overlays/Direct/DownloadTrackingComposite.cs → osu.Game/Online/DownloadTrackingComposite.cs
View File

@ -2,23 +2,24 @@
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Online.API;
namespace osu.Game.Overlays.Direct
namespace osu.Game.Online
{
/// <summary>
/// A component which tracks a beatmap through potential download/import/deletion.
/// </summary>
public abstract class DownloadTrackingComposite : CompositeDrawable
public abstract class DownloadTrackingComposite<TModel, TModelManager> : CompositeDrawable
where TModel : class, IEquatable<TModel>
where TModelManager : class, IModelDownloader<TModel>
{
public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
protected readonly Bindable<TModel> Model = new Bindable<TModel>();
private BeatmapManager beatmaps;
private TModelManager manager;
/// <summary>
/// Holds the current download state of the beatmap, whether is has already been downloaded, is in progress, or is not downloaded.
@ -27,58 +28,39 @@ namespace osu.Game.Overlays.Direct
protected readonly Bindable<double> Progress = new Bindable<double>();
protected DownloadTrackingComposite(BeatmapSetInfo beatmapSet = null)
protected DownloadTrackingComposite(TModel model = null)
{
BeatmapSet.Value = beatmapSet;
Model.Value = model;
}
[BackgroundDependencyLoader(true)]
private void load(BeatmapManager beatmaps)
private void load(TModelManager manager)
{
this.beatmaps = beatmaps;
this.manager = manager;
BeatmapSet.BindValueChanged(setInfo =>
Model.BindValueChanged(modelInfo =>
{
if (setInfo.NewValue == null)
if (modelInfo.NewValue == null)
attachDownload(null);
else if (beatmaps.GetAllUsableBeatmapSetsEnumerable().Any(s => s.OnlineBeatmapSetID == setInfo.NewValue.OnlineBeatmapSetID))
else if (manager.IsAvailableLocally(modelInfo.NewValue))
State.Value = DownloadState.LocallyAvailable;
else
attachDownload(beatmaps.GetExistingDownload(setInfo.NewValue));
attachDownload(manager.GetExistingDownload(modelInfo.NewValue));
}, true);
beatmaps.DownloadBegan += download =>
manager.DownloadBegan += download =>
{
if (download.Model.OnlineBeatmapSetID == BeatmapSet.Value?.OnlineBeatmapSetID)
if (download.Model.Equals(Model.Value))
attachDownload(download);
};
beatmaps.ItemAdded += setAdded;
beatmaps.ItemRemoved += setRemoved;
manager.ItemAdded += itemAdded;
manager.ItemRemoved += itemRemoved;
}
#region Disposal
private ArchiveDownloadRequest<TModel> attachedRequest;
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (beatmaps != null)
{
beatmaps.DownloadBegan -= attachDownload;
beatmaps.ItemAdded -= setAdded;
}
State.UnbindAll();
attachDownload(null);
}
#endregion
private ArchiveDownloadRequest<BeatmapSetInfo> attachedRequest;
private void attachDownload(ArchiveDownloadRequest<BeatmapSetInfo> request)
private void attachDownload(ArchiveDownloadRequest<TModel> request)
{
if (attachedRequest != null)
{
@ -118,16 +100,35 @@ namespace osu.Game.Overlays.Direct
private void onRequestFailure(Exception e) => Schedule(() => attachDownload(null));
private void setAdded(BeatmapSetInfo s) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
private void itemAdded(TModel s) => setDownloadStateFromManager(s, DownloadState.LocallyAvailable);
private void setRemoved(BeatmapSetInfo s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded);
private void itemRemoved(TModel s) => setDownloadStateFromManager(s, DownloadState.NotDownloaded);
private void setDownloadStateFromManager(BeatmapSetInfo s, DownloadState state) => Schedule(() =>
private void setDownloadStateFromManager(TModel s, DownloadState state) => Schedule(() =>
{
if (s.OnlineBeatmapSetID != BeatmapSet.Value?.OnlineBeatmapSetID)
if (!s.Equals(Model.Value))
return;
State.Value = state;
});
#region Disposal
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
if (manager != null)
{
manager.DownloadBegan -= attachDownload;
manager.ItemAdded -= itemAdded;
}
State.UnbindAll();
attachDownload(null);
}
#endregion
}
}

3
osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
View File

@ -11,6 +11,7 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online;
using osu.Game.Online.API;
using osu.Game.Overlays.Direct;
using osu.Game.Users;
@ -19,7 +20,7 @@ using osuTK.Graphics;
namespace osu.Game.Overlays.BeatmapSet.Buttons
{
public class DownloadButton : DownloadTrackingComposite, IHasTooltip
public class DownloadButton : BeatmapDownloadTrackingComposite, IHasTooltip
{
private readonly bool noVideo;

3
osu.Game/Overlays/BeatmapSet/Header.cs
View File

@ -12,6 +12,7 @@ using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online;
using osu.Game.Overlays.BeatmapSet.Buttons;
using osu.Game.Overlays.Direct;
using osuTK;
@ -20,7 +21,7 @@ using DownloadButton = osu.Game.Overlays.BeatmapSet.Buttons.DownloadButton;
namespace osu.Game.Overlays.BeatmapSet
{
public class Header : DownloadTrackingComposite
public class Header : BeatmapDownloadTrackingComposite
{
private const float transition_duration = 200;
private const float tabs_height = 50;

19
osu.Game/Overlays/Direct/BeatmapDownloadTrackingComposite.cs Normal file
View File

@ -0,0 +1,19 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Bindables;
using osu.Game.Beatmaps;
using osu.Game.Online;
namespace osu.Game.Overlays.Direct
{
public abstract class BeatmapDownloadTrackingComposite : DownloadTrackingComposite<BeatmapSetInfo, BeatmapManager>
{
public Bindable<BeatmapSetInfo> BeatmapSet => Model;
protected BeatmapDownloadTrackingComposite(BeatmapSetInfo set = null)
: base(set)
{
}
}
}

3
osu.Game/Overlays/Direct/DownloadButton.cs
View File

@ -9,11 +9,12 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online;
using osuTK;
namespace osu.Game.Overlays.Direct
{
public class DownloadButton : DownloadTrackingComposite
public class DownloadButton : BeatmapDownloadTrackingComposite
{
private readonly bool noVideo;
private readonly SpriteIcon icon;

3
osu.Game/Overlays/Direct/DownloadProgressBar.cs
View File

@ -7,11 +7,12 @@ using osu.Framework.Graphics;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online;
using osuTK.Graphics;
namespace osu.Game.Overlays.Direct
{
public class DownloadProgressBar : DownloadTrackingComposite
public class DownloadProgressBar : BeatmapDownloadTrackingComposite
{
private readonly ProgressBar progressBar;