Update all models to implement IHasNamedFiles

osu.Game/Beatmaps/BeatmapSetInfo.cs

@@ -95,7 +95,7 @@ namespace osu.Game.Beatmaps
 
         IBeatmapMetadataInfo IBeatmapSetInfo.Metadata => Metadata ?? Beatmaps.FirstOrDefault()?.Metadata ?? new BeatmapMetadata();
         IEnumerable<IBeatmapInfo> IBeatmapSetInfo.Beatmaps => Beatmaps;
-        IEnumerable<INamedFileUsage> IBeatmapSetInfo.Files => Files;
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
 
         #endregion
     }

osu.Game/Beatmaps/IBeatmapSetInfo.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Beatmaps
     /// <summary>
     /// A representation of a collection of beatmap difficulties, generally packaged as an ".osz" archive.
     /// </summary>
-    public interface IBeatmapSetInfo : IHasOnlineID<int>, IEquatable<IBeatmapSetInfo>
+    public interface IBeatmapSetInfo : IHasOnlineID<int>, IEquatable<IBeatmapSetInfo>, IHasNamedFiles
     {
         /// <summary>
         /// The date when this beatmap was imported.
@@ -29,11 +29,6 @@ namespace osu.Game.Beatmaps
         /// </summary>
         IEnumerable<IBeatmapInfo> Beatmaps { get; }
 
-        /// <summary>
-        /// All files used by this set.
-        /// </summary>
-        IEnumerable<INamedFileUsage> Files { get; }
-
         /// <summary>
         /// The maximum star difficulty of all beatmaps in this set.
         /// </summary>

osu.Game/Database/IHasNamedFiles.cs

@@ -0,0 +1,15 @@
+// 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 System.Collections.Generic;
+
+namespace osu.Game.Database
+{
+    public interface IHasNamedFiles
+    {
+        /// <summary>
+        /// All files used by this model.
+        /// </summary>
+        IEnumerable<INamedFileUsage> Files { get; }
+    }
+}

osu.Game/Models/RealmBeatmapSet.cs

@@ -76,7 +76,6 @@ namespace osu.Game.Models
         public bool Equals(IBeatmapSetInfo? other) => other is RealmBeatmapSet b && Equals(b);
 
         IEnumerable<IBeatmapInfo> IBeatmapSetInfo.Beatmaps => Beatmaps;
-
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
-        IEnumerable<INamedFileUsage> IBeatmapSetInfo.Files => Files;
     }
 }

osu.Game/Online/API/Requests/Responses/APIBeatmapSet.cs

@@ -136,7 +136,7 @@ namespace osu.Game.Online.API.Requests.Responses
         IBeatmapMetadataInfo IBeatmapSetInfo.Metadata => metadata;
 
         DateTimeOffset IBeatmapSetInfo.DateAdded => throw new NotImplementedException();
-        IEnumerable<INamedFileUsage> IBeatmapSetInfo.Files => throw new NotImplementedException();
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => throw new NotImplementedException();
         double IBeatmapSetInfo.MaxStarDifficulty => throw new NotImplementedException();
         double IBeatmapSetInfo.MaxLength => throw new NotImplementedException();
         double IBeatmapSetInfo.MaxBPM => BPM;

osu.Game/Online/API/Requests/Responses/APIScoreInfo.cs

@@ -8,6 +8,7 @@ using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using osu.Game.Beatmaps;
+using osu.Game.Database;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
@@ -147,6 +148,7 @@ namespace osu.Game.Online.API.Requests.Responses
         }
 
         public IRulesetInfo Ruleset => new RulesetInfo { OnlineID = RulesetID };
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => throw new NotImplementedException();
 
         IBeatmapInfo IScoreInfo.Beatmap => Beatmap;
     }

osu.Game/Scoring/IScoreInfo.cs

@@ -9,7 +9,7 @@ using osu.Game.Rulesets;
 
 namespace osu.Game.Scoring
 {
-    public interface IScoreInfo : IHasOnlineID<long>
+    public interface IScoreInfo : IHasOnlineID<long>, IHasNamedFiles
     {
         APIUser User { get; }
 

osu.Game/Scoring/ScoreFileInfo.cs

@@ -7,7 +7,7 @@ using osu.Game.IO;
 
 namespace osu.Game.Scoring
 {
-    public class ScoreFileInfo : INamedFileInfo, IHasPrimaryKey
+    public class ScoreFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
     {
         public int ID { get; set; }
 
@@ -17,5 +17,7 @@ namespace osu.Game.Scoring
 
         [Required]
         public string Filename { get; set; }
+
+        IFileInfo INamedFileUsage.File => FileInfo;
     }
 }

osu.Game/Scoring/ScoreInfo.cs

@@ -257,5 +257,7 @@ namespace osu.Game.Scoring
         bool IScoreInfo.HasReplay => Files.Any();
 
         #endregion
+
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
     }
 }

osu.Game/Skinning/SkinFileInfo.cs

@@ -7,7 +7,7 @@ using osu.Game.IO;
 
 namespace osu.Game.Skinning
 {
-    public class SkinFileInfo : INamedFileInfo, IHasPrimaryKey
+    public class SkinFileInfo : INamedFileInfo, IHasPrimaryKey, INamedFileUsage
     {
         public int ID { get; set; }
 
@@ -19,5 +19,7 @@ namespace osu.Game.Skinning
 
         [Required]
         public string Filename { get; set; }
+
+        IFileInfo INamedFileUsage.File => FileInfo;
     }
 }

osu.Game/Skinning/SkinInfo.cs

@@ -10,7 +10,7 @@ using osu.Game.IO;
 
 namespace osu.Game.Skinning
 {
-    public class SkinInfo : IHasFiles<SkinFileInfo>, IEquatable<SkinInfo>, IHasPrimaryKey, ISoftDelete
+    public class SkinInfo : IHasFiles<SkinFileInfo>, IEquatable<SkinInfo>, IHasPrimaryKey, ISoftDelete, IHasNamedFiles
     {
         internal const int DEFAULT_SKIN = 0;
         internal const int CLASSIC_SKIN = -1;
@@ -55,5 +55,7 @@ namespace osu.Game.Skinning
             string author = Creator == null ? string.Empty : $"({Creator})";
             return $"{Name} {author}".Trim();
         }
+
+        IEnumerable<INamedFileUsage> IHasNamedFiles.Files => Files;
     }
 }