Merge pull request #18 from Syriiin/fix/beatmap-provider-path

Syriiin · web-flow · commit 5506dfd106c7 · 2024-05-16T21:55:59.000+10:00
Fix beatmaps being read from the wrong path
diff --git a/Difficalcy.Catch/Services/CalculatorWorkingBeatmap.cs b/Difficalcy.Catch/Services/CalculatorWorkingBeatmap.cs
@@ -14,14 +14,14 @@ public class CalculatorWorkingBeatmap : WorkingBeatmap
     {
         private readonly Beatmap _beatmap;
 
-        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream, string beatmapId) : this(ruleset, ReadFromStream(beatmapStream), beatmapId) { }
+        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream) : this(ruleset, ReadFromStream(beatmapStream)) { }
 
-        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap, string beatmapId) : base(beatmap.BeatmapInfo, null)
+        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap) : base(beatmap.BeatmapInfo, null)
         {
             _beatmap = beatmap;
 
             // Only valid maps will be either osu! converts or osu!catch maps
-            _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? (new OsuRuleset()).RulesetInfo : ruleset.RulesetInfo;
+            _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? new OsuRuleset().RulesetInfo : ruleset.RulesetInfo;
         }
 
         private static Beatmap ReadFromStream(Stream stream)
diff --git a/Difficalcy.Catch/Services/CatchCalculatorService.cs b/Difficalcy.Catch/Services/CatchCalculatorService.cs
@@ -100,7 +100,7 @@ protected override CatchCalculation CalculatePerformance(CatchScore score, objec
         private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)
         {
             using var beatmapStream = beatmapProvider.GetBeatmapStream(beatmapId);
-            return new CalculatorWorkingBeatmap(CatchRuleset, beatmapStream, beatmapId);
+            return new CalculatorWorkingBeatmap(CatchRuleset, beatmapStream);
         }
 
         private static Dictionary<HitResult, int> GetHitResults(IBeatmap beatmap, int countMiss, int? countDroplet, int? countTinyDroplet)
diff --git a/Difficalcy.Mania/Services/CalculatorWorkingBeatmap.cs b/Difficalcy.Mania/Services/CalculatorWorkingBeatmap.cs
@@ -14,14 +14,14 @@ public class CalculatorWorkingBeatmap : WorkingBeatmap
     {
         private readonly Beatmap _beatmap;
 
-        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream, string beatmapId) : this(ruleset, ReadFromStream(beatmapStream), beatmapId) { }
+        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream) : this(ruleset, ReadFromStream(beatmapStream)) { }
 
-        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap, string beatmapId) : base(beatmap.BeatmapInfo, null)
+        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap) : base(beatmap.BeatmapInfo, null)
         {
             _beatmap = beatmap;
 
             // Only valid maps will be either osu! converts or osu!mania maps
-            _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? (new OsuRuleset()).RulesetInfo : ruleset.RulesetInfo;
+            _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? new OsuRuleset().RulesetInfo : ruleset.RulesetInfo;
         }
 
         private static Beatmap ReadFromStream(Stream stream)
diff --git a/Difficalcy.Mania/Services/ManiaCalculatorService.cs b/Difficalcy.Mania/Services/ManiaCalculatorService.cs
@@ -99,7 +99,7 @@ protected override ManiaCalculation CalculatePerformance(ManiaScore score, objec
         private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)
         {
             using var beatmapStream = _beatmapProvider.GetBeatmapStream(beatmapId);
-            return new CalculatorWorkingBeatmap(ManiaRuleset, beatmapStream, beatmapId);
+            return new CalculatorWorkingBeatmap(ManiaRuleset, beatmapStream);
         }
 
         private static Dictionary<HitResult, int> GetHitResults(int hitResultCount, int countMiss, int countMeh, int countOk, int countGood, int countGreat)
diff --git a/Difficalcy.Osu/Services/CalculatorWorkingBeatmap.cs b/Difficalcy.Osu/Services/CalculatorWorkingBeatmap.cs
@@ -13,9 +13,9 @@ public class CalculatorWorkingBeatmap : WorkingBeatmap
     {
         private readonly Beatmap _beatmap;
 
-        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream, string beatmapId) : this(ruleset, ReadFromStream(beatmapStream), beatmapId) { }
+        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream) : this(ruleset, ReadFromStream(beatmapStream)) { }
 
-        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap, string beatmapId) : base(beatmap.BeatmapInfo, null)
+        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap) : base(beatmap.BeatmapInfo, null)
         {
             _beatmap = beatmap;
 
diff --git a/Difficalcy.Osu/Services/OsuCalculatorService.cs b/Difficalcy.Osu/Services/OsuCalculatorService.cs
@@ -108,7 +108,7 @@ protected override OsuCalculation CalculatePerformance(OsuScore score, object di
         private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)
         {
             using var beatmapStream = beatmapProvider.GetBeatmapStream(beatmapId);
-            return new CalculatorWorkingBeatmap(OsuRuleset, beatmapStream, beatmapId);
+            return new CalculatorWorkingBeatmap(OsuRuleset, beatmapStream);
         }
 
         private static Dictionary<HitResult, int> GetHitResults(int hitResultCount, int countMiss, int countMeh, int countOk)
diff --git a/Difficalcy.Taiko/Services/CalculatorWorkingBeatmap.cs b/Difficalcy.Taiko/Services/CalculatorWorkingBeatmap.cs
@@ -14,14 +14,14 @@ public class CalculatorWorkingBeatmap : WorkingBeatmap
     {
         private readonly Beatmap _beatmap;
 
-        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream, string beatmapId) : this(ruleset, ReadFromStream(beatmapStream), beatmapId) { }
+        public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream) : this(ruleset, ReadFromStream(beatmapStream)) { }
 
-        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap, string beatmapId) : base(beatmap.BeatmapInfo, null)
+        private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap) : base(beatmap.BeatmapInfo, null)
         {
             _beatmap = beatmap;
 
             // Only valid maps will be either osu! converts or osu!taiko maps
-            _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? (new OsuRuleset()).RulesetInfo : ruleset.RulesetInfo;
+            _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? new OsuRuleset().RulesetInfo : ruleset.RulesetInfo;
         }
 
         private static Beatmap ReadFromStream(Stream stream)
diff --git a/Difficalcy.Taiko/Services/TaikoCalculatorService.cs b/Difficalcy.Taiko/Services/TaikoCalculatorService.cs
@@ -105,7 +105,7 @@ protected override TaikoCalculation CalculatePerformance(TaikoScore score, objec
         private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)
         {
             using var beatmapStream = _beatmapProvider.GetBeatmapStream(beatmapId);
-            return new CalculatorWorkingBeatmap(TaikoRuleset, beatmapStream, beatmapId);
+            return new CalculatorWorkingBeatmap(TaikoRuleset, beatmapStream);
         }
 
         private static Dictionary<HitResult, int> GetHitResults(int hitResultCount, int countMiss, int countOk)
diff --git a/Difficalcy/Services/WebBeatmapProvider.cs b/Difficalcy/Services/WebBeatmapProvider.cs
@@ -12,7 +12,7 @@ public class WebBeatmapProvider(IConfiguration configuration) : IBeatmapProvider
 
         public async Task<bool> EnsureBeatmap(string beatmapId)
         {
-            var beatmapPath = Path.Combine(_beatmapDirectory, $"{beatmapId}.osu");
+            var beatmapPath = GetBeatmapPath(beatmapId);
             if (!File.Exists(beatmapPath))
             {
                 using var response = await _httpClient.GetAsync($"https://osu.ppy.sh/osu/{beatmapId}");
@@ -29,8 +29,13 @@ public async Task<bool> EnsureBeatmap(string beatmapId)
 
         public Stream GetBeatmapStream(string beatmapId)
         {
-            var beatmapPath = Path.Combine(_beatmapDirectory, beatmapId);
+            var beatmapPath = GetBeatmapPath(beatmapId);
             return File.OpenRead(beatmapPath);
         }
+
+        private string GetBeatmapPath(string beatmapId)
+        {
+            return Path.Combine(_beatmapDirectory, $"{beatmapId}.osu");
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ public class CalculatorWorkingBeatmap : WorkingBeatmap`
`14`	`14`	`{`
`15`	`15`	`private readonly Beatmap _beatmap;`
`16`	`16`
`17`		`- public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream, string beatmapId) : this(ruleset, ReadFromStream(beatmapStream), beatmapId) { }`
	`17`	`+ public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream) : this(ruleset, ReadFromStream(beatmapStream)) { }`
`18`	`18`
`19`		`- private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap, string beatmapId) : base(beatmap.BeatmapInfo, null)`
	`19`	`+ private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap) : base(beatmap.BeatmapInfo, null)`
`20`	`20`	`{`
`21`	`21`	`_beatmap = beatmap;`
`22`	`22`
`23`	`23`	`// Only valid maps will be either osu! converts or osu!catch maps`
`24`		`- _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? (new OsuRuleset()).RulesetInfo : ruleset.RulesetInfo;`
	`24`	`+ _beatmap.BeatmapInfo.Ruleset = beatmap.BeatmapInfo.Ruleset.OnlineID == 0 ? new OsuRuleset().RulesetInfo : ruleset.RulesetInfo;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`private static Beatmap ReadFromStream(Stream stream)`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ protected override CatchCalculation CalculatePerformance(CatchScore score, objec`
`100`	`100`	`private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)`
`101`	`101`	`{`
`102`	`102`	`using var beatmapStream = beatmapProvider.GetBeatmapStream(beatmapId);`
`103`		`- return new CalculatorWorkingBeatmap(CatchRuleset, beatmapStream, beatmapId);`
	`103`	`+ return new CalculatorWorkingBeatmap(CatchRuleset, beatmapStream);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`private static Dictionary<HitResult, int> GetHitResults(IBeatmap beatmap, int countMiss, int? countDroplet, int? countTinyDroplet)`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected override ManiaCalculation CalculatePerformance(ManiaScore score, objec`
`99`	`99`	`private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)`
`100`	`100`	`{`
`101`	`101`	`using var beatmapStream = _beatmapProvider.GetBeatmapStream(beatmapId);`
`102`		`- return new CalculatorWorkingBeatmap(ManiaRuleset, beatmapStream, beatmapId);`
	`102`	`+ return new CalculatorWorkingBeatmap(ManiaRuleset, beatmapStream);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`private static Dictionary<HitResult, int> GetHitResults(int hitResultCount, int countMiss, int countMeh, int countOk, int countGood, int countGreat)`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ public class CalculatorWorkingBeatmap : WorkingBeatmap`
`13`	`13`	`{`
`14`	`14`	`private readonly Beatmap _beatmap;`
`15`	`15`
`16`		`- public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream, string beatmapId) : this(ruleset, ReadFromStream(beatmapStream), beatmapId) { }`
	`16`	`+ public CalculatorWorkingBeatmap(Ruleset ruleset, Stream beatmapStream) : this(ruleset, ReadFromStream(beatmapStream)) { }`
`17`	`17`
`18`		`- private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap, string beatmapId) : base(beatmap.BeatmapInfo, null)`
	`18`	`+ private CalculatorWorkingBeatmap(Ruleset ruleset, Beatmap beatmap) : base(beatmap.BeatmapInfo, null)`
`19`	`19`	`{`
`20`	`20`	`_beatmap = beatmap;`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected override OsuCalculation CalculatePerformance(OsuScore score, object di`
`108`	`108`	`private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)`
`109`	`109`	`{`
`110`	`110`	`using var beatmapStream = beatmapProvider.GetBeatmapStream(beatmapId);`
`111`		`- return new CalculatorWorkingBeatmap(OsuRuleset, beatmapStream, beatmapId);`
	`111`	`+ return new CalculatorWorkingBeatmap(OsuRuleset, beatmapStream);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`private static Dictionary<HitResult, int> GetHitResults(int hitResultCount, int countMiss, int countMeh, int countOk)`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected override TaikoCalculation CalculatePerformance(TaikoScore score, objec`
`105`	`105`	`private CalculatorWorkingBeatmap GetWorkingBeatmap(string beatmapId)`
`106`	`106`	`{`
`107`	`107`	`using var beatmapStream = _beatmapProvider.GetBeatmapStream(beatmapId);`
`108`		`- return new CalculatorWorkingBeatmap(TaikoRuleset, beatmapStream, beatmapId);`
	`108`	`+ return new CalculatorWorkingBeatmap(TaikoRuleset, beatmapStream);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`private static Dictionary<HitResult, int> GetHitResults(int hitResultCount, int countMiss, int countOk)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class WebBeatmapProvider(IConfiguration configuration) : IBeatmapProvider`
`12`	`12`
`13`	`13`	`public async Task<bool> EnsureBeatmap(string beatmapId)`
`14`	`14`	`{`
`15`		`- var beatmapPath = Path.Combine(_beatmapDirectory, $"{beatmapId}.osu");`
	`15`	`+ var beatmapPath = GetBeatmapPath(beatmapId);`
`16`	`16`	`if (!File.Exists(beatmapPath))`
`17`	`17`	`{`
`18`	`18`	`using var response = await _httpClient.GetAsync($"https://osu.ppy.sh/osu/{beatmapId}");`
`@@ -29,8 +29,13 @@ public async Task<bool> EnsureBeatmap(string beatmapId)`
`29`	`29`
`30`	`30`	`public Stream GetBeatmapStream(string beatmapId)`
`31`	`31`	`{`
`32`		`- var beatmapPath = Path.Combine(_beatmapDirectory, beatmapId);`
	`32`	`+ var beatmapPath = GetBeatmapPath(beatmapId);`
`33`	`33`	`return File.OpenRead(beatmapPath);`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ private string GetBeatmapPath(string beatmapId)`
	`37`	`+ {`
	`38`	`+ return Path.Combine(_beatmapDirectory, $"{beatmapId}.osu");`
	`39`	`+ }`
`35`	`40`	`}`
`36`	`41`	`}`