Close #8

Welcome nuget and fixed that achievements are output under screenshots!
liebki · Aug 18, 2022 · 8c6ef53 · 8c6ef53
1 parent 77016aa
commit 8c6ef53
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@ A wrapper for the API of wrag.io, to get a game including all it's data
 ### Created using
 - .NET Core 6.0
 
-### Nuget(s)
-- Newtonsoft.Json (Needs to be added to your project too, until I figure out why)
+### Nugets/Dependencies used
+- Newtonsoft.Json
 
 ## Features
 
 ### New
-- Thanks to sgamesdev, I got reminded that the screenshots are missing too, those are included by now
+- A nuget package exists now, no more problems: https://www.nuget.org/packages/RawgNET
 
 ### General
 - Get a "Game" object including the complete data like images, description, achievements, screenshots and many more things..
@@ -42,7 +42,7 @@ using (RawgClient client = new(new RawgClientOptions("YOUR KEY FROM https://rawg
 		Console.WriteLine($"Screenshots {Environment.NewLine}--------------");
 		foreach (Screenshot item in game.Screenshots)
 		{
-			Console.WriteLine($"------ {Environment.NewLine} Id: {item.Id} {Environment.NewLine} Url: {item.Image} {Environment.NewLine} Image: {item.Image} {Environment.NewLine}");
+			Console.WriteLine($"------ {Environment.NewLine} Id: {item.Id} {Environment.NewLine} Url: {item.Image} {Environment.NewLine} Dimension: {item.Width}x{item.Height} {Environment.NewLine}");
 		}
 	}
 	else
@@ -74,7 +74,5 @@ At https://rawg.io/apidocs just press the "Get API Key" button.
 
 ## Roadmap
 
-- Make code more clean especially the ""RawgRequest"" method!
-- Clean up the messy RawgAccessManager
-- Export "Newtonsoft.Json" nuget package with library
+- Clean up the messy RawgAccessManager!
 - More to come..
diff --git a/RawgNET/RawgAccessManager.cs b/RawgNET/RawgAccessManager.cs
@@ -181,7 +181,7 @@ private static async Task<AchievementResult> QueryMoreAchievements(string page)
 
         private static async Task<ScreenshotResult> QueryScreenshots(string gamename, string rawgkey)
         {
-            string RawgRequestUrl = GameNameToAchievementQueryUrl(gamename, rawgkey);
+            string RawgRequestUrl = GameNameToScreenshotQueryUrl(gamename, rawgkey);
             string JsonResponse = "";
             using (HttpClient Client = new())
             {
@@ -231,6 +231,24 @@ private static async Task<Game> QueryGame(string gamename, string rawgkey)
             return DeserializeGameJson(JsonResponse);
         }
 
+        /// <summary>
+        /// Method to build a ready-to-query url (screenshots)
+        /// </summary>
+        /// <param name="gamename">Name of the game we'd like to query</param>
+        /// <param name="rawgkey">Your API-Key</param>
+        /// <returns></returns>
+        private static string GameNameToScreenshotQueryUrl(string gamename, string rawgkey)
+        {
+            string GameName = gamename;
+            GameName = GameName.ToLower();
+            if (gamename.Contains(' '))
+            {
+                GameName = GameName.Replace(" ", "-");
+            }
+            string reqUrl = RawgApiBaseUrl + GameName + $"/screenshots?key={rawgkey}";
+            return reqUrl;
+        }
+
         /// <summary>
         /// Method to build a ready-to-query url (achievements)
         /// </summary>

diff --git a/RawgNET/RawgNET.csproj b/RawgNET/RawgNET.csproj
@@ -4,15 +4,27 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.0.4</Version>
+    <Version>0.0.5</Version>
     <Title>RawgNet</Title>
     <Authors>liebki</Authors>
     <Copyright>liebki</Copyright>
     <PackageProjectUrl>https://github.com/liebki/RawgNET</PackageProjectUrl>
     <RepositoryUrl>https://github.com/liebki/RawgNET</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <Description>A wrapper for the API of wrag.io, to get a game including all it's data</Description>
+    <IncludeSymbols>False</IncludeSymbols>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\..\..\Desktop\LICENSE.txt">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

diff --git a/RawgNetDemo/Program.cs b/RawgNetDemo/Program.cs
@@ -26,7 +26,7 @@ private static void Main(string[] args)
                     Console.WriteLine($"Screenshots {Environment.NewLine}--------------");
                     foreach (Screenshot item in game.Screenshots)
                     {
-                        Console.WriteLine($"------ {Environment.NewLine} Id: {item.Id} {Environment.NewLine} Url: {item.Image} {Environment.NewLine} Image: {item.Image} {Environment.NewLine}");
+                        Console.WriteLine($"------ {Environment.NewLine} Id: {item.Id} {Environment.NewLine} Url: {item.Image} {Environment.NewLine} Dimension: {item.Width}x{item.Height} {Environment.NewLine}");
                     }
                 }
                 else

diff --git a/RawgNetDemo/RawgNetDemo.csproj b/RawgNetDemo/RawgNetDemo.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<Version>0.0.4</Version>
+	<Version>0.0.5</Version>
 	<Title>RawgNetDemo</Title>
 	<Authors>liebki</Authors>
 	<Copyright>liebki</Copyright>