Allow scanning files with no metadata

RupertAvery · Jan 3, 2023 · d56608a · d56608a
1 parent efdaf69
commit d56608a
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 5 deletions.
diff --git a/Diffusion.Database/Image.cs b/Diffusion.Database/Image.cs
@@ -39,4 +39,5 @@ public class Image
     public int? ClipSkip { get; set; }
     public int? ENSD { get; set; }
     public long FileSize { get; set; }
+    public bool NoMetadata { get; set; }
 }
diff --git a/Diffusion.Database/QueryBuilder.cs b/Diffusion.Database/QueryBuilder.cs
@@ -36,6 +36,7 @@ public static class QueryBuilder
     private static readonly Regex FavoriteRegex = new Regex("\\b(?:favorite|fave):\\s*(?<value>(?:true|false))?\\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
     private static readonly Regex NSFWRegex = new Regex("\\b(?:nsfw):\\s*(?<value>(?:true|false))?\\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+    private static readonly Regex NoMetadataRegex = new Regex("\\b(?:nometa|nometadata):\\s*(?<value>(?:true|false))?\\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
     private static readonly Regex NegativePromptRegex = new Regex("\\b(?:negative prompt|negative_prompt|negative):\\s*(?<value>.*)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
@@ -62,6 +63,7 @@ public static (string, IEnumerable<object>) Parse(string prompt)
         ParseFavorite(ref prompt, conditions);
         ParseForDeletion(ref prompt, conditions);
         ParseNSFW(ref prompt, conditions);
+        ParseNoMetadata(ref prompt, conditions);
 
         ParseNegativePrompt(ref prompt, conditions);
         ParsePrompt(ref prompt, conditions);
@@ -156,6 +158,24 @@ private static void ParseNSFW(ref string prompt, List<KeyValuePair<string, objec
         //return false;
     }
 
+    private static void ParseNoMetadata(ref string prompt, List<KeyValuePair<string, object>> conditions)
+    {
+        var match = NoMetadataRegex.Match(prompt);
+
+        if (match.Success)
+        {
+            prompt = NoMetadataRegex.Replace(prompt, String.Empty);
+
+            var value = true;
+
+            if (match.Groups["value"].Success)
+            {
+                value = match.Groups["value"].Value.ToLower() == "true";
+            }
+
+            conditions.Add(new KeyValuePair<string, object>("(NoMetadata = ?)", value));
+        }
+    }
 
     private static void ParseFavorite(ref string prompt, List<KeyValuePair<string, object>> conditions)
     {

diff --git a/Diffusion.Scanner/FileParameters.cs b/Diffusion.Scanner/FileParameters.cs
@@ -23,4 +23,5 @@ public class FileParameters
     public int? ENSD { get; set; }
     public decimal? PromptStrength { get; set; }
     public long FileSize { get; set; }
+    public bool NoMetadata { get; set; }
 }
diff --git a/Diffusion.Scanner/Metadata.cs b/Diffusion.Scanner/Metadata.cs
@@ -96,15 +96,14 @@ public static List<string> GetDirectoryTextFileCache(string path)
             }
         }
 
+        fileParameters ??= new FileParameters()
         {
+            NoMetadata = true
+        };
 
-
-        if (fileParameters != null)
-        {
         FileInfo fileInfo = new FileInfo(file);
         fileParameters.Path = file;
         fileParameters.FileSize = fileInfo.Length;
-        }
 
         return fileParameters;
     }

diff --git a/Diffusion.Toolkit/MainWindow.xaml.cs b/Diffusion.Toolkit/MainWindow.xaml.cs
@@ -854,6 +854,7 @@ await Dispatcher.Invoke(async () =>
                         HyperNetworkStrength = file.HyperNetworkStrength,
                         ClipSkip = file.ClipSkip,
                         FileSize = file.FileSize,
+                        NoMetadata = file.NoMetadata
                     };
 
                     if (!string.IsNullOrEmpty(file.HyperNetwork) && !file.HyperNetworkStrength.HasValue)

diff --git a/Diffusion.Toolkit/Tips.md b/Diffusion.Toolkit/Tips.md
@@ -289,6 +289,13 @@ If you specify this term explicitly, it will override the **Hide NSFW from Resul
 
 * `nsfw: [true|false]`
 
+## No Metadata
+
+This filter will show images that do not have metadata.
+
+* `nometa: [true|false]`
+* `nometadata: [true|false]`
+
 ## For Deletion
 
 For Deletion is a Diffusion Toolkit metadata with a value of true or false, entered by the user. See [Deleting](#deleting)

diff --git a/Diffusion.Toolkit/version.txt b/Diffusion.Toolkit/version.txt
@@ -1 +1 @@
-beta_v0.8.1
+beta_v0.8.2