From a00e6d2d1ae1abd0642b88f9784be9a3ee6d945a Mon Sep 17 00:00:00 2001
From: Dawid Karczewski <dawidxen@gmail.com>
Date: Wed, 6 Oct 2021 19:55:12 +0200
Subject: [PATCH] Adds Nintendo auth & purchased games list retrieval

---
 .../{PSNLibrary => NintendoLibrary}/App.xaml  |   0
 .../NintendoLibrary/Models/NintendoModels.cs  |  35 ++
 .../NintendoGameController.cs}                |   2 +-
 .../NintendoLibrary/NintendoLibrary.cs        | 146 +++++++
 .../NintendoLibrary.csproj}                   |  22 +-
 .../NintendoLibraryClient.cs}                 |   2 +-
 .../NintendoLibrarySettingsView.xaml}         |  45 +-
 .../NintendoLibrarySettingsView.xaml.cs}      |   6 +-
 .../NintendoLibrarySettingsViewModel.cs}      |  23 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../Services/NintendoAccountClient.cs         | 264 +++++++++++
 source/Libraries/NintendoLibrary/addon.yaml   |   8 +
 .../Libraries/NintendoLibrary/extension.yaml  |   7 +
 source/Libraries/NintendoLibrary/icon.png     | Bin 0 -> 11960 bytes
 .../packages.config                           |   0
 .../Libraries/PSNLibrary/Models/PSNModels.cs  | 163 -------
 source/Libraries/PSNLibrary/PSNLibrary.cs     | 372 ----------------
 .../PSNLibrary/Services/PSNAccountClient.cs   | 413 ------------------
 source/Libraries/PSNLibrary/addon.yaml        |   8 -
 source/Libraries/PSNLibrary/extension.yaml    |   7 -
 source/Libraries/PSNLibrary/icon.png          | Bin 22254 -> 0 bytes
 source/Localization/en_US.xaml                |   2 +-
 source/PlayniteExtensions.sln                 |   6 +-
 23 files changed, 494 insertions(+), 1041 deletions(-)
 rename source/Libraries/{PSNLibrary => NintendoLibrary}/App.xaml (100%)
 create mode 100644 source/Libraries/NintendoLibrary/Models/NintendoModels.cs
 rename source/Libraries/{PSNLibrary/PSNGameController.cs => NintendoLibrary/NintendoGameController.cs} (84%)
 create mode 100644 source/Libraries/NintendoLibrary/NintendoLibrary.cs
 rename source/Libraries/{PSNLibrary/PSNLibrary.csproj => NintendoLibrary/NintendoLibrary.csproj} (91%)
 rename source/Libraries/{PSNLibrary/PSNLibraryClient.cs => NintendoLibrary/NintendoLibraryClient.cs} (80%)
 rename source/Libraries/{PSNLibrary/PSNLibrarySettingsView.xaml => NintendoLibrary/NintendoLibrarySettingsView.xaml} (56%)
 rename source/Libraries/{PSNLibrary/PSNLibrarySettingsView.xaml.cs => NintendoLibrary/NintendoLibrarySettingsView.xaml.cs} (73%)
 rename source/Libraries/{PSNLibrary/PSNLibrarySettingsViewModel.cs => NintendoLibrary/NintendoLibrarySettingsViewModel.cs} (60%)
 rename source/Libraries/{PSNLibrary => NintendoLibrary}/Properties/AssemblyInfo.cs (91%)
 create mode 100644 source/Libraries/NintendoLibrary/Services/NintendoAccountClient.cs
 create mode 100644 source/Libraries/NintendoLibrary/addon.yaml
 create mode 100644 source/Libraries/NintendoLibrary/extension.yaml
 create mode 100644 source/Libraries/NintendoLibrary/icon.png
 rename source/Libraries/{PSNLibrary => NintendoLibrary}/packages.config (100%)
 delete mode 100644 source/Libraries/PSNLibrary/Models/PSNModels.cs
 delete mode 100644 source/Libraries/PSNLibrary/PSNLibrary.cs
 delete mode 100644 source/Libraries/PSNLibrary/Services/PSNAccountClient.cs
 delete mode 100644 source/Libraries/PSNLibrary/addon.yaml
 delete mode 100644 source/Libraries/PSNLibrary/extension.yaml
 delete mode 100644 source/Libraries/PSNLibrary/icon.png

diff --git a/source/Libraries/PSNLibrary/App.xaml b/source/Libraries/NintendoLibrary/App.xaml
similarity index 100%
rename from source/Libraries/PSNLibrary/App.xaml
rename to source/Libraries/NintendoLibrary/App.xaml
diff --git a/source/Libraries/NintendoLibrary/Models/NintendoModels.cs b/source/Libraries/NintendoLibrary/Models/NintendoModels.cs
new file mode 100644
index 0000000..5f3f7b5
--- /dev/null
+++ b/source/Libraries/NintendoLibrary/Models/NintendoModels.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NintendoLibrary.Models
+{
+    public class AuthError
+    {
+        public class Error
+        {
+            public string code { get; set; }
+            public string message { get; set; }
+        }
+        public Error error;
+    }
+
+    public class PurchasedList
+    {
+        public int length { get; set; }
+        public int offset { get; set; }
+        public int total { get; set; }
+        public class Transaction
+        {
+            public string content_type { get; set; }
+            public string title { get; set; }
+            public string device_type { get; set; }
+            public DateTime date { get; set; }
+            public ulong transaction_id { get; set; }
+        }
+
+        public List<Transaction> transactions { get; set; }
+    }
+}
diff --git a/source/Libraries/PSNLibrary/PSNGameController.cs b/source/Libraries/NintendoLibrary/NintendoGameController.cs
similarity index 84%
rename from source/Libraries/PSNLibrary/PSNGameController.cs
rename to source/Libraries/NintendoLibrary/NintendoGameController.cs
index 0efb99a..9c4407b 100644
--- a/source/Libraries/PSNLibrary/PSNGameController.cs
+++ b/source/Libraries/NintendoLibrary/NintendoGameController.cs
@@ -8,6 +8,6 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PSNLibrary
+namespace NintendoLibrary
 {
 }
diff --git a/source/Libraries/NintendoLibrary/NintendoLibrary.cs b/source/Libraries/NintendoLibrary/NintendoLibrary.cs
new file mode 100644
index 0000000..31868fa
--- /dev/null
+++ b/source/Libraries/NintendoLibrary/NintendoLibrary.cs
@@ -0,0 +1,146 @@
+using Playnite.SDK;
+using Playnite.SDK.Models;
+using Playnite.SDK.Plugins;
+using NintendoLibrary.Models;
+using NintendoLibrary.Services;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace NintendoLibrary
+{
+    [LoadPlugin]
+    public class NintendoLibrary : LibraryPluginBase<NintendoLibrarySettingsViewModel>
+    {
+        public NintendoLibrary(IPlayniteAPI api) : base(
+            "Nintendo",
+            Guid.Parse("e4ac81cb-1b1a-4ec9-8639-9a9633989a72"),
+            new LibraryPluginProperties { CanShutdownClient = false, HasCustomizedGameImport = true, HasSettings = true },
+            null,
+            Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"icon.png"),
+            (_) => new NintendoLibrarySettingsView(),
+            api)
+        {
+            SettingsViewModel = new NintendoLibrarySettingsViewModel(this, api);
+        }
+
+        private string ParsePlatform(string platformId)
+        {
+            string platform = null;
+
+            switch (platformId)
+            {
+                case "HAC":
+                    platform = "nintendo_switch";
+                    break;
+
+                case "CTR":
+                    platform = "nintendo_3ds";
+                    break;     
+
+                default:
+                    break;
+            }
+            return platform;
+        }  
+
+        private string FixGameName(string name)
+        {
+            var gameName = name.
+                RemoveTrademarks(" ").
+                NormalizeGameName().
+                Replace("full game", "", StringComparison.OrdinalIgnoreCase).
+                Trim();
+            return Regex.Replace(gameName, @"\s+", " ");
+        }
+
+        private List<GameMetadata> parseGames(List<PurchasedList.Transaction> gamesToParse)
+        {
+            var parsedGames = new List<GameMetadata>();
+            foreach (var title in gamesToParse)
+            {
+                var gameName = FixGameName(title.title);
+
+                string platform = ParsePlatform(title.device_type);
+
+                parsedGames.Add(new GameMetadata
+                {
+                    GameId = title.transaction_id.ToString(),
+                    Name = gameName,
+                    Platforms = new HashSet<MetadataProperty> { new MetadataSpecProperty(platform) }
+                });
+            }
+
+            return parsedGames;
+        }
+        
+        private List<GameMetadata> ParsePlayedList(NintendoAccountClient clientApi)
+        {
+            var gamesToParse = clientApi.GetPurchasedList().GetAwaiter().GetResult();            
+            return parseGames(gamesToParse);
+        }   
+
+        public override IEnumerable<Game> ImportGames(LibraryImportGamesArgs args)
+        {
+            var importedGames = new List<Game>();
+
+            Exception importError = null;
+            if (!SettingsViewModel.Settings.ConnectAccount)
+            {
+                return importedGames;
+            }
+
+            try
+            {
+                var clientApi = new NintendoAccountClient(this, PlayniteApi);
+                var allGames = new List<GameMetadata>();
+                allGames.AddRange(ParsePlayedList(clientApi));
+
+                // This need to happen to merge games from different APIs
+                foreach (var group in allGames.GroupBy(a => a.GameId))
+                {
+                    var game = group.First();
+                    if (PlayniteApi.ApplicationSettings.GetGameExcludedFromImport(game.GameId, Id))
+                    {
+                        continue;
+                    }
+
+                    var alreadyImported = PlayniteApi.Database.Games.FirstOrDefault(a => a.GameId == game.GameId && a.PluginId == Id);
+                    if (alreadyImported == null)
+                    {
+                        game.Source = new MetadataNameProperty("Nintendo");
+                        importedGames.Add(PlayniteApi.Database.ImportGame(game, this));
+                    }
+                }
+            }
+            catch (Exception e) when (!Debugger.IsAttached)
+            {
+                Logger.Error(e, "Failed to import Nintendo games.");
+                importError = e;
+            }
+
+            if (importError != null)
+            {
+                PlayniteApi.Notifications.Add(new NotificationMessage(
+                    ImportErrorMessageId,
+                    string.Format(PlayniteApi.Resources.GetString("LOCLibraryImportError"), Name) +
+                    System.Environment.NewLine + importError.Message,
+                    NotificationType.Error,
+                    () => OpenSettingsView()));
+            }
+            else
+            {
+                PlayniteApi.Notifications.Remove(ImportErrorMessageId);
+            }
+
+            return importedGames;
+        }
+    }
+}
\ No newline at end of file
diff --git a/source/Libraries/PSNLibrary/PSNLibrary.csproj b/source/Libraries/NintendoLibrary/NintendoLibrary.csproj
similarity index 91%
rename from source/Libraries/PSNLibrary/PSNLibrary.csproj
rename to source/Libraries/NintendoLibrary/NintendoLibrary.csproj
index 81c8506..ad17b40 100644
--- a/source/Libraries/PSNLibrary/PSNLibrary.csproj
+++ b/source/Libraries/NintendoLibrary/NintendoLibrary.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>PSNLibrary</RootNamespace>
-    <AssemblyName>PSNLibrary</AssemblyName>
+    <RootNamespace>NintendoLibrary</RootNamespace>
+    <AssemblyName>NintendoLibrary</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -151,16 +151,16 @@
     <Compile Include="..\..\Generic\PlayniteExtensions.Common\PluginSettingsViewModel.cs">
       <Link>Shared\PluginSettingsViewModel.cs</Link>
     </Compile>
-    <Compile Include="Models\PSNModels.cs" />
-    <Compile Include="PSNGameController.cs" />
-    <Compile Include="PSNLibraryClient.cs" />
-    <Compile Include="PSNLibrary.cs" />
-    <Compile Include="PSNLibrarySettingsViewModel.cs" />
-    <Compile Include="PSNLibrarySettingsView.xaml.cs">
-      <DependentUpon>PSNLibrarySettingsView.xaml</DependentUpon>
+    <Compile Include="Models\NintendoModels.cs" />
+    <Compile Include="NintendoGameController.cs" />
+    <Compile Include="NintendoLibraryClient.cs" />
+    <Compile Include="NintendoLibrary.cs" />
+    <Compile Include="NintendoLibrarySettingsViewModel.cs" />
+    <Compile Include="NintendoLibrarySettingsView.xaml.cs">
+      <DependentUpon>NintendoLibrarySettingsView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\PSNAccountClient.cs" />
+    <Compile Include="Services\NintendoAccountClient.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="addon.yaml" />
@@ -185,7 +185,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="PSNLibrarySettingsView.xaml">
+    <Page Include="NintendoLibrarySettingsView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/source/Libraries/PSNLibrary/PSNLibraryClient.cs b/source/Libraries/NintendoLibrary/NintendoLibraryClient.cs
similarity index 80%
rename from source/Libraries/PSNLibrary/PSNLibraryClient.cs
rename to source/Libraries/NintendoLibrary/NintendoLibraryClient.cs
index a1664b5..9650dec 100644
--- a/source/Libraries/PSNLibrary/PSNLibraryClient.cs
+++ b/source/Libraries/NintendoLibrary/NintendoLibraryClient.cs
@@ -5,6 +5,6 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PSNLibrary
+namespace NintendoLibrary
 {
 }
\ No newline at end of file
diff --git a/source/Libraries/PSNLibrary/PSNLibrarySettingsView.xaml b/source/Libraries/NintendoLibrary/NintendoLibrarySettingsView.xaml
similarity index 56%
rename from source/Libraries/PSNLibrary/PSNLibrarySettingsView.xaml
rename to source/Libraries/NintendoLibrary/NintendoLibrarySettingsView.xaml
index 17e3338..31e3fb8 100644
--- a/source/Libraries/PSNLibrary/PSNLibrarySettingsView.xaml
+++ b/source/Libraries/NintendoLibrary/NintendoLibrarySettingsView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="PSNLibrary.PSNLibrarySettingsView"
+<UserControl x:Class="NintendoLibrary.NintendoLibrarySettingsView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,25 +13,15 @@
     </UserControl.Resources>
 
     <!--<TextBlock VerticalAlignment="Center" HorizontalAlignment="Center"
-               Text="PSN integration is currently broken and not supported." />-->
+               Text="Nintendo integration is currently broken and not supported." />-->
 
     <StackPanel Margin="20">
-        <CheckBox Name="CheckPSNConnectAccount"
+        <CheckBox Name="CheckNintendoConnectAccount"
                   IsChecked="{Binding Settings.ConnectAccount}"
                   Content="{DynamicResource LOCSettingsConnectAccount}"/>
 
-        <CheckBox Name="CheckPSNDownloadImageMetadata"
-                  IsChecked="{Binding Settings.DownloadImageMetadata}"
-                  Content="{DynamicResource LOCSettingsDonwloadImageMetadata}"
-                  Margin="0,4,0,0"/>
-
-        <CheckBox Name="CheckPSNMigration"
-                  IsChecked="{Binding Settings.Migration}"
-                  Content="{DynamicResource LOCSettingsMigration}"
-                  Margin="0,4,0,0"/>
-
         <StackPanel DockPanel.Dock="Top" Margin="40,5,0,0"
-                    IsEnabled="{Binding IsChecked, ElementName=CheckPSNConnectAccount}">
+                    IsEnabled="{Binding IsChecked, ElementName=CheckNintendoConnectAccount}">
 
             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
                 <Button Content="{DynamicResource LOCAuthenticateLabel}" HorizontalAlignment="Left"                         
@@ -61,32 +51,5 @@
                 </TextBlock>
             </StackPanel>
         </StackPanel>
-
-        <StackPanel Margin="0,16,0,0">
-            <CheckBox Name="CheckUpdateLastPlayed"
-                  IsChecked="{Binding Settings.LastPlayed}"
-                  Content="{DynamicResource LOCSettingsUpdateLastPlayed}"
-                  Margin="0,4,0,0"/>
-            <CheckBox Name="CheckUpdatePlaytime"
-                      IsChecked="{Binding Settings.Playtime}"
-                      Content="{DynamicResource LOCSettingsUpdatePlaytime}"
-                  Margin="0,4,0,0"/>
-        </StackPanel>
-
-        <StackPanel Margin="0,20,0,0">
-            <Label Content="{DynamicResource LOCSettingsLegacyGames}"></Label>
-            <CheckBox Name="CheckPSNDownloadPS3"
-                  IsChecked="{Binding Settings.PS3}"
-                  Content="{DynamicResource LOCSettingsDownloadPS3}"
-                  Margin="0,4,0,0"/>
-            <CheckBox Name="CheckPSNDownloadPSP"
-                      IsChecked="{Binding Settings.PSP}"
-                      Content="{DynamicResource LOCSettingsDownloadPSP}"
-                  Margin="0,4,0,0"/>
-            <CheckBox Name="CheckPSNDownloadPSVITA"
-                      IsChecked="{Binding Settings.PSVITA}"
-                      Content="{DynamicResource LOCSettingsDownloadPSVITA}"
-                  Margin="0,4,0,0"/>
-        </StackPanel>        
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/source/Libraries/PSNLibrary/PSNLibrarySettingsView.xaml.cs b/source/Libraries/NintendoLibrary/NintendoLibrarySettingsView.xaml.cs
similarity index 73%
rename from source/Libraries/PSNLibrary/PSNLibrarySettingsView.xaml.cs
rename to source/Libraries/NintendoLibrary/NintendoLibrarySettingsView.xaml.cs
index c24a889..9edc7d6 100644
--- a/source/Libraries/PSNLibrary/PSNLibrarySettingsView.xaml.cs
+++ b/source/Libraries/NintendoLibrary/NintendoLibrarySettingsView.xaml.cs
@@ -13,11 +13,11 @@
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PSNLibrary
+namespace NintendoLibrary
 {
-    public partial class PSNLibrarySettingsView : UserControl
+    public partial class NintendoLibrarySettingsView : UserControl
     {
-        public PSNLibrarySettingsView()
+        public NintendoLibrarySettingsView()
         {
             InitializeComponent();
         }
diff --git a/source/Libraries/PSNLibrary/PSNLibrarySettingsViewModel.cs b/source/Libraries/NintendoLibrary/NintendoLibrarySettingsViewModel.cs
similarity index 60%
rename from source/Libraries/PSNLibrary/PSNLibrarySettingsViewModel.cs
rename to source/Libraries/NintendoLibrary/NintendoLibrarySettingsViewModel.cs
index 63b3c27..8f7bd2d 100644
--- a/source/Libraries/PSNLibrary/PSNLibrarySettingsViewModel.cs
+++ b/source/Libraries/NintendoLibrary/NintendoLibrarySettingsViewModel.cs
@@ -1,5 +1,5 @@
 using Playnite.SDK;
-using PSNLibrary.Services;
+using NintendoLibrary.Services;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -7,23 +7,16 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PSNLibrary
+namespace NintendoLibrary
 {
-    public class PSNLibrarySettings
+    public class NintendoLibrarySettings
     {
         public bool ConnectAccount { get; set; } = true;
-        public bool DownloadImageMetadata { get; set; } = true;
-        public bool LastPlayed{ get; set; } = false;
-        public bool Playtime { get; set; } = false;
-        public bool PS3 { get; set; } = true;
-        public bool PSP { get; set; } = true;
-        public bool PSVITA { get; set; } = true;
-        public bool Migration { get; set; } = true;
     }
 
-    public class PSNLibrarySettingsViewModel : PluginSettingsViewModel<PSNLibrarySettings, PSNLibrary>
+    public class NintendoLibrarySettingsViewModel : PluginSettingsViewModel<NintendoLibrarySettings, NintendoLibrary>
     {
-        private PSNAccountClient clientApi;
+        private NintendoAccountClient clientApi;
 
         public bool IsUserLoggedIn
         {
@@ -49,9 +42,9 @@ public RelayCommand<object> LoginCommand
             });
         }
 
-        public PSNLibrarySettingsViewModel(PSNLibrary plugin, IPlayniteAPI api) : base(plugin, api)
+        public NintendoLibrarySettingsViewModel(NintendoLibrary plugin, IPlayniteAPI api) : base(plugin, api)
         {
-            clientApi = new PSNAccountClient(plugin, api);
+            clientApi = new NintendoAccountClient(plugin, api);
             var savedSettings = LoadSavedSettings();
             if (savedSettings != null)
             {
@@ -59,7 +52,7 @@ public PSNLibrarySettingsViewModel(PSNLibrary plugin, IPlayniteAPI api) : base(p
             }
             else
             {
-                Settings = new PSNLibrarySettings();
+                Settings = new NintendoLibrarySettings();
             }
         }
 
diff --git a/source/Libraries/PSNLibrary/Properties/AssemblyInfo.cs b/source/Libraries/NintendoLibrary/Properties/AssemblyInfo.cs
similarity index 91%
rename from source/Libraries/PSNLibrary/Properties/AssemblyInfo.cs
rename to source/Libraries/NintendoLibrary/Properties/AssemblyInfo.cs
index 705bc60..8a6bea5 100644
--- a/source/Libraries/PSNLibrary/Properties/AssemblyInfo.cs
+++ b/source/Libraries/NintendoLibrary/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("PSNLibrary")]
+[assembly: AssemblyTitle("NintendoLibrary")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("PSNLibrary")]
+[assembly: AssemblyProduct("NintendoLibrary")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/source/Libraries/NintendoLibrary/Services/NintendoAccountClient.cs b/source/Libraries/NintendoLibrary/Services/NintendoAccountClient.cs
new file mode 100644
index 0000000..d409a80
--- /dev/null
+++ b/source/Libraries/NintendoLibrary/Services/NintendoAccountClient.cs
@@ -0,0 +1,264 @@
+using Playnite.Common;
+using Playnite.SDK;
+using Playnite.SDK.Data;
+using NintendoLibrary.Models;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Security.Principal;
+using System.Web;
+using System.Net;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Net.Http.Headers;
+using System.Security;
+
+namespace NintendoLibrary.Services
+{
+    public class ApiRedirectResponse
+    {
+        public string redirectUrl { get; set; }
+        public string sid { get; set; }
+    }
+    public class NintendoAccountClient
+    {
+        private static readonly ILogger logger = LogManager.GetLogger();
+        private IPlayniteAPI api;
+        //private MobileTokens mobileToken;
+        private readonly NintendoLibrary library;
+        private readonly string tokenPath;
+        private const int pageRequestLimit = 100;
+        private const string loginUrl = @"https://accounts.nintendo.com/login?post_login_redirect_uri=https%3A%2F%2Fec.nintendo.com/my%2F";        
+        private const string purchasesListUrl = "https://ec.nintendo.com/api/my/transactions?limit={0}&offset={1}";
+
+        public NintendoAccountClient(NintendoLibrary library, IPlayniteAPI api)
+        {
+            this.library = library;
+            this.api = api;
+            tokenPath = Path.Combine(library.GetPluginUserDataPath(), "token.json");
+        }
+
+        public void Login()
+        {
+            var loggedIn = false;
+            
+
+            using (var view = api.WebViews.CreateView(580, 700))
+            {
+                view.LoadingChanged += (s, e) =>
+                {
+                    var address = view.GetCurrentAddress();
+                    if (address.StartsWith(@"https://ec.nintendo.com"))
+                    {
+                        loggedIn = true;
+                        view.Close();
+                    }
+                };
+
+                //view.DeleteDomainCookies("ec.nintendo.com");
+                //view.DeleteDomainCookies("accounts.nintendo.com");
+                //view.DeleteDomainCookies("api.accounts.nintendo.com");
+                //view.DeleteDomainCookies("api.ec.nintendo.com");
+                //view.DeleteDomainCookies("apps.accounts.nintendo.com");
+                view.Navigate(loginUrl);
+                view.OpenDialog();
+            }
+
+            if (!loggedIn)
+            {
+                return;
+            }
+                  
+            dumpCookies();
+
+            return;
+        }
+  
+        private IEnumerable<Playnite.SDK.HttpCookie> dumpCookies()
+        {
+            var view = api.WebViews.CreateOffscreenView();
+
+            var cookies = view.GetCookies(); 
+
+
+            var cookieContainer = new CookieContainer();
+            foreach (var cookie in cookies)
+            {
+                if (cookie.Domain == "ec.nintendo.com")
+                {
+                    cookieContainer.Add(new Uri("https://ec.nintendo.com"), new Cookie(cookie.Name, cookie.Value));
+                }
+                if (cookie.Domain == ".nintendo.com")
+                {
+                    cookieContainer.Add(new Uri("https://ec.nintendo.com"), new Cookie(cookie.Name, cookie.Value));
+                }
+                if (cookie.Domain == "accounts.nintendo.com")                {
+
+                    cookieContainer.Add(new Uri("https://accounts.nintendo.com"), new Cookie(cookie.Name, cookie.Value));
+                }
+                if (cookie.Domain == "https://api.accounts.nintendo.com")
+                {
+                    cookieContainer.Add(new Uri("https://api.accounts.nintendo.com"), new Cookie(cookie.Name, cookie.Value));
+                }
+                if (cookie.Domain == "https://api.ec.nintendo.com")
+                {
+                    cookieContainer.Add(new Uri("https://api.ec.nintendo.com"), new Cookie(cookie.Name, cookie.Value));
+                }
+                if (cookie.Domain == "https://apps.accounts.nintendo.com")
+                {
+                    cookieContainer.Add(new Uri("https://apps.accounts.nintendo.com"), new Cookie(cookie.Name, cookie.Value));
+                }
+            }
+
+            WriteCookiesToDisk(cookieContainer);
+
+            view.Dispose();
+            return cookies;
+        }
+
+        private void WriteCookiesToDisk(CookieContainer cookieJar)
+        {
+            File.Delete(tokenPath);
+            using (Stream stream = File.Create(tokenPath))
+            {
+                try
+                {
+                    Console.Out.Write("Writing cookies to disk... ");
+                    BinaryFormatter formatter = new BinaryFormatter();
+                    formatter.Serialize(stream, cookieJar);
+                    Console.Out.WriteLine("Done.");
+                }
+                catch (Exception e)
+                {
+                    Console.Out.WriteLine("Problem writing cookies to disk: " + e.GetType());
+                }
+            }
+        }
+
+        private CookieContainer ReadCookiesFromDisk()
+        {
+            try
+            {
+                using (Stream stream = File.Open(tokenPath, FileMode.Open))
+                {
+                    Console.Out.Write("Reading cookies from disk... ");
+                    BinaryFormatter formatter = new BinaryFormatter();
+                    Console.Out.WriteLine("Done.");
+                    return (CookieContainer)formatter.Deserialize(stream);
+                }
+            }
+            catch (Exception e)
+            {
+                Console.Out.WriteLine("Problem reading cookies from disk: " + e.GetType());
+                return new CookieContainer();
+            }
+        }
+
+        public async Task CheckAuthentication()
+        {
+            if (!File.Exists(tokenPath))
+            {
+                throw new Exception("User is not authenticated.");
+            }
+            else
+            {
+                if (!await GetIsUserLoggedIn())
+                {
+                    TryRefreshCookies();
+                    if (!await GetIsUserLoggedIn())
+                    {
+                        throw new Exception("User is not authenticated.");
+                    }
+                }
+            }
+        }        
+
+        public async Task<List<PurchasedList.Transaction>> GetPurchasedList()
+        {
+            await CheckAuthentication();
+
+            var titles = new List<PurchasedList.Transaction>();
+
+            var cookieContainer = ReadCookiesFromDisk();
+            using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
+            using (var httpClient = new HttpClient(handler))
+            {
+                var itemCount = 0;
+                var offset = -pageRequestLimit;
+
+                do
+                {
+                    object[] args = { offset, pageRequestLimit };
+                    var resp = await httpClient.GetAsync(purchasesListUrl.Format(pageRequestLimit, offset + pageRequestLimit));
+                    var strResponse = await resp.Content.ReadAsStringAsync();
+                    var titles_part = Serialization.FromJson<PurchasedList>(strResponse);
+                    titles.AddRange(titles_part.transactions);
+                    offset = titles_part.offset;
+                    itemCount = titles_part.total;
+                } while (offset + pageRequestLimit < itemCount);
+            }
+
+            return titles;
+        }
+
+        private void TryRefreshCookies()
+        {
+            string address;
+            using (var webView = api.WebViews.CreateOffscreenView())
+            {
+                webView.LoadingChanged += (s, e) =>
+                {
+                    address = webView.GetCurrentAddress();
+                    webView.Close();
+                };
+
+                webView.NavigateAndWait(loginUrl);
+            }
+
+            dumpCookies();
+        }
+
+        public async Task<bool> GetIsUserLoggedIn()
+        {
+            if (!File.Exists(tokenPath))
+            {
+                return false;
+            }
+
+            try
+            {
+                var cookieContainer = ReadCookiesFromDisk();
+                using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
+                using (var httpClient = new HttpClient(handler))
+                {
+
+                    var resp = httpClient.GetAsync(purchasesListUrl.Format(10, 0)).GetAwaiter().GetResult();
+                    var strResponse = await resp.Content.ReadAsStringAsync();
+
+                    if (Serialization.TryFromJson<AuthError>(strResponse, out var error) && error.error != null)
+                    {
+                        return false;
+                    }
+
+                    if (Serialization.TryFromJson<PurchasedList>(strResponse, out var purchasedList) && purchasedList?.transactions != null)
+                    {
+                        return true;
+                    }
+
+                }
+                return false;
+            }
+            catch (Exception e) when (!Debugger.IsAttached)
+            {
+                logger.Error(e, "Failed to check if user is authenticated into Nintendo.");
+                return false;
+            }
+        }
+    }
+}
diff --git a/source/Libraries/NintendoLibrary/addon.yaml b/source/Libraries/NintendoLibrary/addon.yaml
new file mode 100644
index 0000000..f70dd90
--- /dev/null
+++ b/source/Libraries/NintendoLibrary/addon.yaml
@@ -0,0 +1,8 @@
+AddonId: NintendoLibrary
+IconUrl: https://raw.githubusercontent.com/XenorPLxx/playnite-library-nintendo/main/source/Libraries/NintendoLibrary/icon.png
+Type: GameLibrary
+InstallerManifestUrl: https://raw.githubusercontent.com/XenorPLxx/playnite-library-nintendo/main/manifests/PlayStationLibrary_Builtin.yaml
+ShortDescription: Imports games from Nintendo account.
+Name: Nintendo library integration
+Author: Xenor
+SourceUrl: https://github.com/XenorPLxx/playnite-library-nintendo
diff --git a/source/Libraries/NintendoLibrary/extension.yaml b/source/Libraries/NintendoLibrary/extension.yaml
new file mode 100644
index 0000000..d187478
--- /dev/null
+++ b/source/Libraries/NintendoLibrary/extension.yaml
@@ -0,0 +1,7 @@
+Id: NintendoLibrary
+Name: Nintendo library integration
+Author: Xenor
+Version: 1.0
+Module: NintendoLibrary.dll
+Type: GameLibrary
+Icon: icon.png
\ No newline at end of file
diff --git a/source/Libraries/NintendoLibrary/icon.png b/source/Libraries/NintendoLibrary/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..29c713087262c83b7982554db21124130aa2bd8e
GIT binary patch
literal 11960
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
M#t&;BJbCed0OkWM9{>OV

literal 0
HcmV?d00001

diff --git a/source/Libraries/PSNLibrary/packages.config b/source/Libraries/NintendoLibrary/packages.config
similarity index 100%
rename from source/Libraries/PSNLibrary/packages.config
rename to source/Libraries/NintendoLibrary/packages.config
diff --git a/source/Libraries/PSNLibrary/Models/PSNModels.cs b/source/Libraries/PSNLibrary/Models/PSNModels.cs
deleted file mode 100644
index fc6ad3b..0000000
--- a/source/Libraries/PSNLibrary/Models/PSNModels.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PSNLibrary.Models
-{       
-    public class PlayedTitlesResponseData
-    {
-        public class PlayedTitlesRetrieve
-        {
-            public class Title
-            {
-                public class Image
-                {
-                    public string url { get; set; }
-                }
-                public string conceptId { get; set; }
-                public string entitlementId { get; set; }
-                public bool? isActive { get; set; }
-                public string name { get; set; }
-                public string platform { get; set; }
-                public string productId { get; set; }
-                public string subscriptionService { get; set; }
-                public string titleId { get; set; }
-                public DateTime lastPlayedDateTime { get; set; }
-                public Image image { get; set; }
-
-                public override string ToString()
-                {
-                    return name;
-                }
-            } 
-
-            public List<Title> games { get; set; }
-
-        }
-        public PlayedTitlesRetrieve gameLibraryTitlesRetrieve { get; set; }
-    }
-    public class AccountTitlesResponseData
-    {
-        public class AccountTitlesRetrieve
-        {
-            public class Title
-            {
-                public class Image
-                {
-                    public string url { get; set; }
-                }
-                public string conceptId { get; set; }
-                public string entitlementId { get; set; }
-                public bool? isActive { get; set; }
-                public bool isDownloadable { get; set; }
-                public bool isPreOrder { get; set; }
-                public string name { get; set; }
-                public string platform { get; set; }
-                public string productId { get; set; }
-                public string subscriptionService { get; set; }
-                public string titleId { get; set; }
-                public Image image { get; set; }
-
-                public override string ToString()
-                {
-                    return name;
-                }
-            }
-
-            public class PageInfo
-            {
-                public bool isLast { get; set; }
-                public int offset { get; set; }
-                public int size { get; set; }
-                public int totalCount { get; set; }
-            }
-
-            public List<Title> games { get; set; }
-
-            public PageInfo pageInfo;
-        }
-        public AccountTitlesRetrieve purchasedTitlesRetrieve { get; set; }   
-    }
-    public class AccountTitlesErrorResponse
-    {        
-        public class Error {
-            public string message { get; set; }
-        }
-           
-        public List<Error> errors { get; set; }
-
-        public AccountTitlesResponseData data { get; set; }
-    }
-
-    public class PlayedTitles
-    {
-        public PlayedTitlesResponseData data { get; set; }
-    }
-    public class AccountTitles
-    {
-        public AccountTitlesResponseData data { get; set; }
-    }
-
-    public class PlayedTitlesMobile
-    {
-        public class PlayedTitleMobile
-        {
-            
-            public string imageUrl { get; set; }
-            public string name { get; set; }
-            public string category { get; set; }
-            public string titleId { get; set; }
-            public DateTime lastPlayedDateTime { get; set; }
-            public string playDuration { get; set; }
-
-            public override string ToString()
-            {
-                return name;
-            }
-        }
-
-        public List<PlayedTitleMobile> titles { get; set; }
-        public int? nextOffset { get; set; }
-        public int previousOffset { get; set; }
-        public int totalItemCount { get; set; }
-    }
-
-    public class TrophyTitleMobile
-    {
-
-        public string trophyTitleIconUrl { get; set; }
-        public string trophyTitleName { get; set; }
-        public string trophyTitlePlatform { get; set; }
-        public string npCommunicationId { get; set; }
-
-        public override string ToString()
-        {
-            return trophyTitleName;
-        }
-    }
-
-    public class TrophyTitlesMobile
-    {
-        public List<TrophyTitleMobile> trophyTitles { get; set; }
-        public int? nextOffset { get; set; }
-        public int totalItemCount { get; set; }
-    }
-
-    public class TrophyTitlesWithIdsMobile
-    {
-        public class TrophyTitleWithIdsMobile
-        {
-            public string npTitleId { get; set; }
-            public List<TrophyTitleMobile> trophyTitles { get; set; }
-        }
-
-        public List<TrophyTitleWithIdsMobile> titles { get; set; }
-    }
-
-    public class MobileTokens
-    {
-        public string access_token { get; set; }
-    }
-}
diff --git a/source/Libraries/PSNLibrary/PSNLibrary.cs b/source/Libraries/PSNLibrary/PSNLibrary.cs
deleted file mode 100644
index 833e3b1..0000000
--- a/source/Libraries/PSNLibrary/PSNLibrary.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-using Playnite.SDK;
-using Playnite.SDK.Models;
-using Playnite.SDK.Plugins;
-using PSNLibrary.Models;
-using PSNLibrary.Services;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-
-namespace PSNLibrary
-{
-    [LoadPlugin]
-    public class PSNLibrary : LibraryPluginBase<PSNLibrarySettingsViewModel>
-    {
-        public PSNLibrary(IPlayniteAPI api) : base(
-            "PlayStation",
-            Guid.Parse("e4ac81cb-1b1a-4ec9-8639-9a9633989a71"),
-            new LibraryPluginProperties { CanShutdownClient = false, HasCustomizedGameImport = true, HasSettings = true },
-            null,
-            Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"icon.png"),
-            (_) => new PSNLibrarySettingsView(),
-            api)
-        {
-            SettingsViewModel = new PSNLibrarySettingsViewModel(this, api);
-        }
-
-        private string ParsePlatform(string platformId)
-        {
-            string platform = null;
-
-            switch (platformId)
-            {
-                case "PSP":
-                    platform = "sony_psp";
-                    break;
-
-                case "PSVITA":
-                    platform = "sony_vita";
-                    break;
-
-                case "PS3":
-                    platform = "sony_playstation3";
-                    break;
-
-                case "PS4":
-                    platform = "sony_playstation4";
-                    break;
-
-                case "PS5":
-                    platform = "sony_playstation5";
-                    break;
-
-                default:
-                    break;
-            }
-            return platform;
-        }
-
-        private string ParseCategory(string category)
-        {
-            string platform = null;
-
-            switch (category)
-            {
-                case "ps4_game":
-                    platform = "sony_playstation4";
-                    break;
-
-                case "ps5_native_game":
-                    platform = "sony_playstation5";
-                    break;
-
-                default:
-                    break;
-            }
-            return platform;
-        }
-
-        private string FixGameName(string name)
-        {
-            var gameName = name.
-                RemoveTrademarks(" ").
-                NormalizeGameName().
-                Replace("full game", "", StringComparison.OrdinalIgnoreCase).
-                Trim();
-            return Regex.Replace(gameName, @"\s+", " ");
-        }
-
-        private List<GameMetadata> parseGames(List<AccountTitlesResponseData.AccountTitlesRetrieve.Title> gamesToParse)
-        {
-            var parsedGames = new List<GameMetadata>();
-            foreach (var title in gamesToParse)
-            {
-                var gameName = FixGameName(title.name);
-
-                string platform = ParsePlatform(title.platform);
-
-                parsedGames.Add(new GameMetadata
-                {
-                    GameId = title.titleId,
-                    Name = gameName,
-                    CoverImage = SettingsViewModel.Settings.DownloadImageMetadata ? new MetadataFile(title.image.url) : null,
-                    Platforms = new HashSet<MetadataProperty> { new MetadataSpecProperty(platform) }
-                });
-            }
-
-            return parsedGames;
-        }
-
-        // TODO: Figure out smarter way to share code without overloading
-        private List<GameMetadata> parseGames(List<PlayedTitlesResponseData.PlayedTitlesRetrieve.Title> gamesToParse)
-        {
-            var parsedGames = new List<GameMetadata>();
-            foreach (var title in gamesToParse)
-            {
-                var gameName = FixGameName(title.name);
-
-                string platform = ParsePlatform(title.platform);
-
-                parsedGames.Add(new GameMetadata
-                {
-                    GameId = title.titleId,
-                    Name = gameName,
-                    CoverImage = SettingsViewModel.Settings.DownloadImageMetadata ? new MetadataFile(title.image.url) : null,
-                    Platforms = new HashSet<MetadataProperty> { new MetadataSpecProperty(platform) },
-                    LastActivity = title.lastPlayedDateTime
-                });
-            }
-
-            return parsedGames;
-        }
-
-        // TODO: Figure out smarter way to share code without overloading
-        private List<GameMetadata> parseGames(List<PlayedTitlesMobile.PlayedTitleMobile> gamesToParse)
-        {
-            var parsedGames = new List<GameMetadata>();
-            foreach (var title in gamesToParse)
-            {
-                var gameName = FixGameName(title.name);
-
-                string platform = ParseCategory(title.category);
-
-                ulong playtime = 0;
-
-                foreach (Group group in Regex.Match(title.playDuration , "^PT(\\d+[A-Z])+$").Groups)
-                {
-                    foreach (Capture capture in group.Captures)
-                    {
-                        string type = capture.Value.Substring(capture.Value.Length - 1, 1);
-                        if (int.TryParse(capture.Value.Substring(0, capture.Value.Length - 1), out int number))
-                        {
-                            switch (type)
-                            {
-                                case "S":
-                                    playtime = playtime + (ulong)number;
-                                    break;
-
-                                case "M":
-                                    playtime = playtime + ((ulong)number * 60);
-                                    break;
-
-                                case "H":
-                                    playtime = playtime + ((ulong)number * 60 * 60);
-                                    break;
-
-                                default:
-                                    break;
-                            }
-                        }
-                    }
-                  
-                }
-
-                parsedGames.Add(new GameMetadata
-                {
-                    GameId = title.titleId,
-                    Name = gameName,
-                    CoverImage = SettingsViewModel.Settings.DownloadImageMetadata ? new MetadataFile(title.imageUrl) : null,
-                    Platforms = new HashSet<MetadataProperty> { new MetadataSpecProperty(platform) },
-                    Playtime = playtime,
-                    LastActivity = title.lastPlayedDateTime
-                });
-            }
-
-            return parsedGames;
-        }
-
-        private List<GameMetadata> ParseAccountList(PSNAccountClient clientApi)
-        {
-            var gamesToParse = clientApi.GetAccountTitles().GetAwaiter().GetResult();
-            return parseGames(gamesToParse);
-        }
-        
-        private List<GameMetadata> ParsePlayedList(PSNAccountClient clientApi)
-        {
-            var gamesToParse = clientApi.GetPlayedTitles().GetAwaiter().GetResult();            
-            return parseGames(gamesToParse);
-        }
-
-        private List<GameMetadata> ParsePlayedMobileList(PSNAccountClient clientApi)
-        {
-            var gamesToParse = clientApi.GetPlayedTitlesMobile().GetAwaiter().GetResult();
-            return parseGames(gamesToParse);
-        }
-
-        private List<GameMetadata> ParseThrophies(PSNAccountClient clientApi)
-        {
-            var parsedGames = new List<GameMetadata>();
-            foreach (var title in clientApi.GetTrohpiesMobile().GetAwaiter().GetResult())
-            {
-                var gameName = FixGameName(title.trophyTitleName);
-                gameName = gameName.
-                    TrimEndString("Trophies", StringComparison.OrdinalIgnoreCase).
-                    TrimEndString("Trophy", StringComparison.OrdinalIgnoreCase).
-                    Trim();
-
-                var newGame = new GameMetadata
-                {
-                    GameId = title.npCommunicationId,
-                    Name = gameName
-                };
-
-                var legacyGames = false;
-
-                newGame.Platforms = new HashSet<MetadataProperty> { };
-
-                if (title.trophyTitlePlatform?.Contains("PSP") == true && SettingsViewModel.Settings.PSP)
-                {
-                    newGame.Platforms.Add(new MetadataSpecProperty("sony_psp"));
-                    legacyGames = true;
-                }
-                else if (title.trophyTitlePlatform?.Contains("PSVITA") == true && SettingsViewModel.Settings.PSVITA)
-                {
-                    newGame.Platforms.Add(new MetadataSpecProperty("sony_vita"));
-                    legacyGames = true;
-                }
-                else if (title.trophyTitlePlatform?.Contains("PS3") == true && SettingsViewModel.Settings.PS3)
-                {
-                    newGame.Platforms.Add(new MetadataSpecProperty("sony_playstation3"));
-                    legacyGames = true;
-                }
-
-                // PS4 and PS5 games are added based on different APIs, but for PS3/VITA/PSP games only trophies API is available.
-                if (legacyGames)
-                {
-                    parsedGames.Add(newGame);
-                }
-            }
-
-            return parsedGames;
-        }
-
-        private void MigrateGames(PSNAccountClient clientApi, List<GameMetadata> games)
-        {
-            SettingsViewModel.BeginEdit();
-            SettingsViewModel.Settings.Migration = false;
-            SettingsViewModel.EndEdit();
-
-            var pluginGames = PlayniteApi.Database.Games.Where(x => x.PluginId == Id);
-
-            if (pluginGames.Count() > 0)
-            {
-                string[] titleIdsArray = games.GroupBy(x => x.GameId).Select(x => x.FirstOrDefault()).Select(x => x.GameId).ToArray();
-
-                var gamesWithIds = clientApi.GetTrohpiesWithIdsMobile(titleIdsArray).GetAwaiter().GetResult();
-
-                foreach (var game in pluginGames)
-                {
-                    if (game.GameId.Contains("#ACCOUNT#"))
-                    {
-                        game.GameId = game.GameId.Substring(9);
-                        PlayniteApi.Database.Games.Update(game);
-                    }
-                    else if (game.GameId.Contains("#TROPHY#"))
-                    {
-                        var communicationId = game.GameId.Substring(8);
-                        string npTitleId = gamesWithIds.FirstOrDefault(p => p.trophyTitles.Any(c => c.npCommunicationId == communicationId))?.npTitleId ?? null;
-                        game.GameId = npTitleId != null ? npTitleId : communicationId;
-                        PlayniteApi.Database.Games.Update(game);
-                    }
-                }
-            }
-        }
-
-        public override IEnumerable<Game> ImportGames(LibraryImportGamesArgs args)
-        {
-            var importedGames = new List<Game>();
-
-            Exception importError = null;
-            if (!SettingsViewModel.Settings.ConnectAccount)
-            {
-                return importedGames;
-            }
-
-            try
-            {
-                var clientApi = new PSNAccountClient(this, PlayniteApi);
-                var allGames = new List<GameMetadata>();
-                allGames.AddRange(ParseAccountList(clientApi)); // AccountList has the best game names
-                allGames.AddRange(ParsePlayedMobileList(clientApi));
-                allGames.AddRange(ParsePlayedList(clientApi));
-
-                // Migration is based on API that accepts titleId, that's why ParseThrophies is excluded
-                if (SettingsViewModel.Settings.Migration)
-                {
-                    MigrateGames(clientApi, allGames);
-                }
-                
-                allGames.AddRange(ParseThrophies(clientApi));
-
-                // This need to happen to merge games from different APIs
-                foreach (var group in allGames.GroupBy(a => a.GameId))
-                {
-                    var game = group.First();
-                    if (PlayniteApi.ApplicationSettings.GetGameExcludedFromImport(game.GameId, Id))
-                    {
-                        continue;
-                    }
-
-                    var alreadyImported = PlayniteApi.Database.Games.FirstOrDefault(a => a.GameId == game.GameId && a.PluginId == Id);
-                    if (alreadyImported == null)
-                    {
-                        game.Source = new MetadataNameProperty("PlayStation");
-                        importedGames.Add(PlayniteApi.Database.ImportGame(game, this));
-                    } else
-                    {
-                        if (SettingsViewModel.Settings.LastPlayed)
-                        {
-                            alreadyImported.LastActivity = group.FirstOrDefault(a => a.LastActivity != null)?.LastActivity;
-                        }
-                        if (SettingsViewModel.Settings.Playtime)
-                        {
-                            alreadyImported.Playtime = group.FirstOrDefault(a => a.LastActivity != null)?.Playtime ?? alreadyImported.Playtime;
-                        }
-                        if (SettingsViewModel.Settings.LastPlayed || SettingsViewModel.Settings.Playtime) 
-                        { 
-                            PlayniteApi.Database.Games.Update(alreadyImported);
-                        }
-                    }
-                }
-            }
-            catch (Exception e) when (!Debugger.IsAttached)
-            {
-                Logger.Error(e, "Failed to import PSN games.");
-                importError = e;
-            }
-
-            if (importError != null)
-            {
-                PlayniteApi.Notifications.Add(new NotificationMessage(
-                    ImportErrorMessageId,
-                    string.Format(PlayniteApi.Resources.GetString("LOCLibraryImportError"), Name) +
-                    System.Environment.NewLine + importError.Message,
-                    NotificationType.Error,
-                    () => OpenSettingsView()));
-            }
-            else
-            {
-                PlayniteApi.Notifications.Remove(ImportErrorMessageId);
-            }
-
-            return importedGames;
-        }
-    }
-}
\ No newline at end of file
diff --git a/source/Libraries/PSNLibrary/Services/PSNAccountClient.cs b/source/Libraries/PSNLibrary/Services/PSNAccountClient.cs
deleted file mode 100644
index fe3c3d5..0000000
--- a/source/Libraries/PSNLibrary/Services/PSNAccountClient.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-using Playnite.Common;
-using Playnite.SDK;
-using Playnite.SDK.Data;
-using PSNLibrary.Models;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Security.Principal;
-using System.Web;
-using System.Net;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Net.Http.Headers;
-using System.Security;
-
-namespace PSNLibrary.Services
-{
-    public class ApiRedirectResponse
-    {
-        public string redirectUrl { get; set; }
-        public string sid { get; set; }
-    }
-    public class PSNAccountClient
-    {
-        private static readonly ILogger logger = LogManager.GetLogger();
-        private IPlayniteAPI api;
-        private MobileTokens mobileToken;
-        private readonly PSNLibrary library;
-        private readonly string tokenPath;
-        private const int pageRequestLimit = 100;
-        private const string loginUrl = @"https://web.np.playstation.com/api/session/v1/signin?redirect_uri=https://io.playstation.com/central/auth/login%3FpostSignInURL=https://www.playstation.com/home%26cancelURL=https://www.playstation.com/home&smcid=web:pdc";
-        private const string gameListUrl = "https://web.np.playstation.com/api/graphql/v1/op?operationName=getPurchasedGameList&variables={{\"isActive\":true,\"platform\":[\"ps3\",\"ps4\",\"ps5\"],\"start\":{0},\"size\":{1},\"subscriptionService\":\"NONE\"}}&extensions={{\"persistedQuery\":{{\"version\":1,\"sha256Hash\":\"2c045408b0a4d0264bb5a3edfed4efd49fb4749cf8d216be9043768adff905e2\"}}}}";
-        private const string playedListUrl = "https://web.np.playstation.com/api/graphql/v1/op?operationName=getUserGameList&variables=%7B%22limit%22%3A100%2C%22categories%22%3A%22ps4_game%2Cps5_native_game%22%7D&extensions=%7B%22persistedQuery%22%3A%7B%22version%22%3A1%2C%22sha256Hash%22%3A%22e780a6d8b921ef0c59ec01ea5c5255671272ca0d819edb61320914cf7a78b3ae%22%7D%7D";
-        private const string mobileCodeUrl = @"https://ca.account.sony.com/api/authz/v3/oauth/authorize?access_type=offline&client_id=ac8d161a-d966-4728-b0ea-ffec22f69edc&redirect_uri=com.playstation.PlayStationApp%3A%2F%2Fredirect&response_type=code&scope=psn%3Amobile.v1%20psn%3Aclientapp";
-        private const string mobileTokenUrl = "https://ca.account.sony.com/api/authz/v3/oauth/token";
-        private const string mobileTokenAuth = "YWM4ZDE2MWEtZDk2Ni00NzI4LWIwZWEtZmZlYzIyZjY5ZWRjOkRFaXhFcVhYQ2RYZHdqMHY=";
-        private const string playedMobileListUrl = "https://m.np.playstation.net/api/gamelist/v2/users/me/titles?categories=ps4_game,ps5_native_game&limit=250&offset={0}";
-        private const string trophiesMobileUrl = @"https://m.np.playstation.net/api/trophy/v1/users/me/trophyTitles?limit=250&offset={0}";
-        private const string trophiesWithIdsMobileUrl = @"https://m.np.playstation.net/api/trophy/v1/users/me/titles/trophyTitles?npTitleIds={0}";
-
-        public PSNAccountClient(PSNLibrary library, IPlayniteAPI api)
-        {
-            this.library = library;
-            this.api = api;
-            tokenPath = Path.Combine(library.GetPluginUserDataPath(), "token.json");
-        }
-
-        public void Login()
-        {
-            var loggedIn = false;
-            
-
-            using (var view = api.WebViews.CreateView(580, 700))
-            {
-                view.LoadingChanged += (s, e) =>
-                {
-                    var address = view.GetCurrentAddress();
-                    if (address.StartsWith(@"https://www.playstation.com/"))
-                    {
-                        loggedIn = true;
-                        view.Close();
-                    }
-                };
-
-                view.DeleteDomainCookies(".sony.com");
-                view.DeleteDomainCookies(".ca.account.sony.com");
-                view.DeleteDomainCookies(".playstation.com");
-                view.Navigate(loginUrl);
-                view.OpenDialog();
-            }
-
-            if (!loggedIn)
-            {
-                return;
-            }
-                  
-            dumpCookies();
-
-            return;
-        }
-  
-        private IEnumerable<Playnite.SDK.HttpCookie> dumpCookies()
-        {
-            var view = api.WebViews.CreateOffscreenView();
-
-            var cookies = view.GetCookies(); 
-
-
-            var cookieContainer = new CookieContainer();
-            foreach (var cookie in cookies)
-            {
-                if (cookie.Domain == ".playstation.com")
-                {
-                    cookieContainer.Add(new Uri("https://web.np.playstation.com"), new Cookie(cookie.Name, cookie.Value));
-                }
-                if (cookie.Domain == "ca.account.sony.com")                {
-
-                    cookieContainer.Add(new Uri("https://ca.account.sony.com"), new Cookie(cookie.Name, cookie.Value));
-                }
-                if (cookie.Domain == ".sony.com")
-                {
-                    cookieContainer.Add(new Uri("https://ca.account.sony.com"), new Cookie(cookie.Name, cookie.Value));
-                }
-            }
-
-            WriteCookiesToDisk(cookieContainer);
-
-            view.Dispose();
-            return cookies;
-        }
-
-        private void WriteCookiesToDisk(CookieContainer cookieJar)
-        {
-            File.Delete(tokenPath);
-            using (Stream stream = File.Create(tokenPath))
-            {
-                try
-                {
-                    Console.Out.Write("Writing cookies to disk... ");
-                    BinaryFormatter formatter = new BinaryFormatter();
-                    formatter.Serialize(stream, cookieJar);
-                    Console.Out.WriteLine("Done.");
-                }
-                catch (Exception e)
-                {
-                    Console.Out.WriteLine("Problem writing cookies to disk: " + e.GetType());
-                }
-            }
-        }
-
-        private CookieContainer ReadCookiesFromDisk()
-        {
-            try
-            {
-                using (Stream stream = File.Open(tokenPath, FileMode.Open))
-                {
-                    Console.Out.Write("Reading cookies from disk... ");
-                    BinaryFormatter formatter = new BinaryFormatter();
-                    Console.Out.WriteLine("Done.");
-                    return (CookieContainer)formatter.Deserialize(stream);
-                }
-            }
-            catch (Exception e)
-            {
-                Console.Out.WriteLine("Problem reading cookies from disk: " + e.GetType());
-                return new CookieContainer();
-            }
-        }
-
-        private async Task<bool> getMobileToken()
-        {
-            var cookieContainer = ReadCookiesFromDisk();
-            using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
-            using (var httpClient = new HttpClient(handler))
-            {
-                string mobileCode;
-                try
-                {
-                    var mobileCodeResponse = await httpClient.GetAsync(mobileCodeUrl);
-                    mobileCode = HttpUtility.ParseQueryString(mobileCodeResponse.Headers.Location.Query)["code"]; 
-                } 
-                catch {
-                    TryRefreshCookies();
-                    try
-                    {
-                        var mobileCodeResponse = await httpClient.GetAsync(mobileCodeUrl);
-                        mobileCode = HttpUtility.ParseQueryString(mobileCodeResponse.Headers.Location.Query)["code"];
-                    }
-                    catch
-                    {
-                        return false;
-                    }
-                }
-
-                HttpRequestMessage requestMessage = new HttpRequestMessage(new HttpMethod("post"), mobileTokenUrl);
-                var requestMessageForm = new List<KeyValuePair<string, string>>();
-                requestMessageForm.Add(new KeyValuePair<string, string>("code", mobileCode));
-                requestMessageForm.Add(new KeyValuePair<string, string>("redirect_uri", "com.playstation.PlayStationApp://redirect"));
-                requestMessageForm.Add(new KeyValuePair<string, string>("grant_type", "authorization_code"));
-                requestMessageForm.Add(new KeyValuePair<string, string>("token_format", "jwt"));
-                requestMessage.Content = new FormUrlEncodedContent(requestMessageForm);
-                requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Basic", mobileTokenAuth);
-
-                var mobileTokenResponse = await httpClient.SendAsync(requestMessage);
-                var strResponse = await mobileTokenResponse.Content.ReadAsStringAsync();
-                mobileToken = Serialization.FromJson<MobileTokens>(strResponse);
-                return true;
-            }
-        }
-
-        public async Task CheckAuthentication()
-        {
-            if (!File.Exists(tokenPath))
-            {
-                throw new Exception("User is not authenticated.");
-            }
-            else
-            {
-                if (!await GetIsUserLoggedIn())
-                {
-                    TryRefreshCookies();
-                    if (!await GetIsUserLoggedIn())
-                    {
-                        throw new Exception("User is not authenticated.");
-                    }
-                }
-                else
-                {
-                    if (mobileToken == null)
-                    {
-                        if (!await getMobileToken())                        
-                        {
-                            throw new Exception("User is not authenticated.");
-                        }
-                    }
-                }
-            }
-        }        
-
-        public async Task<List<PlayedTitlesResponseData.PlayedTitlesRetrieve.Title>> GetPlayedTitles()
-        {
-            await CheckAuthentication();
-
-            var titles = new List<PlayedTitlesResponseData.PlayedTitlesRetrieve.Title>();
-
-            var cookieContainer = ReadCookiesFromDisk();
-            using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
-            using (var httpClient = new HttpClient(handler))
-            {
-                var resp = httpClient.GetAsync(playedListUrl).GetAwaiter().GetResult();
-                var strResponse = await resp.Content.ReadAsStringAsync();
-                var titles_part = Serialization.FromJson<PlayedTitles>(strResponse);
-                titles.AddRange(titles_part.data.gameLibraryTitlesRetrieve.games);
-            }
-
-            return titles;
-        }
-
-        public async Task<List<AccountTitlesResponseData.AccountTitlesRetrieve.Title>> GetAccountTitles()
-        {
-            await CheckAuthentication();
-
-            var titles = new List<AccountTitlesResponseData.AccountTitlesRetrieve.Title>();
-
-            var cookieContainer = ReadCookiesFromDisk();
-            using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
-            using (var httpClient = new HttpClient(handler))
-            {
-
-                var itemCount = 0;
-                var offset = -pageRequestLimit;
-
-                do
-                {
-                    object[] args = { offset, pageRequestLimit };
-                    var resp = httpClient.GetAsync(gameListUrl.Format(offset + pageRequestLimit, pageRequestLimit)).GetAwaiter().GetResult();
-                    var strResponse = await resp.Content.ReadAsStringAsync();
-                    var titles_part = Serialization.FromJson<AccountTitles>(strResponse);
-                    titles.AddRange(titles_part.data.purchasedTitlesRetrieve.games);
-                    offset = titles_part.data.purchasedTitlesRetrieve.pageInfo.offset;
-                    itemCount = titles_part.data.purchasedTitlesRetrieve.pageInfo.totalCount;
-                } while (offset + pageRequestLimit < itemCount);
-
-
-            }    
-
-            return titles;
-        }
-
-        public async Task<List<PlayedTitlesMobile.PlayedTitleMobile>> GetPlayedTitlesMobile()
-        {
-            await CheckAuthentication();
-
-            var titles = new List<PlayedTitlesMobile.PlayedTitleMobile>();
-
-            var cookieContainer = ReadCookiesFromDisk();
-            using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
-            using (var httpClient = new HttpClient(handler))
-            {
-                int? offset = 0;
-
-                do
-                {
-                    HttpRequestMessage requestMessage = new HttpRequestMessage(new HttpMethod("get"), playedMobileListUrl.Format(offset));
-                    requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", mobileToken.access_token);
-                    var resp = await httpClient.SendAsync(requestMessage);
-                    var strResponse = await resp.Content.ReadAsStringAsync();
-                    var titles_part = Serialization.FromJson<PlayedTitlesMobile>(strResponse);
-                    titles.AddRange(titles_part.titles);
-                    offset = titles_part.nextOffset;
-                } while (offset != null);
-
-
-            }
-
-            return titles;
-        }
-
-        public async Task<List<TrophyTitleMobile>> GetTrohpiesMobile()
-        {
-            await CheckAuthentication();
-
-            var titles = new List<TrophyTitleMobile>();
-
-            var cookieContainer = ReadCookiesFromDisk();
-            using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
-            using (var httpClient = new HttpClient(handler))
-            {
-                int? offset = 0;
-
-                do
-                {
-                    HttpRequestMessage requestMessage = new HttpRequestMessage(new HttpMethod("get"), trophiesMobileUrl.Format(offset));
-                    requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", mobileToken.access_token);
-                    var resp = await httpClient.SendAsync(requestMessage);
-                    var strResponse = await resp.Content.ReadAsStringAsync();
-                    var titles_part = Serialization.FromJson<TrophyTitlesMobile>(strResponse);
-                    titles.AddRange(titles_part.trophyTitles);
-                    offset = titles_part.nextOffset;
-                } while (offset != null);
-            }
-
-            return titles;
-        }
-
-
-        public async Task<List<TrophyTitlesWithIdsMobile.TrophyTitleWithIdsMobile>> GetTrohpiesWithIdsMobile(string[] titleIdsArray)
-        {
-            await CheckAuthentication();
-
-            var titles = new List<TrophyTitlesWithIdsMobile.TrophyTitleWithIdsMobile>();
-
-            var cookieContainer = ReadCookiesFromDisk();
-            using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
-            using (var httpClient = new HttpClient(handler))
-            {
-                int querySize = 5;
-                int offset = 0;                
-
-                do
-                {
-                    HttpRequestMessage requestMessage = new HttpRequestMessage(new HttpMethod("get"), trophiesWithIdsMobileUrl.Format(string.Join(",", titleIdsArray.Skip(offset).Take(querySize))));
-                    requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", mobileToken.access_token);
-                    var resp = await httpClient.SendAsync(requestMessage);
-                    var strResponse = await resp.Content.ReadAsStringAsync();
-                    var titles_part = Serialization.FromJson<TrophyTitlesWithIdsMobile>(strResponse);
-                    titles.AddRange(titles_part.titles);
-                    offset = offset + querySize;
-                } while (offset < titleIdsArray.Length);
-            }
-
-            return titles;
-        }
-
-        private void TryRefreshCookies()
-        {
-            string address;
-            using (var webView = api.WebViews.CreateOffscreenView())
-            {
-                webView.LoadingChanged += (s, e) =>
-                {
-                    address = webView.GetCurrentAddress();
-                    webView.Close();
-                };
-
-                webView.NavigateAndWait(loginUrl);
-            }
-
-            dumpCookies();
-        }
-
-        public async Task<bool> GetIsUserLoggedIn()
-        {
-            if (!File.Exists(tokenPath))
-            {
-                return false;
-            }
-
-            try
-            {
-                var cookieContainer = ReadCookiesFromDisk();
-                using (var handler = new HttpClientHandler() { CookieContainer = cookieContainer })
-                using (var httpClient = new HttpClient(handler))
-                {
-
-                    var resp = httpClient.GetAsync(gameListUrl.Format(0, 24)).GetAwaiter().GetResult();
-                    var strResponse = await resp.Content.ReadAsStringAsync();
-                    if (Serialization.TryFromJson<AccountTitlesErrorResponse>(strResponse, out var error) && error.data.purchasedTitlesRetrieve == null)
-                    {
-                        return false;
-                    }
-
-                    if (Serialization.TryFromJson<AccountTitles>(strResponse, out var accountTitles) && accountTitles.data.purchasedTitlesRetrieve != null)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            catch (Exception e) when (!Debugger.IsAttached)
-            {
-                logger.Error(e, "Failed to check if user is authenticated into PSN.");
-                return false;
-            }
-        }
-    }
-}
diff --git a/source/Libraries/PSNLibrary/addon.yaml b/source/Libraries/PSNLibrary/addon.yaml
deleted file mode 100644
index 60c1dab..0000000
--- a/source/Libraries/PSNLibrary/addon.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-AddonId: PlayStationLibrary_Builtin
-IconUrl: https://raw.githubusercontent.com/XenorPLxx/playnite-library-psn/main/source/Libraries/PSNLibrary/icon.png
-Type: GameLibrary
-InstallerManifestUrl: https://raw.githubusercontent.com/XenorPLxx/playnite-library-psn/main/manifests/PlayStationLibrary_Builtin.yaml
-ShortDescription: Imports games from PSN account.
-Name: PlayStation library integration
-Author: Xenor
-SourceUrl: https://github.com/XenorPLxx/playnite-library-psn
diff --git a/source/Libraries/PSNLibrary/extension.yaml b/source/Libraries/PSNLibrary/extension.yaml
deleted file mode 100644
index 173de87..0000000
--- a/source/Libraries/PSNLibrary/extension.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Id: PlayStationLibrary_Builtin
-Name: PlayStation library integration
-Author: Xenor
-Version: 2.7
-Module: PSNLibrary.dll
-Type: GameLibrary
-Icon: icon.png
\ No newline at end of file
diff --git a/source/Libraries/PSNLibrary/icon.png b/source/Libraries/PSNLibrary/icon.png
deleted file mode 100644
index 164fceec9b67bb5e684677b68f0115024c239fd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22254
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%0DB}?yscUgm0;>o4?){
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

diff --git a/source/Localization/en_US.xaml b/source/Localization/en_US.xaml
index 8d31d4f..617ca00 100644
--- a/source/Localization/en_US.xaml
+++ b/source/Localization/en_US.xaml
@@ -2,7 +2,7 @@
     <sys:String x:Key="LOCSettingsImportInstalledLabel">Import installed games</sys:String>
     <sys:String x:Key="LOCSettingsImportUninstalledLabel">Import not installed games</sys:String>
     <sys:String x:Key="LOCSettingsConnectAccount">Connect account</sys:String>
-    <sys:String x:Key="LOCSettingsDonwloadImageMetadata">Download image metadata from PSN</sys:String>
+    <sys:String x:Key="LOCSettingsDonwloadImageMetadata">Download image metadata from Nintendo</sys:String>
     <sys:String x:Key="LOCSettingsMigration">Try to migrate games from the old plugin on the next library update</sys:String>
     <sys:String x:Key="LOCSettingsLegacyGames">Try do download older games from Trophies API:</sys:String>
     <sys:String x:Key="LOCSettingsUpdateLastPlayed">Update last played date</sys:String>
diff --git a/source/PlayniteExtensions.sln b/source/PlayniteExtensions.sln
index ddaa4d3..f852f3f 100644
--- a/source/PlayniteExtensions.sln
+++ b/source/PlayniteExtensions.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.1622
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Metadata", "Metadata", "{80CE6DFD-BE10-4777-8005-80F696AFBF4A}"
 EndProject
@@ -31,7 +31,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ItchioLibrary", "Libraries\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OriginLibrary", "Libraries\OriginLibrary\OriginLibrary.csproj", "{D0EFC813-C836-4167-A120-2DE785E140A1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PSNLibrary", "Libraries\PSNLibrary\PSNLibrary.csproj", "{FB213CE8-F724-4366-9B19-A89030F0BAEF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NintendoLibrary", "Libraries\NintendoLibrary\NintendoLibrary.csproj", "{FB213CE8-F724-4366-9B19-A89030F0BAEF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UplayLibrary", "Libraries\UplayLibrary\UplayLibrary.csproj", "{7DC1512C-5C82-434B-9675-12AD94B74C56}"
 EndProject