From 5c87920c13bdb2c1b234be122c54011eeb0eb7a5 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 20 Dec 2020 23:17:18 +0000 Subject: [PATCH] Update SabreTools. --- RomRepoMgr.Core/RomRepoMgr.Core.csproj | 1 + RomRepoMgr.Core/Workers/DatImporter.cs | 10 +++--- RomRepoMgr.Core/Workers/FileImporter.cs | 3 +- RomRepoMgr.sln | 48 +++++++++++++++++++++---- RomRepoMgr/RomRepoMgr.csproj | 3 ++ SabreTools | 2 +- 6 files changed, 54 insertions(+), 13 deletions(-) diff --git a/RomRepoMgr.Core/RomRepoMgr.Core.csproj b/RomRepoMgr.Core/RomRepoMgr.Core.csproj index b8c7293..f89b47b 100644 --- a/RomRepoMgr.Core/RomRepoMgr.Core.csproj +++ b/RomRepoMgr.Core/RomRepoMgr.Core.csproj @@ -16,6 +16,7 @@ + diff --git a/RomRepoMgr.Core/Workers/DatImporter.cs b/RomRepoMgr.Core/Workers/DatImporter.cs index 3b96056..8f35728 100644 --- a/RomRepoMgr.Core/Workers/DatImporter.cs +++ b/RomRepoMgr.Core/Workers/DatImporter.cs @@ -38,9 +38,9 @@ using RomRepoMgr.Core.Models; using RomRepoMgr.Core.Resources; using RomRepoMgr.Database; using RomRepoMgr.Database.Models; -using SabreTools.Library.DatFiles; -using SabreTools.Library.DatItems; -using SabreTools.Library.IO; +using SabreTools.DatFiles; +using SabreTools.DatItems; +using SabreTools.IO; using ErrorEventArgs = RomRepoMgr.Core.EventArgs.ErrorEventArgs; using Machine = RomRepoMgr.Database.Models.Machine; @@ -75,8 +75,8 @@ namespace RomRepoMgr.Core.Workers Message = Localization.ParsinDatFile }); - var datFile = DatFile.Create(); - datFile.Parse(new ParentablePath(_datPath), throwOnError: true); + var datFile = DatFile.Create(); + datFile.ParseFile(_datPath, 0, false, throwOnError: true); SetMessage?.Invoke(this, new MessageEventArgs { diff --git a/RomRepoMgr.Core/Workers/FileImporter.cs b/RomRepoMgr.Core/Workers/FileImporter.cs index 3659791..2f7f965 100644 --- a/RomRepoMgr.Core/Workers/FileImporter.cs +++ b/RomRepoMgr.Core/Workers/FileImporter.cs @@ -11,7 +11,8 @@ using RomRepoMgr.Core.Models; using RomRepoMgr.Core.Resources; using RomRepoMgr.Database; using RomRepoMgr.Database.Models; -using SabreTools.Library.FileTypes; +using SabreTools.FileTypes.Aaru; +using SabreTools.FileTypes.CHD; using SharpCompress.Compressors; using SharpCompress.Compressors.LZMA; diff --git a/RomRepoMgr.sln b/RomRepoMgr.sln index d0ce398..be9b931 100644 --- a/RomRepoMgr.sln +++ b/RomRepoMgr.sln @@ -8,12 +8,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RomRepoMgr.Settings", "RomR EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RomRepoMgr.Core", "RomRepoMgr.Core\RomRepoMgr.Core.csproj", "{1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Library", "SabreTools\SabreTools.Library\SabreTools.Library.csproj", "{9DFA390F-1E96-476B-92CB-0C96EFF3CC9D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winfsp-netcore", "winfsp-netcore\winfsp-netcore.csproj", "{4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.BulkExtensions", "EFCore.BulkExtensions\EFCore.BulkExtensions\EFCore.BulkExtensions.csproj", "{E17E880B-F3A7-4D0E-9583-A0645CE25135}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatFiles", "SabreTools\SabreTools.DatFiles\SabreTools.DatFiles.csproj", "{2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Core", "SabreTools\SabreTools.Core\SabreTools.Core.csproj", "{77E643AF-F6A9-45CE-B76D-0C1A4533A13E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.DatItems", "SabreTools\SabreTools.DatItems\SabreTools.DatItems.csproj", "{459BDA50-3AF3-4E8F-92F3-CA5A9D02A3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.IO", "SabreTools\SabreTools.IO\SabreTools.IO.csproj", "{5536BA8A-F413-478B-94AC-4830A4D3DAC7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Logging", "SabreTools\SabreTools.Logging\SabreTools.Logging.csproj", "{4E9020F1-F390-4328-B110-692C97A88DF2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.FileTypes", "SabreTools\SabreTools.FileTypes\SabreTools.FileTypes.csproj", "{5FA7C8BF-BCB4-439C-B326-90DDD43B53A5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Skippers", "SabreTools\SabreTools.Skippers\SabreTools.Skippers.csproj", "{20C71A36-7AD1-4BB9-91DD-146EBF39BCAB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,10 +48,6 @@ Global {1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C7E7286-1BA6-43B0-A042-4A3C378BDDC1}.Release|Any CPU.Build.0 = Release|Any CPU - {9DFA390F-1E96-476B-92CB-0C96EFF3CC9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9DFA390F-1E96-476B-92CB-0C96EFF3CC9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9DFA390F-1E96-476B-92CB-0C96EFF3CC9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9DFA390F-1E96-476B-92CB-0C96EFF3CC9D}.Release|Any CPU.Build.0 = Release|Any CPU {4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B2B4DAC-39E2-417D-90F2-DCC97A5564B1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -48,5 +56,33 @@ Global {E17E880B-F3A7-4D0E-9583-A0645CE25135}.Debug|Any CPU.Build.0 = Debug|Any CPU {E17E880B-F3A7-4D0E-9583-A0645CE25135}.Release|Any CPU.ActiveCfg = Release|Any CPU {E17E880B-F3A7-4D0E-9583-A0645CE25135}.Release|Any CPU.Build.0 = Release|Any CPU + {2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2B9EDA01-5DE1-46A7-B5EA-1994D017D7D4}.Release|Any CPU.Build.0 = Release|Any CPU + {77E643AF-F6A9-45CE-B76D-0C1A4533A13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {77E643AF-F6A9-45CE-B76D-0C1A4533A13E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {77E643AF-F6A9-45CE-B76D-0C1A4533A13E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {77E643AF-F6A9-45CE-B76D-0C1A4533A13E}.Release|Any CPU.Build.0 = Release|Any CPU + {459BDA50-3AF3-4E8F-92F3-CA5A9D02A3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {459BDA50-3AF3-4E8F-92F3-CA5A9D02A3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {459BDA50-3AF3-4E8F-92F3-CA5A9D02A3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {459BDA50-3AF3-4E8F-92F3-CA5A9D02A3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {5536BA8A-F413-478B-94AC-4830A4D3DAC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5536BA8A-F413-478B-94AC-4830A4D3DAC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5536BA8A-F413-478B-94AC-4830A4D3DAC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5536BA8A-F413-478B-94AC-4830A4D3DAC7}.Release|Any CPU.Build.0 = Release|Any CPU + {4E9020F1-F390-4328-B110-692C97A88DF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4E9020F1-F390-4328-B110-692C97A88DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E9020F1-F390-4328-B110-692C97A88DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4E9020F1-F390-4328-B110-692C97A88DF2}.Release|Any CPU.Build.0 = Release|Any CPU + {5FA7C8BF-BCB4-439C-B326-90DDD43B53A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5FA7C8BF-BCB4-439C-B326-90DDD43B53A5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5FA7C8BF-BCB4-439C-B326-90DDD43B53A5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5FA7C8BF-BCB4-439C-B326-90DDD43B53A5}.Release|Any CPU.Build.0 = Release|Any CPU + {20C71A36-7AD1-4BB9-91DD-146EBF39BCAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20C71A36-7AD1-4BB9-91DD-146EBF39BCAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20C71A36-7AD1-4BB9-91DD-146EBF39BCAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {20C71A36-7AD1-4BB9-91DD-146EBF39BCAB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/RomRepoMgr/RomRepoMgr.csproj b/RomRepoMgr/RomRepoMgr.csproj index f5de696..74476ae 100644 --- a/RomRepoMgr/RomRepoMgr.csproj +++ b/RomRepoMgr/RomRepoMgr.csproj @@ -31,6 +31,9 @@ + + + diff --git a/SabreTools b/SabreTools index 195aaba..199b8c0 160000 --- a/SabreTools +++ b/SabreTools @@ -1 +1 @@ -Subproject commit 195aaba308563cb18eaef5808cf9e3a54355d9d8 +Subproject commit 199b8c01affb6a50c1ef432649db60aec115a514