sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary private methods and inline used-once code

Browse Source
This commit is contained in:
naoey
2019-06-25 21:16:30 +05:30
parent 6f5fbd7ea1
commit c476e46a8e
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,19 +60,6 @@ namespace osu.Game.Database
var request = CreateDownloadRequest(model, minimiseDownloadSize); var request = CreateDownloadRequest(model, minimiseDownloadSize);
performDownloadWithRequest(request);
return true;
}
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.Model.Equals(model));
private bool canDownload(TModel model) => GetExistingDownload(model) == null && api != null;
private void performDownloadWithRequest(ArchiveDownloadRequest<TModel> request)
{
DownloadNotification notification = new DownloadNotification DownloadNotification notification = new DownloadNotification
{ {
Text = $"Downloading {request.Model}", Text = $"Downloading {request.Model}",
@ -94,7 +81,16 @@ namespace osu.Game.Database
}, TaskCreationOptions.LongRunning); }, TaskCreationOptions.LongRunning);
}; };
request.Failure += error => handleRequestFailure(request, notification, error); request.Failure += error =>
{
DownloadFailed?.Invoke(request);
if (error is OperationCanceledException) return;
notification.State = ProgressNotificationState.Cancelled;
Logger.Error(error, $"{HumanisedModelName.Titleize()} download failed!");
currentDownloads.Remove(request);
};
notification.CancelRequested += () => notification.CancelRequested += () =>
{ {
@ -110,18 +106,15 @@ namespace osu.Game.Database
Task.Factory.StartNew(() => request.Perform(api), TaskCreationOptions.LongRunning); Task.Factory.StartNew(() => request.Perform(api), TaskCreationOptions.LongRunning);
DownloadBegan?.Invoke(request); DownloadBegan?.Invoke(request);
return true;
} }
private void handleRequestFailure(ArchiveDownloadRequest<TModel> req, ProgressNotification notification, Exception e) public virtual bool IsAvailableLocally(TModel model) => modelStore.ConsumableItems.Any(m => m.Equals(model) && !m.DeletePending);
{
DownloadFailed?.Invoke(req);
if (e is OperationCanceledException) return; public ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model) => currentDownloads.Find(r => r.Model.Equals(model));
notification.State = ProgressNotificationState.Cancelled; private bool canDownload(TModel model) => GetExistingDownload(model) == null && api != null;
Logger.Error(e, $"{HumanisedModelName.Titleize()} download failed!");
currentDownloads.Remove(req);
}
private class DownloadNotification : ProgressNotification private class DownloadNotification : ProgressNotification
{ {