Support wildcards in equals query

Author: amoerie

DcmFind.Tests/TestsForQuery.cs

@@ -46,6 +46,19 @@ public void ShouldNotMatchWhenDicomTagIsNotPresent()
 
                 query.Matches(_dicomDataset).Should().BeFalse();
             }
+            
+            [Theory]
+            [InlineData("%apple")]
+            [InlineData("%Apple")]
+            [InlineData("Pine%")]
+            [InlineData("pine%")]
+            [InlineData("Pine%apple")]
+            public void ShouldMatchWhenValuesMatchesWildcardInBeginning(string value)
+            {
+                var query = new EqualsQuery(DicomTag.AccessionNumber, value);
+
+                query.Matches(_dicomDataset).Should().BeTrue();
+            }
         }
 
         public class TestsForLowerThanQuery : TestsForQuery

DcmFind/DicomTagParser.cs

@@ -7,7 +7,7 @@ namespace DcmFind
 {
     public static class DicomTagParser
     {
-        public static bool TryParse(string dicomTagAsString, out DicomTag dicomTag)
+        public static bool TryParse(string dicomTagAsString, out DicomTag? dicomTag)
         {
             try
             {
@@ -22,7 +22,7 @@ public static bool TryParse(string dicomTagAsString, out DicomTag dicomTag)
                     .FirstOrDefault(f => string.Equals(f.Name, dicomTagAsString));
                 if (field != null)
                 {
-                    dicomTag = (DicomTag) field.GetValue(null);
+                    dicomTag = (DicomTag?) field.GetValue(null);
                     return true;
                 }
 

DcmFind/Program.cs

@@ -16,19 +16,19 @@ public class Options
         {
             [Option('d', "directory", Default = ".", HelpText = "Search for *.dcm files in this directory")]
 
-            public string Directory { get; set; }
+            public string? Directory { get; set; }
 
             [Option('f', "filePattern", Default = "*.dcm", HelpText = "Only query files that satisfy this file pattern")]
-            public string FilePattern { get; set; }
+            public string? FilePattern { get; set; }
 
             [Option('r', "recursive", Default = true, HelpText = "Search recursively in nested directories")]
             public bool Recursive { get; set; }
 
             [Option('l', "limit", Default = 100, HelpText = "Limit results and stop finding after this many results")]
             public int Limit { get; set; }
 
-            [Option(shortName: 'q', longName: "query", Default = "", Required = true, HelpText = "The query that should be applied")]
-            public string Query { get; set; }
+            [Option(shortName: 'q', longName: "query", Default = "", Separator = ',', Min = 1, HelpText = "The query that should be applied")]
+            public IEnumerable<string>? Query { get; set; }
         }
         // ReSharper restore UnusedAutoPropertyAccessor.Global
         // ReSharper restore MemberCanBePrivate.Global
@@ -53,15 +53,20 @@ private static void Fail(IEnumerable<Error> errors)
         private static void Query(Options options)
         {
             var directory = new DirectoryInfo(options.Directory).FullName;
+            var filePattern = options.FilePattern;
+            var recursive = options.Recursive;
+            var query = options.Query;
+            var limit = options.Limit;
+            if (filePattern == null || query == null)
+                return;
 
             if (!Directory.Exists(directory))
             {
                 Console.Error.WriteLine($"Invalid directory: {directory} does not exist");
                 return;
             }
 
-            var filePattern = options.FilePattern;
-            var recursive = options.Recursive;
+            
             var files = Files(directory, filePattern, recursive);
             // ReSharper disable PossibleMultipleEnumeration
             if (!files.Any())
@@ -70,13 +75,19 @@ private static void Query(Options options)
                 return;
             }
 
-            if (!QueryParser.TryParse(options.Query, out var query))
+            var queries = new List<IQuery>();
+            foreach (var q in options.Query ?? Array.Empty<string>())
             {
-                Console.Error.WriteLine($"Invalid query: {query}");
-                return;
+                if (!QueryParser.TryParse(q, out var parsedQuery) || parsedQuery == null)
+                {
+                    Console.Error.WriteLine($"Invalid query: {query}");
+                    return;
+                }
+
+                queries.Add(parsedQuery);
             }
 
-            foreach(var result in Results(files, query, options.Limit))
+            foreach(var result in Results(files, queries, limit))
                 Console.WriteLine(result);
             // ReSharper restore PossibleMultipleEnumeration
         }
@@ -86,7 +97,7 @@ private static IEnumerable<string> Files(string directory, string filePattern, b
             return Directory.EnumerateFiles(directory, filePattern, recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
         }
 
-        private static DicomFile ToDicomFile(string file)
+        private static DicomFile? ToDicomFile(string file)
         {
             try
             {
@@ -100,24 +111,14 @@ private static DicomFile ToDicomFile(string file)
             }
         }
 
-        private static bool NotNull(DicomFile dicomFile)
-        {
-            return dicomFile != null;
-        }
-        
-        private static string FileName(DicomFile dicomFile)
-        {
-            return dicomFile.File.Name;
-        }
-
-        private static IEnumerable<string> Results(IEnumerable<string> files, IQuery query, int limit)
+        private static IEnumerable<string> Results(IEnumerable<string> files, List<IQuery> queries, int limit)
         {
             return files
                 .Select(ToDicomFile)
-                .Where(NotNull)
-                .Where(f => query.Matches(f.Dataset))
+                .Where(f => f != null && queries.All(q => q.Matches(f.Dataset)))
                 .Take(limit)
-                .Select(FileName);
+                .Select(f => f?.File?.Name)
+                .Where(fileName => fileName != null);
         }
     }
 }

DcmFind/Query.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Text.RegularExpressions;
 using Dicom;
 
 namespace DcmFind
@@ -17,8 +18,9 @@ public EqualsQuery(DicomTag dicomTag, string value)
         {
             if (dicomTag == null) throw new ArgumentNullException(nameof(dicomTag));
             if (value == null) throw new ArgumentNullException(nameof(value));
-
-            _predicate = dicomDataset => dicomDataset.TryGetString(dicomTag, out var dicomTagValue) && string.Equals(dicomTagValue, value, StringComparison.OrdinalIgnoreCase);
+            var pattern = $"^{Regex.Escape(value).Replace("%", ".*")}$";
+            var regex = new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.CultureInvariant);
+            _predicate = dicomDataset => dicomDataset.TryGetString(dicomTag, out var dicomTagValue) && regex.IsMatch(dicomTagValue);
         }
 
         public bool Matches(DicomDataset dicomDataset)

DcmFind/QueryParser.cs

@@ -7,7 +7,7 @@ public static class QueryParser
     {
         private static readonly string[] SupportedOperators = {"<=", ">=", "=", "<", ">" };
 
-        public static bool TryParse(string queryAsString, out IQuery query)
+        public static bool TryParse(string queryAsString, out IQuery? query)
         {
             query = null;
 
@@ -29,7 +29,7 @@ public static bool TryParse(string queryAsString, out IQuery query)
 
             var @operator = matchedOperator.Operator;
             var dicomTagAsString = queryAsString.Substring(0, matchedOperator.Index);
-            if (!DicomTagParser.TryParse(dicomTagAsString, out var dicomTag))
+            if (!DicomTagParser.TryParse(dicomTagAsString, out var dicomTag) || dicomTag == null)
             {
                 return false;
             }