playnite 8

spektor56 · spektor56 · commit 3350f33d3894 · 2020-10-14T23:48:28.000-04:00
diff --git a/RAWGMetadata/Lib/Playnite.Common.dll b/RAWGMetadata/Lib/Playnite.Common.dll
diff --git a/RAWGMetadata/Lib/Playnite.dll b/RAWGMetadata/Lib/Playnite.dll
diff --git a/RAWGMetadata/RAWGMetadata.csproj b/RAWGMetadata/RAWGMetadata.csproj
@@ -32,14 +32,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Playnite, Version=7.9.0.18735, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Lib\Playnite.dll</HintPath>
-    </Reference>
-    <Reference Include="Playnite.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Lib\Playnite.Common.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -103,7 +95,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="PlayniteSDK">
-      <Version>5.2.0-rc</Version>
+      <Version>5.4.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -113,9 +105,5 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <Content Include="Lib\Playnite.Common.dll" />
-    <Content Include="Lib\Playnite.dll" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/RAWGMetadata/RawgMetadataSettings.cs b/RAWGMetadata/RawgMetadataSettings.cs
@@ -6,8 +6,8 @@ namespace RAWGMetadata
 {
     public class RawgMetadataSettings : ObservableObject, ISettings
     {
-        private RawgMetadataSettings editingClone;
-        private readonly RawgMetadataPlugin plugin;
+        private RawgMetadataSettings _editingClone;
+        private readonly RawgMetadataPlugin _plugin;
 
         public RawgMetadataSettings()
         {
@@ -68,29 +68,29 @@ public RawgMetadataSettings()
 
         public RawgMetadataSettings(RawgMetadataPlugin plugin)
         {
-            this.plugin = plugin;
+            this._plugin = plugin;
 
-            var settings = plugin.LoadPluginSettings<RawgMetadataSettings>();
-            if (settings != null)
+            var savedSettings = plugin.LoadPluginSettings<RawgMetadataSettings>();
+            if (savedSettings != null)
             {
-                LoadValues(settings);
+                RestoreSettings(savedSettings);
             }
 
         }
 
         public void BeginEdit()
         {
-            editingClone = this.GetClone();
+            _editingClone = new RawgMetadataSettings(_plugin);
         }
 
         public void EndEdit()
         {
-            plugin.SavePluginSettings(this);
+            _plugin.SavePluginSettings(this);
         }
 
         public void CancelEdit()
         {
-            LoadValues(editingClone);
+            RestoreSettings(_editingClone);
         }
 
         public bool VerifySettings(out List<string> errors)
@@ -99,9 +99,9 @@ public bool VerifySettings(out List<string> errors)
             return true;
         }
 
-        private void LoadValues(RawgMetadataSettings source)
+        private void RestoreSettings(RawgMetadataSettings source)
         {
-            source.CopyProperties(this, false, null, true);
+            
         }
     }
 }
diff --git a/RAWGMetadata/extension.yaml b/RAWGMetadata/extension.yaml
@@ -1,6 +1,7 @@
-﻿Name: RAWG metadata provider
-Author: Spektor
-Version: 1.1
+﻿Id: Spektor56_Playnite_Metadata_RAWG
+Name: RAWG metadata provider
+Author: Spektor56
+Version: 2.0.0
 Module: RAWGMetadata.dll
 Type: MetadataProvider
 Icon: Resources\rawg.ico
diff --git a/Rawg/Rawg.csproj b/Rawg/Rawg.csproj
@@ -53,7 +53,7 @@ OpenAPI spec version: v1.0
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="JsonSubTypes">
-      <Version>1.6.0</Version>
+      <Version>1.8.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>
diff --git a/RawgTestApp/RawgTestApp.csproj b/RawgTestApp/RawgTestApp.csproj
@@ -91,7 +91,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="PlayniteSDK">
-      <Version>5.2.0-rc2</Version>
+      <Version>5.4.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ namespace RAWGMetadata`
`6`	`6`	`{`
`7`	`7`	`public class RawgMetadataSettings : ObservableObject, ISettings`
`8`	`8`	`{`
`9`		`- private RawgMetadataSettings editingClone;`
`10`		`- private readonly RawgMetadataPlugin plugin;`
	`9`	`+ private RawgMetadataSettings _editingClone;`
	`10`	`+ private readonly RawgMetadataPlugin _plugin;`
`11`	`11`
`12`	`12`	`public RawgMetadataSettings()`
`13`	`13`	`{`
`@@ -68,29 +68,29 @@ public RawgMetadataSettings()`
`68`	`68`
`69`	`69`	`public RawgMetadataSettings(RawgMetadataPlugin plugin)`
`70`	`70`	`{`
`71`		`- this.plugin = plugin;`
	`71`	`+ this._plugin = plugin;`
`72`	`72`
`73`		`- var settings = plugin.LoadPluginSettings<RawgMetadataSettings>();`
`74`		`- if (settings != null)`
	`73`	`+ var savedSettings = plugin.LoadPluginSettings<RawgMetadataSettings>();`
	`74`	`+ if (savedSettings != null)`
`75`	`75`	`{`
`76`		`- LoadValues(settings);`
	`76`	`+ RestoreSettings(savedSettings);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`public void BeginEdit()`
`82`	`82`	`{`
`83`		`- editingClone = this.GetClone();`
	`83`	`+ _editingClone = new RawgMetadataSettings(_plugin);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public void EndEdit()`
`87`	`87`	`{`
`88`		`- plugin.SavePluginSettings(this);`
	`88`	`+ _plugin.SavePluginSettings(this);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public void CancelEdit()`
`92`	`92`	`{`
`93`		`- LoadValues(editingClone);`
	`93`	`+ RestoreSettings(_editingClone);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`public bool VerifySettings(out List<string> errors)`
`@@ -99,9 +99,9 @@ public bool VerifySettings(out List<string> errors)`
`99`	`99`	`return true;`
`100`	`100`	`}`
`101`	`101`
`102`		`- private void LoadValues(RawgMetadataSettings source)`
	`102`	`+ private void RestoreSettings(RawgMetadataSettings source)`
`103`	`103`	`{`
`104`		`- source.CopyProperties(this, false, null, true);`
	`104`	`+`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`