Merge pull request #251 from pathartl/develop

Merging the mamoth Version 1.0.0 develop branch to master.

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "BleemSync/wwwroot/lib"
+}

.gitignore

@@ -23,7 +23,6 @@ x64/
 x86/
 build/
 bld/
-[Bb]in/
 [Oo]bj/
 [Oo]ut/
 msbuild.log
@@ -32,6 +31,16 @@ msbuild.wrn
 
 # Visual Studio 2015
 .vs/
+
 BleemSync-*.zip
 Publish/
 BleemSync.Payload/System/BleemSync/
+*.flag
+Payload/system/bleemsync/
+Payload/system/defaults/cover.png
+Payload/system/defaults/pcsx.cfg
+
+BleemSync/BleemSync.db
+System/Databases/regional.db
+BleemSync/Games/
+BleemSync/ui_menu.db

BleemSync.Central.Data/BleemSync.Central.Data.csproj

@@ -1,18 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RootNamespace>BleemSync.Central.Data</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\BleemSync.Utilities\BleemSync.Utilities.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RootNamespace>BleemSync.Central.Data</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BleemSync.Utilities\BleemSync.Utilities.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
+  </ItemGroup>
+
+</Project>

BleemSync.Central.Data/DatabaseContext.cs

@@ -1,7 +1,5 @@
 using BleemSync.Central.Data.Models;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.IO;
 
 namespace BleemSync.Central.Data
 {

BleemSync.Central.Data/Game/Cover.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
 
 namespace BleemSync.Central.Data.Models
 {

BleemSync.Central.Data/Game/Disc.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using System.ComponentModel.DataAnnotations;
 
 namespace BleemSync.Central.Data.Models
 {

BleemSync.Central.Data/Game/Game.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Text;
 
 namespace BleemSync.Central.Data.Models
 {
@@ -11,6 +10,7 @@ public class Game
     {
         [Key]
         public int Id { get; set; }
+	      public String RelativePath { get; set; }
         public string Title { get; set; }
         public string CommonTitle { get; set; }
         public string Region { get; set; }

BleemSync.Central.Services/BleemSync.Central.Services.csproj

@@ -4,9 +4,14 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>BleemSync.Central.Services</RootNamespace>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\BleemSync.Central.Data\BleemSync.Central.Data.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
+  </ItemGroup>
+
+
 </Project>

BleemSync.Central.Services/GameService.cs

@@ -1,7 +1,5 @@
 using BleemSync.Central.Data;
-using BleemSync.Central.Data.Models;
 using BleemSync.Central.ViewModels;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

BleemSync.Central.Services/ViewModels/CoverDTO.cs

@@ -1,8 +1,4 @@
 using BleemSync.Central.Data.Models;
-using BleemSync.Central.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace BleemSync.Central.ViewModels
 {

BleemSync.Central.Services/ViewModels/DiscDTO.cs

@@ -1,8 +1,4 @@
 using BleemSync.Central.Data.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace BleemSync.Central.ViewModels
 {

BleemSync.Central.Services/ViewModels/GameDTO.cs

@@ -1,8 +1,6 @@
 using BleemSync.Central.Data.Models;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace BleemSync.Central.ViewModels
 {

BleemSync.Central/BleemSync.Central.csproj

@@ -1,22 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <AssemblyName>BleemSync.Central</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Net.Compilers" Version="2.10.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\BleemSync.Central.Services\BleemSync.Central.Services.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <AssemblyName>BleemSync.Central</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Net.Compilers" Version="2.10.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BleemSync.Central.Services\BleemSync.Central.Services.csproj" />
+  </ItemGroup>
+
+</Project>

BleemSync.Central/Controllers/PlayStationApiController.cs

@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using BleemSync.Central.Services;
 using BleemSync.Central.Data;
@@ -48,6 +46,14 @@ public ActionResult GetBySerial(string serial)
             return new JsonResult(game);
         }
 
+        [HttpGet("{serial}")]
+        public ActionResult GetByFingerprint(string serial)
+        {
+            var game = _service.GetGameBySerialNumber(serial);
+
+            return new JsonResult(game);
+        }
+
         [HttpGet("{serial}")]
         public ActionResult GetCoverBySerial(string serial)
         {

BleemSync.Central/Controllers/PlayStationController.cs

@@ -1,11 +1,9 @@
 using BleemSync.Central.Data;
 using BleemSync.Central.Services;
-using BleemSync.Central.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace BleemSync.Central.Controllers
 {

BleemSync.Central/Program.cs

@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace BleemSync.Central
 {

BleemSync.Central/Startup.cs

@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Newtonsoft.Json.Serialization;
 using BleemSync.Central.Data;
 using Microsoft.EntityFrameworkCore;
@@ -50,6 +43,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 app.UseHsts();
             }
 
+            app.UseCors(builder => builder
+                .AllowAnyOrigin()
+                .AllowAnyMethod()
+                .AllowAnyHeader()
+                .AllowCredentials());
             app.UseStaticFiles();
             app.UseHttpsRedirection();
             app.UseMvc();

BleemSync.Data/Abstractions/IGameManagerFileRepository.cs

@@ -0,0 +1,15 @@
+using BleemSync.Data.Entities;
+using ExtCore.Data.Abstractions;
+using System.Collections.Generic;
+
+namespace BleemSync.Data.Abstractions
+{
+    public interface IGameManagerFileRepository : IRepository
+    {
+        IEnumerable<GameManagerFile> All();
+        GameManagerFile Get(int id);
+        void Create(GameManagerFile file);
+        void Update(GameManagerFile file);
+        void Delete(GameManagerFile file);
+    }
+}

BleemSync.Data/Abstractions/IGameManagerNodeRepository.cs

@@ -0,0 +1,15 @@
+using BleemSync.Data.Entities;
+using ExtCore.Data.Abstractions;
+using System.Collections.Generic;
+
+namespace BleemSync.Data.Abstractions
+{
+    public interface IGameManagerNodeRepository : IRepository
+    {
+        IEnumerable<GameManagerNode> All();
+        GameManagerNode Get(int id);
+        void Create(GameManagerNode node);
+        void Update(GameManagerNode node);
+        void Delete(GameManagerNode node);
+    }
+}

BleemSync.Data/BleemSync.Data.csproj

@@ -3,18 +3,17 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>BleemSync.Data</RootNamespace>
-    <AssemblyVersion>0.4.0.0</AssemblyVersion>
-    <FileVersion>0.4.0.0</FileVersion>
-    <Version>0.4.0</Version>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
+    <PackageReference Include="ExtCore.Data.Abstractions" Version="3.3.0" />
+    <PackageReference Include="ExtCore.Data.Entities.Abstractions" Version="3.3.0" />
+    <PackageReference Include="ExtCore.Data.EntityFramework.Sqlite" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BleemSync.Utilities\BleemSync.Utilities.csproj" />
+    <RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
   </ItemGroup>
 
+
 </Project>

BleemSync.Data/Entities/GameGenre.cs

@@ -0,0 +1,12 @@
+using ExtCore.Data.Entities.Abstractions;
+using System.ComponentModel.DataAnnotations;
+
+namespace BleemSync.Data.Entities
+{
+    public class GameGenre : IEntity
+    {
+        [Key]
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}

BleemSync.Data/Entities/GameManagerFile.cs

@@ -0,0 +1,15 @@
+using ExtCore.Data.Entities.Abstractions;
+using System.ComponentModel.DataAnnotations;
+
+namespace BleemSync.Data.Entities
+{
+    public class GameManagerFile : IEntity
+    {
+        [Key]
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Path { get; set; }
+        public int NodeId { get; set; }
+        public virtual GameManagerNode Node { get; set; }
+    }
+}