Update hashing method in line with master

This commit is contained in:
Dean Herbert
2018-11-30 17:36:06 +09:00
parent be37f3c328
commit 66e43e6ed9
4 changed files with 9 additions and 29 deletions

View File

@ -20,20 +20,18 @@ namespace osu.Game.Scoring
{
public override string[] HandledExtensions => new[] { ".osr" };
protected override string[] HashableFileTypes => new[] { ".osr" };
protected override string ImportFromStablePath => "Replays";
private readonly RulesetStore rulesets;
private readonly BeatmapManager beatmaps;
private readonly ScoreStore scores;
public ScoreManager(RulesetStore rulesets, BeatmapManager beatmaps, Storage storage, IDatabaseContextFactory contextFactory, IIpcHost importHost = null)
: base(storage, contextFactory, new ScoreStore(contextFactory, storage), importHost)
{
this.rulesets = rulesets;
this.beatmaps = beatmaps;
scores = (ScoreStore)ModelStore;
}
protected override ScoreInfo CreateModel(ArchiveReader archive)
@ -55,18 +53,6 @@ namespace osu.Game.Scoring
}
}
protected override ScoreInfo CheckForExisting(ScoreInfo model)
{
var existingHashMatch = scores.ConsumableItems.FirstOrDefault(s => s.MD5Hash != null && s.MD5Hash == model.MD5Hash);
if (existingHashMatch != null)
{
Undelete(existingHashMatch);
return existingHashMatch;
}
return null;
}
public Score GetScore(ScoreInfo score) => new LegacyDatabasedScore(score, rulesets, beatmaps, Files.Store);
public List<ScoreInfo> GetAllUsableScores() => ModelStore.ConsumableItems.Where(s => !s.DeletePending).ToList();