V1.0.1 (#21)

* Fix Video features incorrectly added * Fix Video features incorrectly added
sharkusmanch · Apr 3, 2022 · 6e14a84 · 6e14a84
1 parent 95e8505
commit 6e14a84
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 4 deletions.
diff --git a/extension.yaml b/extension.yaml
@@ -1,7 +1,7 @@
 Id: PCGamingWikiMetadata_c038558e-427b-4551-be4c-be7009ce5a8d
 Name: PCGamingWiki Metadata Provider
 Author: sharkusmanch
-Version: 1.0.0
+Version: 1.0.1
 Module: PCGamingWikiMetadata.dll
 Type: MetadataProvider
 Icon: icon.png
diff --git a/manifest.yaml b/manifest.yaml
@@ -1,5 +1,11 @@
 AddonId: PCGamingWikiMetadata_c038558e-427b-4551-be4c-be7009ce5a8d
 Packages:
+- Version: 1.0.1
+  RequiredApiVersion: 6.2.2
+  ReleaseDate: 2022-04-03
+  PackageUrl: https://github.com/sharkusmanch/playnite-pcgamingwiki-metadata-provider/releases/download/v1.0.1/PCGamingWiki_Metadata_Provider_v1.0.1.pext
+  Changelog:
+    - Fix video features incorrectly added to ineligible games
 - Version: 1.0.0
   RequiredApiVersion: 6.2.2
   ReleaseDate: 2022-04-03

diff --git a/src/PCGWGameController.cs b/src/PCGWGameController.cs
@@ -59,7 +59,7 @@ private void InitalizeSettingsMappings()
             };
         }
 
-        private bool IsSettingEnabled(string key)
+        private bool IsSettingDisabled(string key)
         {
             Func<bool> enabled;
             bool settingExists = this.settingsMap.TryGetValue(key, out enabled);
@@ -68,7 +68,7 @@ private bool IsSettingEnabled(string key)
 
         public void AddTaxonomy(string key, string text)
         {
-            if (IsSettingEnabled(key))
+            if (IsSettingDisabled(key))
             {
                 return;
             }
@@ -128,11 +128,14 @@ public void AddCloudSaves(string launcher, string description)
 
         public void AddVideoFeature(string key, string rating)
         {
-            if (IsSettingEnabled(key) && NativeOrLimitedSupport(rating))
+            if (IsSettingDisabled(key) || !NativeOrLimitedSupport(rating))
             {
                 return;
             }
 
+            logger.Debug($"Adding {key} {rating} for {Game.Name}");
+            logger.Debug($"Supported {NativeOrLimitedSupport(rating)}");
+
             switch (key)
             {
                 case PCGamingWikiType.Video.HDR:
@@ -156,6 +159,8 @@ public void SetXboxPlayAnywhere()
 
         private bool NativeOrLimitedSupport(string rating)
         {
+            logger.Debug(rating);
+
             return rating == PCGamingWikiType.Rating.NativeSupport ||
                 rating == PCGamingWikiType.Rating.Limited;
         }

diff --git a/tests/PCGWGame_Test_BAT.cs b/tests/PCGWGame_Test_BAT.cs
@@ -134,6 +134,20 @@ public void TestMultiplayer()
         features.Should().NotContain("Local Multiplayer: Co-Op", "Local Multiplayer: Versus");
     }
 
+    [Fact]
+    public void TestHDR()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("HDR");
+    }
+
+    [Fact]
+    public void TestRayTracing()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("Ray Tracing");
+    }
+
     public void Dispose()
     {
 

diff --git a/tests/PCGWGame_Test_CITIES.cs b/tests/PCGWGame_Test_CITIES.cs
@@ -54,6 +54,20 @@ public void TestParsePerspectives()
         arr.Should().Contain("Bird's-eye view");
     }
 
+    [Fact]
+    public void TestHDR()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("HDR");
+    }
+
+    [Fact]
+    public void TestRayTracing()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("Ray Tracing");
+    }
+
     [Fact]
     public void TestParseControls()
     {

diff --git a/tests/PCGWGame_Test_CODMW.cs b/tests/PCGWGame_Test_CODMW.cs
@@ -106,6 +106,20 @@ public void TestControllerSupport()
         features.Should().Contain("Full Controller Support");
     }
 
+    [Fact]
+    public void TestHDR()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().Contain("HDR");
+    }
+
+    [Fact]
+    public void TestRayTracing()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().Contain("Ray Tracing");
+    }
+
     [Fact]
     public void TestMultiplayer()
     {

diff --git a/tests/PCGWGame_Test_DQ11.cs b/tests/PCGWGame_Test_DQ11.cs
@@ -28,6 +28,8 @@ public PCGWGame_Test_DQ11()
         this.client.GetSettings().ImportTagThemes = false;
         this.client.GetSettings().ImportTagArtStyle = false;
         this.client.GetSettings().ImportXboxPlayAnywhere = false;
+        this.client.GetSettings().ImportFeatureHDR = true;
+        this.client.GetSettings().ImportFeatureRayTracing = true;
 
         this.client.FetchGamePageContent(this.testGame);
     }
@@ -130,6 +132,20 @@ public void TestControllerSupport()
         features.Should().Contain("Full Controller Support");
     }
 
+    [Fact]
+    public void TestHDR()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("HDR");
+    }
+
+    [Fact]
+    public void TestRayTracing()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("Ray Tracing");
+    }
+
     public void Dispose()
     {
 

diff --git a/tests/PCGWGame_Test_OVERCOOKED.cs b/tests/PCGWGame_Test_OVERCOOKED.cs
@@ -115,6 +115,20 @@ public void TestMultiplayer()
         features.Should().Contain("Local Multiplayer: 2-4", "Local Multiplayer: Co-op", "Local Multiplayer: Versus");
     }
 
+    [Fact]
+    public void TestHDR()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("HDR");
+    }
+
+    [Fact]
+    public void TestRayTracing()
+    {
+        var features = this.testGame.Features.Select(i => i.ToString()).ToArray();
+        features.Should().NotContain("Ray Tracing");
+    }
+
     public void Dispose()
     {