Skip to content

Commit e5b1ac6

Browse files
liukonenliukonen
committed
Remove trigger words from code
1 parent 1a1bab0 commit e5b1ac6

File tree

16 files changed

+158
-218
lines changed

16 files changed

+158
-218
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎Standard/.DS_Store

0 Bytes
Binary file not shown.

‎Standard/Nats-Lin/Nats-Linux/MainWindow.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ protected void searchClick(object sender, EventArgs e)
111111
{
112112
entry1.Visible = false;
113113
bool useSmartSearch = SmartSearchAction.Active;//false;
114-
NATS.Filters.FileExtentionFilter.filterType filter = NATS.Filters.FileExtentionFilter.filterType.BlackList;
115-
string blacklist = string.Join("|", nats_standard.Nats.DefaultBlackList());
114+
NATS.Filters.FileExtentionFilter.filterType filter = NATS.Filters.FileExtentionFilter.filterType.DenyList;
115+
string Denylist = string.Join("|", nats_standard.Nats.DefaultDenyList());
116116

117-
arguments = new NATS.ArgumentsObject.ArgumentsObject(filter, blacklist, useSmartSearch)
117+
arguments = new NATS.ArgumentsObject.ArgumentsObject(filter, Denylist, useSmartSearch)
118118
{
119119
DirectoryPath = this.path,
120120
KeywordSearch = entry1.Text,

‎Standard/Nats-Lin/Nats-Linux/gtk-gui/MainWindow.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ protected virtual void Build()
9797
this.SmartSearchAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Smart Search");
9898
w1.Add(this.SmartSearchAction, null);
9999
this.IndexWLoadAction = new global::Gtk.RadioAction("IndexWLoadAction", global::Mono.Unix.Catalog.GetString("Index w/ Load"), null, null, 0);
100-
this.IndexWLoadAction.Group = this.MultiThreadAction.Group;
100+
this.IndexWLoadAction.Group = this.SingleThreadAction.Group;
101101
this.IndexWLoadAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Index w/ Load");
102102
w1.Add(this.IndexWLoadAction, null);
103103
this.IndexOnlyAction = new global::Gtk.RadioAction("IndexOnlyAction", global::Mono.Unix.Catalog.GetString("Index Only"), null, null, 0);
104-
this.IndexOnlyAction.Group = this.IndexWLoadAction.Group;
104+
this.IndexOnlyAction.Group = this.SingleThreadAction.Group;
105105
this.IndexOnlyAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Index Only");
106106
w1.Add(this.IndexOnlyAction, null);
107107
this.UIManager.InsertActionGroup(w1, 0);

‎Standard/Nats-Mac/.DS_Store

0 Bytes
Binary file not shown.

‎Standard/Nats-Mac/Nats/.DS_Store

0 Bytes
Binary file not shown.

‎Standard/Nats-Mac/Nats/ViewController.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public partial class ViewController : NSViewController
1414
public Boolean UseSmartSearch = false;
1515
public Boolean UseMultiLine = false;
1616
public NATS.ArgumentsObject.ArgumentsObject.eSearchType SearchType = NATS.ArgumentsObject.ArgumentsObject.eSearchType.Threaded;
17-
public List<string> BlacklistItems = new List<string>(nats_standard.Nats.DefaultBlackList());
17+
public List<string> DenylistItems = new List<string>(nats_standard.Nats.DefaultDenyList());
1818
public string Path = string.Empty;
1919
public System.ComponentModel.BackgroundWorker worker = new BackgroundWorker() { WorkerSupportsCancellation = true };
2020
public string results = string.Empty;
@@ -57,8 +57,8 @@ private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArg
5757

5858
private void Worker_DoWork(object sender, DoWorkEventArgs e)
5959
{
60-
var FilterType = NATS.Filters.FileExtentionFilter.filterType.BlackList;
61-
string Filter = string.Join("|", BlacklistItems);
60+
var FilterType = NATS.Filters.FileExtentionFilter.filterType.DenyList;
61+
string Filter = string.Join("|", DenylistItems);
6262
var Args = new NATS.ArgumentsObject.ArgumentsObject(FilterType, Filter, UseSmartSearch)
6363
{
6464
DirectoryPath = Path,

‎Standard/Nats-Win/Form1.cs

+24-24
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public partial class Form1 : Form
1414
NATS.ArgumentsObject.ArgumentsObject.eSearchType SearchType;
1515
NATS.Filters.FileExtentionFilter.filterType FilterType;
1616
int threadCount = 4;
17-
List<string> BlackListItems = new List<string>();
18-
List<string> WhiteListItems = new List<string>();
17+
List<string> DenyListItems = new List<string>();
18+
List<string> AproveListItems = new List<string>();
1919
List<string> responseItems = new List<string>();
2020
#endregion
2121

@@ -24,7 +24,7 @@ private string FilterString
2424
{
2525
get
2626
{
27-
return (approvedExtensionsToolStripMenuItem.Checked) ? string.Join("|", WhiteListItems) : string.Join("|", BlackListItems);
27+
return (approvedExtensionsToolStripMenuItem.Checked) ? string.Join("|", AproveListItems) : string.Join("|", DenyListItems);
2828
}
2929
}
3030
#endregion
@@ -40,9 +40,9 @@ public Form1()
4040
}
4141
private void Form1_Load(object sender, EventArgs e)
4242
{
43-
BlackListItems.AddRange(nats_standard.Nats.DefaultBlackList());
43+
DenyListItems.AddRange(nats_standard.Nats.DefaultDenyList());
4444
SearchType = NATS.ArgumentsObject.ArgumentsObject.eSearchType.Threaded;
45-
FilterType = NATS.Filters.FileExtentionFilter.filterType.BlackList;
45+
FilterType = NATS.Filters.FileExtentionFilter.filterType.DenyList;
4646
path = OpenFolder();
4747
this.Text = "Nats - " + path;
4848
}
@@ -202,30 +202,30 @@ private void infoToolStripMenuItem_Click(object sender, EventArgs e)
202202
#region Custom Event Handles
203203

204204
/// <summary>
205-
/// White List Black List Direct Call (if you hit any of the white list black list items, for removing)
205+
/// Aprove List Deny List Direct Call
206206
/// </summary>
207207
/// <param name="sender"></param>
208208
/// <param name="e"></param>
209-
private void WBDC(object sender, EventArgs e)
209+
private void ADDC(object sender, EventArgs e)
210210
{
211211
string Ext = ((ToolStripItem)sender).Text;
212212
if (MessageBox.Show("Are you sure you want to remove " + Ext, "Remove Item", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
213213

214214

215215
if (disapppvedExtensionsToolStripMenuItem.Checked)
216216
{
217-
BlackListItems.Remove(Ext);
217+
DenyListItems.Remove(Ext);
218218
disapppvedExtensionsToolStripMenuItem.DropDownItems.Remove((ToolStripItem)sender);
219219
}
220220
else
221221
{
222-
WhiteListItems.Remove(Ext);
222+
AproveListItems.Remove(Ext);
223223
approvedExtensionsToolStripMenuItem.DropDownItems.Remove((ToolStripItem)sender);
224224
}
225225
}
226226

227227
/// <summary>
228-
/// Add Item Control on both the Black and white list dropdowns
228+
/// Add Item Control on both the Aprove and Deny list dropdowns
229229
/// </summary>
230230
/// <param name="sender"></param>
231231
/// <param name="e"></param>
@@ -243,18 +243,18 @@ private void AddItem(object sender, EventArgs e)
243243

244244
if (disapppvedExtensionsToolStripMenuItem.Checked)
245245
{
246-
if (!BlackListItems.Contains(item))
246+
if (!DenyListItems.Contains(item))
247247
{
248-
BlackListItems.Add(item);
249-
disapppvedExtensionsToolStripMenuItem.DropDownItems.Add(item, null, WBDC);
248+
DenyListItems.Add(item);
249+
disapppvedExtensionsToolStripMenuItem.DropDownItems.Add(item, null, ADDC);
250250
}
251251
}
252252
else
253253
{
254-
if (!WhiteListItems.Contains(item))
254+
if (!AproveListItems.Contains(item))
255255
{
256-
WhiteListItems.Add(item);
257-
approvedExtensionsToolStripMenuItem.DropDownItems.Add(item, null, WBDC);
256+
AproveListItems.Add(item);
257+
approvedExtensionsToolStripMenuItem.DropDownItems.Add(item, null, ADDC);
258258
}
259259
}
260260
}
@@ -332,27 +332,27 @@ public string OpenFolder()
332332
}
333333

334334
/// <summary>
335-
/// Generates the Dropdown custom items for Blacklist and whitelist
335+
/// Generates the Dropdown custom items for Aprove and deny list
336336
/// </summary>
337-
/// <param name="isBlackList"></param>
338-
private void SetFilterDropdowns(bool isBlackList)
337+
/// <param name="isDenyList"></param>
338+
private void SetFilterDropdowns(bool isDenyList)
339339
{
340-
disapppvedExtensionsToolStripMenuItem.Checked = isBlackList;
341-
approvedExtensionsToolStripMenuItem.Checked = !isBlackList;
340+
disapppvedExtensionsToolStripMenuItem.Checked = isDenyList;
341+
approvedExtensionsToolStripMenuItem.Checked = !isDenyList;
342342
disapppvedExtensionsToolStripMenuItem.DropDownItems.Clear();
343343
approvedExtensionsToolStripMenuItem.DropDownItems.Clear();
344-
if (isBlackList)
344+
if (isDenyList)
345345
{
346346

347347
disapppvedExtensionsToolStripMenuItem.DropDownItems.Add("+Add", null, AddItem);
348-
var dddItems = from string blItem in BlackListItems select new ToolStripDropDownButton(blItem, null, WBDC);
348+
var dddItems = from string blItem in DenyListItems select new ToolStripDropDownButton(blItem, null, ADDC);
349349
disapppvedExtensionsToolStripMenuItem.DropDownItems.AddRange(dddItems.ToArray());
350350
}
351351
else
352352
{
353353

354354
approvedExtensionsToolStripMenuItem.DropDownItems.Add("+Add", null, AddItem);
355-
var ddItems = from string wlItem in WhiteListItems select new ToolStripDropDownButton(wlItem, null, WBDC);
355+
var ddItems = from string wlItem in AproveListItems select new ToolStripDropDownButton(wlItem, null, ADDC);
356356
approvedExtensionsToolStripMenuItem.DropDownItems.AddRange(ddItems.ToArray());
357357
}
358358

‎Standard/nats-standard/ArguementsObject.cs

100755100644
+4-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public ArgumentsObject(string arguments)
5656
{
5757
string ExtentionList = NATS.Filters.FileExtentionFilter.DefaultFileExtentions;
5858
string[] Items = arguments.Split('-');
59-
Filters.FileExtentionFilter.filterType FilterType = Filters.FileExtentionFilter.filterType.BlackList;
59+
Filters.FileExtentionFilter.filterType FilterType = Filters.FileExtentionFilter.filterType.DenyList;
6060

6161
foreach (string Item in Items)
6262
{
@@ -76,7 +76,7 @@ public ArgumentsObject(string arguments)
7676
break;
7777
case "D": ExtentionList = itemVal; break;
7878
case "A":
79-
ExtentionList = itemVal; FilterType = Filters.FileExtentionFilter.filterType.WhiteList;
79+
ExtentionList = itemVal; FilterType = Filters.FileExtentionFilter.filterType.AproveList;
8080
break;
8181
case "M": MultiLine = true; break;
8282
case "H": DisplayHelp = true; break;
@@ -90,9 +90,9 @@ public ArgumentsObject(string arguments)
9090
}
9191
}
9292

93-
/* -ApprovedList (whitelist)
93+
/* -ApprovedList
9494
* -Build Index
95-
* -DisapprovedList (BlackList)
95+
* -DisapprovedList
9696
* -Help
9797
* -Index search
9898
* -Limited Index Search (not fresh)

‎Standard/nats-standard/Filters/ExtentionFilter.cs

100755100644
+11-11
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,36 @@ namespace NATS.Filters
55
{
66
public class FileExtentionFilter : FileInfoFilters
77
{
8-
public enum filterType { WhiteList, BlackList }
8+
public enum filterType { AproveList, DenyList }
99

10-
public filterType Ftype = filterType.BlackList;
10+
public filterType Ftype = filterType.DenyList;
1111
public const string DefaultFileExtentions = "";
1212
List<string> FileExtentions = new List<string>();
1313

1414
public FileExtentionFilter(string ParamArguments, filterType type)
1515
{
16-
FileExtentions = ExtractBlackListExtentions(ParamArguments, type);
16+
FileExtentions = ExtractDenyListExtentions(ParamArguments, type);
1717
Ftype = type;
1818
}
1919

2020
public override bool IsValid(FileInfo FileInfo)
2121
{
22-
if (FileExtentions.Contains(FileInfo.Extension.ToLower())) { return Ftype == filterType.WhiteList; }
23-
return (Ftype == filterType.BlackList);
22+
if (FileExtentions.Contains(FileInfo.Extension.ToLower())) { return Ftype == filterType.AproveList; }
23+
return (Ftype == filterType.DenyList);
2424
}
2525

26-
private static List<string> ExtractBlackListExtentions(string BlackListVaraible, filterType type)
26+
private static List<string> ExtractDenyListExtentions(string DenyListVaraible, filterType type)
2727
{
28-
List<string> BlackListArray = new List<string>();
29-
if (BlackListVaraible == string.Empty && type == filterType.BlackList) { BlackListVaraible = nats_standard.Properties.Resources.DefaultBlacklist; }
28+
List<string> DenyListArray = new List<string>();
29+
if (DenyListVaraible == string.Empty && type == filterType.DenyList) { DenyListVaraible = nats_standard.Properties.Resources.DefaultDenylist; }
3030

31-
foreach (string item in BlackListVaraible.Split('|'))
31+
foreach (string item in DenyListVaraible.Split('|'))
3232
{
3333
string ext = item.ToLower();
3434
if (!ext.StartsWith(".")) { ext = "." + ext; }
35-
if (!BlackListArray.Contains(ext)) { BlackListArray.Add(ext); }
35+
if (!DenyListArray.Contains(ext)) { DenyListArray.Add(ext); }
3636
}
37-
return BlackListArray;
37+
return DenyListArray;
3838
}
3939
}
4040
}

‎Standard/nats-standard/Index/liteDBindex.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private void Debug(string item, Boolean active)
125125
}
126126

127127
/// <summary>
128-
/// Returns if the file should be scanned. First attempts a Black list and Whitelist based search (hard coded) followed by a smart search
128+
/// Returns if the file should be scanned. First attempts a deny list and aprove list based search (hard coded) followed by a smart search
129129
/// </summary>
130130
/// <param name="item"></param>
131131
/// <param name="filter"></param>
@@ -134,13 +134,13 @@ private bool StaticDynamicReadFile(FileInfo item, Filters.SmartSearchFilter filt
134134
{
135135
string Ext = item.Extension.ToLower();
136136
//writeout(Ext);
137-
if (BlacklistFilter.Contains(Ext)) return false;
138-
if (WhiteListFilter.Contains(Ext)) return true;
137+
if (DenylistFilter.Contains(Ext)) return false;
138+
if (AproveListFilter.Contains(Ext)) return true;
139139
return filter.IsValid(item);
140140
}
141141

142-
string[] BlacklistFilter = (from string str in nats_standard.Properties.Resources.DefaultBlacklist.Split('|') select "." + str).ToArray();
143-
string[] WhiteListFilter = { ".cs", ".vb", ".txt", ".csproj", ".vbproj", ".html", ".aspx", ".ascx", ".js" };
142+
string[] DenylistFilter = (from string str in nats_standard.Properties.Resources.DefaultDenylist.Split('|') select "." + str).ToArray();
143+
string[] AproveListFilter = { ".cs", ".vb", ".txt", ".csproj", ".vbproj", ".html", ".aspx", ".ascx", ".js" };
144144

145145
static object x = new object();
146146
void writeout(string s)

‎Standard/nats-standard/Nats.cs

100755100644
+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public static string Helpfile()
1717
}
1818
public static string GUIHelpFile() { return Properties.Resources.GUIHelp; }
1919

20-
public static string[] DefaultBlackList()
20+
public static string[] DefaultDenyList()
2121
{
22-
return Properties.Resources.DefaultBlacklist.Split('|');
22+
return Properties.Resources.DefaultDenylist.Split('|');
2323
}
2424

2525

0 commit comments

Comments
 (0)