Shift directory SearchOption one level higher

QutEcoacoustics · Apr 2, 2019 · 4c55275 · 4c55275
1 parent 1d78306
commit 4c55275
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/src/AnalysisPrograms/ConcatenateIndexFiles.cs b/src/AnalysisPrograms/ConcatenateIndexFiles.cs
@@ -202,7 +202,9 @@ public static void Execute(Arguments arguments)
 
             // 1. PATTERN SEARCH FOR CORRECT SUBDIRECTORIES
             // Assumes that the required subdirectories have the given FILTER/SiteName somewhere in their path.
-            var subDirectories = LdSpectrogramStitching.GetSubDirectoriesForSiteData(inputDirs, arguments.DirectoryFilter);
+            var searchOption = SearchOption.AllDirectories;
+            //var searchOption = SearchOption.TopDirectoryOnly;
+            var subDirectories = LdSpectrogramStitching.GetSubDirectoriesForSiteData(inputDirs, arguments.DirectoryFilter, searchOption);
             if (subDirectories.Length == 0)
             {
                 LoggedConsole.WriteErrorLine("\n\n#WARNING from method ConcatenateIndexFiles.Execute():");

diff --git a/src/AnalysisPrograms/Sandpit.cs b/src/AnalysisPrograms/Sandpit.cs
@@ -705,11 +705,6 @@ public static void ConcatenateIndexFilesAndSpectrograms()
             string gapRendering = "TimedGaps"; // the default
             bool concatenateEverythingYouCanLayYourHandsOn = false; // default is 24-hour blocks
 
-            // WARNING: Be careful about Search option. The default is all directories but in some of my work require TopDirectoryOnly.
-            // See LdSpectrogramStitching.GetSubDirectoriesForSiteData() lines 64 and 65.
-            // var searchOption = SearchOption.AllDirectories;
-            // var searchOption = SearchOption.TopDirectoryOnly;
-
             /*
             // ########################## CONCATENATION of Sarah Lowe's recordings
             // The drive: work = G; home = E
@@ -811,7 +806,7 @@ public static void ConcatenateIndexFilesAndSpectrograms()
                 @"C:\Ecoacoustics\Output\Test\Test24HourRecording\TasmanIslandMez",
             };
 
-            string directoryFilter = "*"; // this is a directory filter to locate only the required files
+            string directoryFilter = "Mez*"; // this is a directory filter to locate only the required files
             string opFileStem = "TasmanIslandMez";
             string opPath = @"C:\Ecoacoustics\Output\Test\DebugIssue186";
 

diff --git a/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramStitching.cs b/src/AudioAnalysisTools/LongDurationSpectrograms/LDSpectrogramStitching.cs
@@ -56,14 +56,10 @@ public static class LdSpectrogramStitching
         public const string SummaryIndicesStr = "SummaryIndices";
         public const string SpectralIndicesStr = "SpectralIndices";
 
-        public static DirectoryInfo[] GetSubDirectoriesForSiteData(IEnumerable<DirectoryInfo> topLevelDataDirectories, string site)
+        public static DirectoryInfo[] GetSubDirectoriesForSiteData(IEnumerable<DirectoryInfo> topLevelDataDirectories, string site, SearchOption searchOption)
         {
             //string dateString = String.Format("{0}{1:D2}{2:D2}", dto.Year, dto.Month, dto.Day);
             string searchPattern = "*" + site + "*";
-
-            //var searchOption = SearchOption.AllDirectories;
-            var searchOption = SearchOption.TopDirectoryOnly;
-
             return topLevelDataDirectories
                 .SelectMany(dir => dir.GetDirectories(searchPattern, searchOption))
                 .ToArray();

diff --git a/...Acoustics.Test/AudioAnalysisTools/LongDurationSpectrograms/LdSpectrogramStitchingTests.cs b/...Acoustics.Test/AudioAnalysisTools/LongDurationSpectrograms/LdSpectrogramStitchingTests.cs
@@ -1,4 +1,4 @@
-// <copyright file="LdSpectrogramStitching.cs" company="QutEcoacoustics">
+// <copyright file="LdSpectrogramStitching.cs" company="QutEcoacoustics">
 // All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group).
 // </copyright>
 
@@ -42,8 +42,7 @@ public void TestDirectoryScannerMethod()
             });
 
             var expected = test.Where(d => d.FullName.Contains(@"\b\")).ToArray();
-
-            var actual = LdSpectrogramStitching.GetSubDirectoriesForSiteData(expected, "b");
+            var actual = LdSpectrogramStitching.GetSubDirectoriesForSiteData(expected, "b", SearchOption.AllDirectories);
 
             CollectionAssert.AreEqual(expected, actual);
         }