CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 19:20:27 +12:00
Code Issues Packages Projects Releases Wiki Activity

Support wildcard in image history form search

Browse source
This commit is contained in:
Jaex 2019-04-09 12:04:07 +03:00
parent 457e13b7bb
commit cf7893b6cb
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HistoryLib/Forms/HistoryForm.cs
View file

@ -151,7 +151,7 @@ private HistoryItem[] ApplyFilters(HistoryItem[] historyItems)
if (!string.IsNullOrEmpty(filenameFilter))
{
string pattern = Regex.Escape(filenameFilter).Replace("\\?", ".").Replace("\\*", ".*");
Regex regex = new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
Regex regex = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
result = result.Where(x => x.Filename != null && regex.IsMatch(x.Filename));
}

11
ShareX.HistoryLib/Forms/ImageHistoryForm.cs
View file

@ -29,6 +29,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using View = Manina.Windows.Forms.View;
@ -106,12 +107,20 @@ private IEnumerable<HistoryItem> GetHistoryItems()
List<HistoryItem> historyItems = history.GetHistoryItems();
List<HistoryItem> filteredHistoryItems = new List<HistoryItem>();
Regex regex = null;
if (!string.IsNullOrEmpty(SearchText))
{
string pattern = Regex.Escape(SearchText).Replace("\\?", ".").Replace("\\*", ".*");
regex = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
}
for (int i = historyItems.Count - 1; i >= 0; i--)
{
HistoryItem hi = historyItems[i];
if (!string.IsNullOrEmpty(hi.Filepath) && Helpers.IsImageFile(hi.Filepath) &&
(string.IsNullOrEmpty(SearchText) || hi.Filename.Contains(SearchText, StringComparison.InvariantCultureIgnoreCase)) &&
(regex == null || regex.IsMatch(hi.Filename)) &&
(!Settings.FilterMissingFiles || File.Exists(hi.Filepath)))
{
filteredHistoryItems.Add(hi);