diff options
author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-09-21 23:06:01 -0400 |
---|---|---|
committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-09-21 23:34:52 -0400 |
commit | 57d9d28554de79734401a68ee1151fc4e9e0ca83 (patch) | |
tree | fb7883d03cdf6f479e647e39a09a61bade11a610 | |
parent | f0e2117f70455bd9883321ae5b0bf40562f2d5de (diff) | |
parent | 06ed54b2c6c2e1f49d6975a34ea36f685d7f7c49 (diff) | |
download | SMAPI-57d9d28554de79734401a68ee1151fc4e9e0ca83.tar.gz SMAPI-57d9d28554de79734401a68ee1151fc4e9e0ca83.tar.bz2 SMAPI-57d9d28554de79734401a68ee1151fc4e9e0ca83.zip |
Merge remote-tracking branch 'dewdrop/master' into feature/update-check-api (#336)
# Conflicts:
# .gitignore
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | Dewdrop.sln | 22 | ||||
-rw-r--r-- | Dewdrop/Controllers/CheckController.cs | 60 | ||||
-rw-r--r-- | Dewdrop/Dewdrop.csproj | 27 | ||||
-rw-r--r-- | Dewdrop/Models/IModModel.cs | 16 | ||||
-rw-r--r-- | Dewdrop/Models/ModGenericModel.cs | 40 | ||||
-rw-r--r-- | Dewdrop/Models/NexusResponseModel.cs | 48 | ||||
-rw-r--r-- | Dewdrop/Program.cs | 27 | ||||
-rw-r--r-- | Dewdrop/Properties/launchSettings.json | 29 | ||||
-rw-r--r-- | Dewdrop/Startup.cs | 43 | ||||
-rw-r--r-- | Dewdrop/appsettings.Development.json | 10 | ||||
-rw-r--r-- | Dewdrop/appsettings.json | 8 |
12 files changed, 333 insertions, 1 deletions
@@ -259,4 +259,6 @@ _Pvt_Extensions # JetBrains Rider .idea/ -*.sln.iml
\ No newline at end of file +*.sln.iml + +Dewdrop/ScaffoldingReadMe.txt diff --git a/Dewdrop.sln b/Dewdrop.sln new file mode 100644 index 00000000..761e6ccc --- /dev/null +++ b/Dewdrop.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dewdrop", "Dewdrop\Dewdrop.csproj", "{0DEC7A86-4D43-43B0-A5F8-7686DDB6EC97}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0DEC7A86-4D43-43B0-A5F8-7686DDB6EC97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DEC7A86-4D43-43B0-A5F8-7686DDB6EC97}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DEC7A86-4D43-43B0-A5F8-7686DDB6EC97}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DEC7A86-4D43-43B0-A5F8-7686DDB6EC97}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Dewdrop/Controllers/CheckController.cs b/Dewdrop/Controllers/CheckController.cs new file mode 100644 index 00000000..f3cdd364 --- /dev/null +++ b/Dewdrop/Controllers/CheckController.cs @@ -0,0 +1,60 @@ +using System; +using System.Net.Http; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using Newtonsoft.Json; +using System.Collections.Generic; +using Dewdrop.Models; + +namespace Dewdrop.Controllers +{ + [Produces("application/json")] + [Route("api/check")] + public class CheckController : Controller + { + [HttpPost] + public async Task<string> Post([FromBody] NexusResponseModel[] mods) + { + using (var client = new HttpClient()) + { + // the return array of mods + var modList = new List<ModGenericModel>(); + + foreach (var mod in mods) + { + try + { + // create request with HttpRequestMessage + var request = new HttpRequestMessage(HttpMethod.Get, new Uri($"http://www.nexusmods.com/stardewvalley/mods/{mod.Id}")); + + // add the Nexus Client useragent to get JSON response from the site + request.Headers.UserAgent.ParseAdd("Nexus Client v0.63.15"); + + // send the request out + var response = await client.SendAsync(request); + // ensure the response is valid (throws exception) + response.EnsureSuccessStatusCode(); + + // get the JSON string of the response + var stringResponse = await response.Content.ReadAsStringAsync(); + + // create the mod data from the JSON string + var modData = JsonConvert.DeserializeObject<NexusResponseModel>(stringResponse); + + // add to the list of mods + modList.Add(modData.ModInfo()); + } + catch (Exception ex) + { + var modData = mod.ModInfo(); + modData.Valid = false; + + modList.Add(modData); + } + } + + return JsonConvert.SerializeObject(modList, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }); + } + } + } +}
\ No newline at end of file diff --git a/Dewdrop/Dewdrop.csproj b/Dewdrop/Dewdrop.csproj new file mode 100644 index 00000000..fa1d88eb --- /dev/null +++ b/Dewdrop/Dewdrop.csproj @@ -0,0 +1,27 @@ +<Project Sdk="Microsoft.NET.Sdk.Web"> + + <PropertyGroup> + <TargetFramework>netcoreapp1.1</TargetFramework> + <PackageTargetFallback>portable-net45+win8</PackageTargetFallback> + </PropertyGroup> + + <ItemGroup> + <Folder Include="wwwroot\" /> + </ItemGroup> + <ItemGroup> + <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" /> + <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" /> + <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" /> + <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" /> + <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" /> + <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" /> + <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.1" /> + </ItemGroup> + <ItemGroup> + <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" /> + </ItemGroup> + +</Project> diff --git a/Dewdrop/Models/IModModel.cs b/Dewdrop/Models/IModModel.cs new file mode 100644 index 00000000..aa6583d4 --- /dev/null +++ b/Dewdrop/Models/IModModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Dewdrop.Models +{ + interface IModModel + { + /// <summary> + /// Basic information in the form of <see cref="ModGenericModel"/> + /// </summary> + /// <returns><see cref="ModGenericModel"/></returns> + ModGenericModel ModInfo(); + } +} diff --git a/Dewdrop/Models/ModGenericModel.cs b/Dewdrop/Models/ModGenericModel.cs new file mode 100644 index 00000000..829c396a --- /dev/null +++ b/Dewdrop/Models/ModGenericModel.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Dewdrop.Models +{ + public class ModGenericModel + { + /// <summary> + /// An identifier for the mod. + /// </summary> + public int Id { get; set; } + + /// <summary> + /// The mod's name. + /// </summary> + public string Name { get; set; } + + /// <summary> + /// The vendor identifier for the mod. + /// </summary> + public string Vendor { get; set; } + + /// <summary> + /// The mod's version number. + /// </summary> + public string Version { get; set; } + + /// <summary> + /// The mod's URL + /// </summary> + public string Url { get; set; } + + /// <summary> + /// Is the mod a valid mod. + /// </summary> + public bool Valid { get; set; } = true; + } +} diff --git a/Dewdrop/Models/NexusResponseModel.cs b/Dewdrop/Models/NexusResponseModel.cs new file mode 100644 index 00000000..e954a8bc --- /dev/null +++ b/Dewdrop/Models/NexusResponseModel.cs @@ -0,0 +1,48 @@ +using System; +using Newtonsoft.Json; + +namespace Dewdrop.Models +{ + public class NexusResponseModel : IModModel + { + /// <summary> + /// The name of the mod. + /// </summary> + [JsonProperty("name")] + public string Name { get; set; } + + /// <summary> + /// The version of the mod. + /// </summary> + [JsonProperty("version")] + public string Version { get; set; } + + /// <summary> + /// The NexusMod ID for the mod. + /// </summary> + [JsonProperty("id")] + public int Id { get; set; } + + /// <summary> + /// The URL of the mod. + /// </summary> + [JsonProperty("mod_page_uri")] + public string Url { get; set; } + + /// <summary> + /// Return mod information about a Nexus mod + /// </summary> + /// <returns><see cref="ModGenericModel"/></returns> + public ModGenericModel ModInfo() + { + return new ModGenericModel + { + Id = Id, + Version = Version, + Name = Name, + Url = Url, + Vendor = "Nexus" + }; + } + } +} diff --git a/Dewdrop/Program.cs b/Dewdrop/Program.cs new file mode 100644 index 00000000..c6a5a642 --- /dev/null +++ b/Dewdrop/Program.cs @@ -0,0 +1,27 @@ +using System; +using System.IO; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Newtonsoft.Json; +using System.Collections.Generic; + +namespace Dewdrop +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup<Startup>() + .UseApplicationInsights() + .Build(); + + host.Run(); + } + } +} diff --git a/Dewdrop/Properties/launchSettings.json b/Dewdrop/Properties/launchSettings.json new file mode 100644 index 00000000..c15134dc --- /dev/null +++ b/Dewdrop/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:59482/", + "sslPort": 0 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "api/check", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Dewdrop": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "api/check", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:59483" + } + } +} diff --git a/Dewdrop/Startup.cs b/Dewdrop/Startup.cs new file mode 100644 index 00000000..00c18bab --- /dev/null +++ b/Dewdrop/Startup.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace Dewdrop +{ + public class Startup + { + public Startup(IHostingEnvironment env) + { + var builder = new ConfigurationBuilder() + .SetBasePath(env.ContentRootPath) + .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) + .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) + .AddEnvironmentVariables(); + Configuration = builder.Build(); + } + + public IConfigurationRoot Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + // Add framework services. + services.AddMvc(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + { + loggerFactory.AddConsole(Configuration.GetSection("Logging")); + loggerFactory.AddDebug(); + + app.UseMvc(); + } + } +} diff --git a/Dewdrop/appsettings.Development.json b/Dewdrop/appsettings.Development.json new file mode 100644 index 00000000..fa8ce71a --- /dev/null +++ b/Dewdrop/appsettings.Development.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/Dewdrop/appsettings.json b/Dewdrop/appsettings.json new file mode 100644 index 00000000..5fff67ba --- /dev/null +++ b/Dewdrop/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Warning" + } + } +} |