refactor namespaces and imports (#670)
* re-namespace * optimize usings * more usings * more of the same * more implicit/global usings * cleanup all usings * minor fixes
This commit is contained in:
@@ -1,91 +1,89 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Lucene.Net.Analysis;
|
||||
using Lucene.Net.Analysis;
|
||||
using Lucene.Net.Index;
|
||||
using Lucene.Net.QueryParsers.Classic;
|
||||
using Lucene.Net.Search;
|
||||
using Lucene.Net.Util;
|
||||
using Query = Lucene.Net.Search.Query;
|
||||
|
||||
namespace ErsatzTV.Infrastructure.Search
|
||||
namespace ErsatzTV.Infrastructure.Search;
|
||||
|
||||
public class CustomMultiFieldQueryParser : MultiFieldQueryParser
|
||||
{
|
||||
public class CustomMultiFieldQueryParser : MultiFieldQueryParser
|
||||
public CustomMultiFieldQueryParser(
|
||||
LuceneVersion matchVersion,
|
||||
string[] fields,
|
||||
Analyzer analyzer,
|
||||
IDictionary<string, float> boosts) : base(matchVersion, fields, analyzer, boosts)
|
||||
{
|
||||
public CustomMultiFieldQueryParser(
|
||||
LuceneVersion matchVersion,
|
||||
string[] fields,
|
||||
Analyzer analyzer,
|
||||
IDictionary<string, float> boosts) : base(matchVersion, fields, analyzer, boosts)
|
||||
{
|
||||
}
|
||||
|
||||
public CustomMultiFieldQueryParser(LuceneVersion matchVersion, string[] fields, Analyzer analyzer) : base(
|
||||
matchVersion,
|
||||
fields,
|
||||
analyzer)
|
||||
{
|
||||
}
|
||||
|
||||
protected override Query GetFieldQuery(string field, string queryText, bool quoted)
|
||||
{
|
||||
if (field == "released_onthisday")
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("*MMdd");
|
||||
return base.GetWildcardQuery("release_date", todayString);
|
||||
}
|
||||
|
||||
if (field == "minutes" && int.TryParse(queryText, out int val))
|
||||
{
|
||||
var bytesRef = new BytesRef();
|
||||
NumericUtils.Int32ToPrefixCoded(val, 0, bytesRef);
|
||||
return NewTermQuery(new Term("minutes", bytesRef));
|
||||
}
|
||||
|
||||
return base.GetFieldQuery(field, queryText, quoted);
|
||||
}
|
||||
|
||||
protected override Query GetFieldQuery(string field, string queryText, int slop)
|
||||
{
|
||||
if (field == "released_inthelast" && CustomQueryParser.ParseStart(queryText, out DateTime start))
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = start.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("release_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "released_notinthelast" && CustomQueryParser.ParseStart(queryText, out DateTime finish))
|
||||
{
|
||||
var dateString = finish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("release_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
if (field == "added_inthelast" && CustomQueryParser.ParseStart(queryText, out DateTime addedStart))
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = addedStart.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "added_notinthelast" && CustomQueryParser.ParseStart(queryText, out DateTime addedFinish))
|
||||
{
|
||||
var dateString = addedFinish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
return base.GetFieldQuery(field, queryText, slop);
|
||||
}
|
||||
|
||||
protected override Query GetRangeQuery(string field, string part1, string part2, bool startInclusive, bool endInclusive)
|
||||
{
|
||||
if (field == "minutes" && int.TryParse(part1, out int min) && int.TryParse(part2, out int max))
|
||||
{
|
||||
return NumericRangeQuery.NewInt32Range(field, min, max, startInclusive, endInclusive);
|
||||
}
|
||||
|
||||
return base.GetRangeQuery(field, part1, part2, startInclusive, endInclusive);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public CustomMultiFieldQueryParser(LuceneVersion matchVersion, string[] fields, Analyzer analyzer) : base(
|
||||
matchVersion,
|
||||
fields,
|
||||
analyzer)
|
||||
{
|
||||
}
|
||||
|
||||
protected override Query GetFieldQuery(string field, string queryText, bool quoted)
|
||||
{
|
||||
if (field == "released_onthisday")
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("*MMdd");
|
||||
return base.GetWildcardQuery("release_date", todayString);
|
||||
}
|
||||
|
||||
if (field == "minutes" && int.TryParse(queryText, out int val))
|
||||
{
|
||||
var bytesRef = new BytesRef();
|
||||
NumericUtils.Int32ToPrefixCoded(val, 0, bytesRef);
|
||||
return NewTermQuery(new Term("minutes", bytesRef));
|
||||
}
|
||||
|
||||
return base.GetFieldQuery(field, queryText, quoted);
|
||||
}
|
||||
|
||||
protected override Query GetFieldQuery(string field, string queryText, int slop)
|
||||
{
|
||||
if (field == "released_inthelast" && CustomQueryParser.ParseStart(queryText, out DateTime start))
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = start.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("release_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "released_notinthelast" && CustomQueryParser.ParseStart(queryText, out DateTime finish))
|
||||
{
|
||||
var dateString = finish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("release_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
if (field == "added_inthelast" && CustomQueryParser.ParseStart(queryText, out DateTime addedStart))
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = addedStart.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "added_notinthelast" && CustomQueryParser.ParseStart(queryText, out DateTime addedFinish))
|
||||
{
|
||||
var dateString = addedFinish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
return base.GetFieldQuery(field, queryText, slop);
|
||||
}
|
||||
|
||||
protected override Query GetRangeQuery(string field, string part1, string part2, bool startInclusive, bool endInclusive)
|
||||
{
|
||||
if (field == "minutes" && int.TryParse(part1, out int min) && int.TryParse(part2, out int max))
|
||||
{
|
||||
return NumericRangeQuery.NewInt32Range(field, min, max, startInclusive, endInclusive);
|
||||
}
|
||||
|
||||
return base.GetRangeQuery(field, part1, part2, startInclusive, endInclusive);
|
||||
}
|
||||
}
|
||||
@@ -1,129 +1,128 @@
|
||||
using System;
|
||||
using ErsatzTV.Core;
|
||||
using ErsatzTV.Core;
|
||||
using Lucene.Net.Analysis;
|
||||
using Lucene.Net.Index;
|
||||
using Lucene.Net.QueryParsers.Classic;
|
||||
using Lucene.Net.Search;
|
||||
using Lucene.Net.Util;
|
||||
using Query = Lucene.Net.Search.Query;
|
||||
|
||||
namespace ErsatzTV.Infrastructure.Search
|
||||
namespace ErsatzTV.Infrastructure.Search;
|
||||
|
||||
public class CustomQueryParser : QueryParser
|
||||
{
|
||||
public class CustomQueryParser : QueryParser
|
||||
public CustomQueryParser(LuceneVersion matchVersion, string f, Analyzer a) : base(matchVersion, f, a)
|
||||
{
|
||||
public CustomQueryParser(LuceneVersion matchVersion, string f, Analyzer a) : base(matchVersion, f, a)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
protected internal CustomQueryParser(ICharStream stream) : base(stream)
|
||||
{
|
||||
}
|
||||
protected internal CustomQueryParser(ICharStream stream) : base(stream)
|
||||
{
|
||||
}
|
||||
|
||||
protected CustomQueryParser(QueryParserTokenManager tm) : base(tm)
|
||||
{
|
||||
}
|
||||
protected CustomQueryParser(QueryParserTokenManager tm) : base(tm)
|
||||
{
|
||||
}
|
||||
|
||||
protected override Query GetFieldQuery(string field, string queryText, bool quoted)
|
||||
protected override Query GetFieldQuery(string field, string queryText, bool quoted)
|
||||
{
|
||||
if (field == "released_onthisday")
|
||||
{
|
||||
if (field == "released_onthisday")
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("*MMdd");
|
||||
return base.GetWildcardQuery("release_date", todayString);
|
||||
}
|
||||
var todayString = DateTime.Today.ToString("*MMdd");
|
||||
return base.GetWildcardQuery("release_date", todayString);
|
||||
}
|
||||
|
||||
if (field == "minutes" && int.TryParse(queryText, out int val))
|
||||
{
|
||||
var bytesRef = new BytesRef();
|
||||
NumericUtils.Int32ToPrefixCoded(val, 0, bytesRef);
|
||||
return NewTermQuery(new Term("minutes", bytesRef));
|
||||
}
|
||||
|
||||
return base.GetFieldQuery(field, queryText, quoted);
|
||||
if (field == "minutes" && int.TryParse(queryText, out int val))
|
||||
{
|
||||
var bytesRef = new BytesRef();
|
||||
NumericUtils.Int32ToPrefixCoded(val, 0, bytesRef);
|
||||
return NewTermQuery(new Term("minutes", bytesRef));
|
||||
}
|
||||
|
||||
protected override Query GetFieldQuery(string field, string queryText, int slop)
|
||||
return base.GetFieldQuery(field, queryText, quoted);
|
||||
}
|
||||
|
||||
protected override Query GetFieldQuery(string field, string queryText, int slop)
|
||||
{
|
||||
if (field == "released_inthelast" && ParseStart(queryText, out DateTime start))
|
||||
{
|
||||
if (field == "released_inthelast" && ParseStart(queryText, out DateTime start))
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = start.ToString("yyyyMMdd");
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = start.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("release_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "released_notinthelast" && ParseStart(queryText, out DateTime finish))
|
||||
{
|
||||
var dateString = finish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("release_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
if (field == "added_inthelast" && ParseStart(queryText, out DateTime addedStart))
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = addedStart.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "added_notinthelast" && ParseStart(queryText, out DateTime addedFinish))
|
||||
{
|
||||
var dateString = addedFinish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
return base.GetFieldQuery(field, queryText, slop);
|
||||
return base.GetRangeQuery("release_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "released_notinthelast" && ParseStart(queryText, out DateTime finish))
|
||||
{
|
||||
var dateString = finish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("release_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
if (field == "added_inthelast" && ParseStart(queryText, out DateTime addedStart))
|
||||
{
|
||||
var todayString = DateTime.Today.ToString("yyyyMMdd");
|
||||
var dateString = addedStart.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", dateString, todayString, true, true);
|
||||
}
|
||||
|
||||
if (field == "added_notinthelast" && ParseStart(queryText, out DateTime addedFinish))
|
||||
{
|
||||
var dateString = addedFinish.ToString("yyyyMMdd");
|
||||
|
||||
return base.GetRangeQuery("added_date", "00000000", dateString, false, false);
|
||||
}
|
||||
|
||||
return base.GetFieldQuery(field, queryText, slop);
|
||||
}
|
||||
|
||||
protected override Query GetRangeQuery(string field, string part1, string part2, bool startInclusive, bool endInclusive)
|
||||
protected override Query GetRangeQuery(string field, string part1, string part2, bool startInclusive, bool endInclusive)
|
||||
{
|
||||
if (field == "minutes" && int.TryParse(part1, out int min) && int.TryParse(part2, out int max))
|
||||
{
|
||||
if (field == "minutes" && int.TryParse(part1, out int min) && int.TryParse(part2, out int max))
|
||||
{
|
||||
return NumericRangeQuery.NewInt32Range(field, 1, min, max, startInclusive, endInclusive);
|
||||
}
|
||||
|
||||
return base.GetRangeQuery(field, part1, part2, startInclusive, endInclusive);
|
||||
return NumericRangeQuery.NewInt32Range(field, 1, min, max, startInclusive, endInclusive);
|
||||
}
|
||||
|
||||
internal static bool ParseStart(string text, out DateTime start)
|
||||
{
|
||||
start = SystemTime.MinValueUtc;
|
||||
|
||||
try
|
||||
return base.GetRangeQuery(field, part1, part2, startInclusive, endInclusive);
|
||||
}
|
||||
|
||||
internal static bool ParseStart(string text, out DateTime start)
|
||||
{
|
||||
start = SystemTime.MinValueUtc;
|
||||
|
||||
try
|
||||
{
|
||||
if (int.TryParse(text.Split(" ")[0], out int number))
|
||||
{
|
||||
if (int.TryParse(text.Split(" ")[0], out int number))
|
||||
if (text.Contains("day"))
|
||||
{
|
||||
if (text.Contains("day"))
|
||||
{
|
||||
start = DateTime.Today.AddDays(number * -1);
|
||||
return true;
|
||||
}
|
||||
start = DateTime.Today.AddDays(number * -1);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (text.Contains("week"))
|
||||
{
|
||||
start = DateTime.Today.AddDays(number * -7);
|
||||
return true;
|
||||
}
|
||||
if (text.Contains("week"))
|
||||
{
|
||||
start = DateTime.Today.AddDays(number * -7);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (text.Contains("month"))
|
||||
{
|
||||
start = DateTime.Today.AddMonths(number * -1);
|
||||
return true;
|
||||
}
|
||||
if (text.Contains("month"))
|
||||
{
|
||||
start = DateTime.Today.AddMonths(number * -1);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (text.Contains("year"))
|
||||
{
|
||||
start = DateTime.Today.AddYears(number * -1);
|
||||
return true;
|
||||
}
|
||||
if (text.Contains("year"))
|
||||
{
|
||||
start = DateTime.Today.AddYears(number * -1);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
catch
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user