From 04b1fce512a7f66e39e3aa967ea09bdb95f6c676 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 21 Apr 2016 13:10:13 -0700 Subject: [PATCH] Merge MergeDAT, part 1 --- .gitignore | 3 --- DATabase/DATabase.csproj | 1 + {MergeDAT => DATabase}/MergeDAT.cs | 0 MergeDAT/MergeDAT.csproj | 1 - README.MD | 20 ++++++++++---------- SabreTools.sln | 6 ------ 6 files changed, 11 insertions(+), 20 deletions(-) rename {MergeDAT => DATabase}/MergeDAT.cs (100%) diff --git a/.gitignore b/.gitignore index 6b81aebd..311dad85 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,6 @@ /Deheader/obj /Deheader/obj/Debug /Deheader/obj/Release -/MergeDAT/obj -/MergeDAT/obj/Debug -/MergeDAT/obj/Release /SabreHelper/obj /SabreHelper/obj/Debug /SabreHelper/obj/Release diff --git a/DATabase/DATabase.csproj b/DATabase/DATabase.csproj index 72f83902..3bd81e03 100644 --- a/DATabase/DATabase.csproj +++ b/DATabase/DATabase.csproj @@ -88,6 +88,7 @@ + diff --git a/MergeDAT/MergeDAT.cs b/DATabase/MergeDAT.cs similarity index 100% rename from MergeDAT/MergeDAT.cs rename to DATabase/MergeDAT.cs diff --git a/MergeDAT/MergeDAT.csproj b/MergeDAT/MergeDAT.csproj index d21118ed..83ffae06 100644 --- a/MergeDAT/MergeDAT.csproj +++ b/MergeDAT/MergeDAT.csproj @@ -43,7 +43,6 @@ - diff --git a/README.MD b/README.MD index 7f7a83df..98926896 100644 --- a/README.MD +++ b/README.MD @@ -23,6 +23,15 @@ The main tool of the SabreTools suite. Performs the majority of the core feature
  • Converting DATs from RomVault to XML format, vice versa, and to missfile (last part formerly DatToMiss; requested by Obiwantje)
  • Trim DAT entries and optionally merge into a single game (formerly SingleGame; requested by Kludge)
  • Split a DAT using two different file extensions within the DAT (formerly DatSplit)
    • +
  • Merge, diff, and dedupe an arbitrary number of DAT files, as long as it's two or more (formerly MergeDAT; requested by Obiwantje and Kludge) +
      +
    • Read in from commandline, drag-and-drop, a directory, or any combination
      • +
    • Roms are compared with all information available, so duplicates can exist in the output
      • +
    • Output type automatically determined by the first input file
      • +
    • Optionally create a DiffDat of the inputted files instead of a straight merge
      • +
    • Optionally merge the output DAT so no partial duplicates are included
      • +
    +
  • Add and remove sources and systems from the database
  • Retrieve a list of all sources and systems that are available
    • @@ -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. -MergeDAT -

    -A program to merge (or diff) an arbitrary number of DATs -

      -
    • Read in from commandline, drag-and-drop, a directory, or any combination
      • -
    • Roms are compared with all information available, so duplicates can exist in the output
      • -
    • Output type automatically determined by the first input file
      • -
    • Optionally create a DiffDat of the inputted files instead of a straight merge
      • -
    • Optionally merge the output DAT so no partial duplicates are included
      • -
    +There are no tools that are for power users at this time.

    Licensing

    diff --git a/SabreTools.sln b/SabreTools.sln index 38d280d5..b16ceebc 100644 --- a/SabreTools.sln +++ b/SabreTools.sln @@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreHelper", "SabreHelper\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DATFromDir", "DATFromDir\DATFromDir.csproj", "{382B75D3-079E-49D5-A830-54DD6EB5A02D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MergeDAT", "MergeDAT\MergeDAT.csproj", "{785A4E9E-0DC1-4FAD-AA3A-57B5B122CD8E}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution 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}.Release|Any CPU.ActiveCfg = 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 GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE