added option to use Description for extra directory name

RomVault · Feb 21, 2020 · 00aad48 · 00aad48
1 parent 5b980fa
commit 00aad48
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 10 deletions.
diff --git a/DATReader/DatClean/DatClean.cs b/DATReader/DatClean/DatClean.cs
@@ -6,15 +6,23 @@ namespace DATReader.DatClean
 {
     public static partial class DatClean
     {
-        public static void MakeDatSingleLevel(DatHeader tDatHeader)
+        public static void MakeDatSingleLevel(DatHeader tDatHeader,bool useDescription)
         {
             DatBase[] db = tDatHeader.BaseDir.ToArray();
             tDatHeader.Dir = "noautodir";
 
+
+            // if we are auto adding extra directories then create a new directory.
+            string extraDirName="";
+            if (string.IsNullOrEmpty(extraDirName) && useDescription && !string.IsNullOrWhiteSpace(tDatHeader.Description))
+                extraDirName = tDatHeader.Description;
+            if (string.IsNullOrEmpty(extraDirName))
+                extraDirName = tDatHeader.Name;
+
             tDatHeader.BaseDir.ChildrenClear();
             DatDir root = new DatDir(DatFileType.UnSet)
             {
-                Name = tDatHeader.Name,
+                Name = extraDirName,
                 DGame = new DatGame { Description = tDatHeader.Description }
             };
             tDatHeader.BaseDir.ChildAdd(root);

diff --git a/ROMVault/FrmPathSettings.Designer.cs b/ROMVault/FrmPathSettings.Designer.cs
diff --git a/ROMVault/FrmPathSettings.cs b/ROMVault/FrmPathSettings.cs
@@ -90,6 +90,8 @@ private void SetDisplay()
 
             chkSingleArchive.Checked = _rule.SingleArchive;
             chkMultiDatDirOverride.Checked = _rule.MultiDATDirOverride;
+
+            chkUseDescription.Checked = _rule.UseDescriptionAsDirName;
         }
 
 
@@ -189,6 +191,7 @@ private void BtnApplyClick(object sender, EventArgs e)
             _rule.Filter = (FilterType)cboFilterType.SelectedIndex;
             _rule.SingleArchive = chkSingleArchive.Checked;
             _rule.MultiDATDirOverride = chkMultiDatDirOverride.Checked;
+            _rule.UseDescriptionAsDirName = chkUseDescription.Checked;
 
             bool updatingRule = false;
             int i;
@@ -313,7 +316,8 @@ private void BtnResetAllClick(object sender, EventArgs e)
                     _rule.Merge != MergeType.Split ||
                     _rule.MergeOverrideDAT ||
                     _rule.SingleArchive ||
-                    _rule.MultiDATDirOverride)
+                    _rule.MultiDATDirOverride ||
+                    _rule.UseDescriptionAsDirName)
                     DatUpdate.CheckAllDats(DB.DirTree.Child(0), _rule.DirKey);
             }
 

diff --git a/RVCore/ReadDat/DatReader.cs b/RVCore/ReadDat/DatReader.cs
@@ -72,10 +72,8 @@ public static RvFile ReadInDatFile(RvDat datFile, ThreadWorker thWrk)
                 if (dh == null)
                     return null;
 
+                string dirName = Path.GetDirectoryName(datRootFullName) + Path.DirectorySeparatorChar;
 
-                string extraPath = !string.IsNullOrEmpty(dh.RootDir) ? dh.RootDir : dh.Name;
-                string dirName = Path.GetDirectoryName(datRootFullName) + Path.DirectorySeparatorChar + extraPath + Path.DirectorySeparatorChar;
-
                 DatRule datRule = FindDatRule(dirName);
 
                 DatClean.CleanFilenames(dh.BaseDir);
@@ -95,7 +93,7 @@ public static RvFile ReadInDatFile(RvDat datFile, ThreadWorker thWrk)
                 SetMergeType(datRule, dh);
 
                 if (datRule.SingleArchive)
-                    DatClean.MakeDatSingleLevel(dh);
+                    DatClean.MakeDatSingleLevel(dh, datFile.UseDescriptionAsDirName);
 
                 DatClean.RemoveUnNeededDirectories(dh.BaseDir);
 

diff --git a/RVCore/ReadDat/DatUpdate.cs b/RVCore/ReadDat/DatUpdate.cs
@@ -109,6 +109,7 @@ private static bool RecursiveDatTree(RvFile tDir, out int datCount)
                 string datRootFullName = tDat.GetData(RvDat.DatData.DatRootFullName);
                 DatRule datRule = DatReader.FindDatRule(datRootFullName);
                 tDat.MultiDatOverride = datRule.MultiDATDirOverride;
+                tDat.UseDescriptionAsDirName = datRule.UseDescriptionAsDirName;
 
                 tDir.DirDatAdd(tDat);
             }
@@ -125,6 +126,7 @@ private static bool RecursiveDatTree(RvFile tDir, out int datCount)
                 string datRootFullName = tDat.GetData(RvDat.DatData.DatRootFullName);
                 DatRule datRule = DatReader.FindDatRule(datRootFullName);
                 tDat.MultiDatOverride = datRule.MultiDATDirOverride;
+                tDat.UseDescriptionAsDirName = datRule.UseDescriptionAsDirName;
 
                 tDir.DirDatAdd(tDat);
             }
@@ -424,8 +426,14 @@ private static bool LoadNewDat(RvDat fileDat, RvFile thisDirectory)
                 )
             {
                 // if we are auto adding extra directories then create a new directory.
-                newDatFile.Name = !string.IsNullOrEmpty(newDatFile.Dat.GetData(RvDat.DatData.RootDir)) ?
-                    newDatFile.Dat.GetData(RvDat.DatData.RootDir) : newDatFile.Dat.GetData(RvDat.DatData.DatName);
+                string dirName = "";
+                if (string.IsNullOrEmpty(dirName) && fileDat.UseDescriptionAsDirName && !string.IsNullOrWhiteSpace(newDatFile.Dat.GetData(RvDat.DatData.Description)))
+                    dirName = newDatFile.Dat.GetData(RvDat.DatData.Description);
+                if (string.IsNullOrEmpty(dirName) && !string.IsNullOrEmpty(newDatFile.Dat.GetData(RvDat.DatData.RootDir)))
+                    dirName = newDatFile.Dat.GetData(RvDat.DatData.RootDir);
+                if (string.IsNullOrEmpty(dirName))
+                    dirName= newDatFile.Dat.GetData(RvDat.DatData.DatName);
+                newDatFile.Name = dirName;
 
                 newDatFile.DatStatus = DatStatus.InDatCollect;
                 newDatFile.Tree = new RvTreeRow();

diff --git a/RVCore/RvDB/DBHelper.cs b/RVCore/RvDB/DBHelper.cs
@@ -128,6 +128,12 @@ public static int DatCompare(RvDat var1, RvDat var2)
                 return retv;
             }
 
+            retv = Math.Sign(var1.UseDescriptionAsDirName.CompareTo(var2.UseDescriptionAsDirName));
+            if (retv != 0)
+            {
+                return retv;
+            }
+
             return 0;
         }
 

diff --git a/RVCore/RvDB/RvDat.cs b/RVCore/RvDB/RvDat.cs
@@ -46,11 +46,18 @@ public enum DatData
         public bool MultiDatOverride;
         public bool MultiDatsInDirectory;
         public bool AutoAddedDirectory;
+        public bool UseDescriptionAsDirName;
 
         public void Write(BinaryWriter bw)
         {
             bw.Write(TimeStamp);
-            byte bools = (byte) ((AutoAddedDirectory ? 1 : 0) | (MultiDatOverride ? 2:0) | (MultiDatsInDirectory ? 4:0));
+            byte bools = (byte)
+                (
+                    (AutoAddedDirectory ? 1 : 0) |
+                    (MultiDatOverride ? 2 : 0) |
+                    (MultiDatsInDirectory ? 4 : 0) |
+                    (UseDescriptionAsDirName ? 8 : 0)
+                 );
             bw.Write(bools);
 
             bw.Write((byte)_gameMetaData.Count);
@@ -67,6 +74,7 @@ public void Read(BinaryReader br)
             AutoAddedDirectory = (bools & 1) == 1;
             MultiDatOverride = (bools & 2) == 2;
             MultiDatsInDirectory = (bools & 4) == 4;
+            UseDescriptionAsDirName = (bools & 8) == 8;
 
             byte c = br.ReadByte();
             _gameMetaData.Clear();

diff --git a/RVCore/Settings.cs b/RVCore/Settings.cs
@@ -251,6 +251,7 @@ public class DatRule : IComparable<DatRule>
 
         public bool SingleArchive;
         public bool MultiDATDirOverride;
+        public bool UseDescriptionAsDirName;
 
         public int CompareTo(DatRule obj)
         {