Merge MergeDAT, part 1

This commit is contained in:
Matt Nadareski
2016-04-21 13:10:13 -07:00
parent 729a0fd71f
commit 04b1fce512
6 changed files with 11 additions and 20 deletions

3
.gitignore vendored
View File

@@ -8,9 +8,6 @@
/Deheader/obj /Deheader/obj
/Deheader/obj/Debug /Deheader/obj/Debug
/Deheader/obj/Release /Deheader/obj/Release
/MergeDAT/obj
/MergeDAT/obj/Debug
/MergeDAT/obj/Release
/SabreHelper/obj /SabreHelper/obj
/SabreHelper/obj/Debug /SabreHelper/obj/Debug
/SabreHelper/obj/Release /SabreHelper/obj/Release

View File

@@ -88,6 +88,7 @@
<Compile Include="Generate.cs" /> <Compile Include="Generate.cs" />
<Compile Include="Import.cs" /> <Compile Include="Import.cs" />
<Compile Include="DATabase.cs" /> <Compile Include="DATabase.cs" />
<Compile Include="MergeDAT.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TrimMerge.cs" /> <Compile Include="TrimMerge.cs" />
</ItemGroup> </ItemGroup>

View File

@@ -43,7 +43,6 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MergeDAT.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -23,6 +23,15 @@ The main tool of the SabreTools suite. Performs the majority of the core feature
<li>Converting DATs from RomVault to XML format, vice versa, and to missfile (last part formerly <i>DatToMiss</i>; requested by Obiwantje)</li> <li>Converting DATs from RomVault to XML format, vice versa, and to missfile (last part formerly <i>DatToMiss</i>; requested by Obiwantje)</li>
<li>Trim DAT entries and optionally merge into a single game (formerly <i>SingleGame</i>; requested by Kludge)</li> <li>Trim DAT entries and optionally merge into a single game (formerly <i>SingleGame</i>; requested by Kludge)</li>
<li>Split a DAT using two different file extensions within the DAT (formerly <i>DatSplit</i>)</li> <li>Split a DAT using two different file extensions within the DAT (formerly <i>DatSplit</i>)</li>
<li>Merge, diff, and dedupe an arbitrary number of DAT files, as long as it's two or more (formerly <i>MergeDAT</i>; requested by Obiwantje and Kludge)
<ul>
<li>Read in from commandline, drag-and-drop, a directory, or any combination</li>
<li>Roms are compared with all information available, so duplicates can exist in the output</li>
<li>Output type automatically determined by the first input file</li>
<li>Optionally create a DiffDat of the inputted files instead of a straight merge</li>
<li>Optionally merge the output DAT so no partial duplicates are included</li>
</ul>
</li>
<li>Add and remove sources and systems from the database</li> <li>Add and remove sources and systems from the database</li>
<li>Retrieve a list of all sources and systems that are available</li> <li>Retrieve a list of all sources and systems that are available</li>
</ul> </ul>
@@ -65,16 +74,7 @@ This a versitile Directory to DAT file creator developed to reduce the overhead
This section is for tools that have been requested for a highly specific purpose and are not generally going to be used by regular users. All of them have a possibility of being included in the main DATabase program eventually. This section is for tools that have been requested for a highly specific purpose and are not generally going to be used by regular users. All of them have a possibility of being included in the main DATabase program eventually.
<b>MergeDAT</b> <b>There are no tools that are for power users at this time.</b>
<p/>
A program to merge (or diff) an arbitrary number of DATs
<ul>
<li>Read in from commandline, drag-and-drop, a directory, or any combination</li>
<li>Roms are compared with all information available, so duplicates can exist in the output</li>
<li>Output type automatically determined by the first input file</li>
<li>Optionally create a DiffDat of the inputted files instead of a straight merge</li>
<li>Optionally merge the output DAT so no partial duplicates are included</li>
</ul>
<h3>Licensing</h3> <h3>Licensing</h3>
<p/> <p/>

View File

@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreHelper", "SabreHelper\
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DATFromDir", "DATFromDir\DATFromDir.csproj", "{382B75D3-079E-49D5-A830-54DD6EB5A02D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DATFromDir", "DATFromDir\DATFromDir.csproj", "{382B75D3-079E-49D5-A830-54DD6EB5A02D}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MergeDAT", "MergeDAT\MergeDAT.csproj", "{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -42,10 +40,6 @@ Global
{382B75D3-079E-49D5-A830-54DD6EB5A02D}.Debug|Any CPU.Build.0 = Debug|Any CPU {382B75D3-079E-49D5-A830-54DD6EB5A02D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{382B75D3-079E-49D5-A830-54DD6EB5A02D}.Release|Any CPU.ActiveCfg = Release|Any CPU {382B75D3-079E-49D5-A830-54DD6EB5A02D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{382B75D3-079E-49D5-A830-54DD6EB5A02D}.Release|Any CPU.Build.0 = Release|Any CPU {382B75D3-079E-49D5-A830-54DD6EB5A02D}.Release|Any CPU.Build.0 = Release|Any CPU
{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE