Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<PackageVersion Include="Dapper" Version="2.1.35" />
<PackageVersion Include="EFCore.BulkExtensions.PostgreSql" Version="8.1.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
<PackageVersion Include="Lucene.Net" Version="4.8.0-beta00017" />
<PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00017" />
<PackageVersion Include="Lucene.Net.QueryParser" Version="4.8.0-beta00017" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
Expand Down
3 changes: 2 additions & 1 deletion docs/Writerside/snippets/default-settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"EnableEndpoint": true,
"MinimumScoreMatch": 0.85,
"UseAllCores": false,
"NumberOfCores": 2
"NumberOfCores": 2,
"UseLucene": false
},
"Ingestion": {
"ZurgInstances": [],
Expand Down
4 changes: 4 additions & 0 deletions docs/Writerside/topics/Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ _Default: `false`_
_The number of processor cores to use for parallel operations during matching_
_Default: `2`_

**Imdb.UseLucene**
_Indicates whether the IMDB Matcher should use Lucene for searching. This is massively faster, at the cost of extra ram. Approx 3GB needed while performing resyncs._
_Default: `false`_

### Ingestion Configuration
**Ingestion.ZurgInstances**
_A list of Zurg instances to scrape from._
Expand Down
14 changes: 12 additions & 2 deletions src/Zilean.Database/Bootstrapping/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using Zilean.Database.Services;

namespace Zilean.Database.Bootstrapping;

public static class ServiceCollectionExtensions
Expand All @@ -9,7 +7,19 @@ public static IServiceCollection AddZileanDataServices(this IServiceCollection s
services.AddDbContext<ZileanDbContext>(options => options.UseNpgsql(configuration.Database.ConnectionString));
services.AddTransient<ITorrentInfoService, TorrentInfoService>();
services.AddTransient<IImdbFileService, ImdbFileService>();
services.RegisterImdbMatchingService(configuration);

return services;
}

private static void RegisterImdbMatchingService(this IServiceCollection services, ZileanConfiguration configuration)
{
if (configuration.Imdb.UseLucene)
{
services.AddTransient<IImdbMatchingService, ImdbLuceneMatchingService>();
return;
}

services.AddTransient<IImdbMatchingService, ImdbFuzzyStringMatchingService>();
}
}
9 changes: 9 additions & 0 deletions src/Zilean.Database/Dtos/LuceneIndexEntry.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace Zilean.Database.Dtos;

public static class LuceneIndexEntry
{
public const string ImdbId = "imdbId";
public const string Title = "title";
public const string Year = "year";
public const string Category = "category";
}
31 changes: 31 additions & 0 deletions src/Zilean.Database/Dtos/LuceneSession.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using J2N.IO;
using Lucene.Net.Analysis.Standard;
using Lucene.Net.Index;
using Lucene.Net.Util;

namespace Zilean.Database.Dtos;

public sealed class LuceneSession : IDisposable
{
public RAMDirectory? Directory { get; } = new();
public StandardAnalyzer? Analyzer { get; } = new(LuceneVersion.LUCENE_48);
public IndexWriterConfig? Config { get; private set; }
public IndexWriter? Writer { get; private set; }

public static LuceneSession NewInstance()
{
var instance = new LuceneSession();

instance.Config = new(LuceneVersion.LUCENE_48, instance.Analyzer);
instance.Writer = new(instance.Directory, instance.Config);

return instance;
}

public void Dispose()
{
Directory?.Dispose();
Analyzer?.Dispose();
Writer?.Dispose();
}
}
4 changes: 4 additions & 0 deletions src/Zilean.Database/GlobalUsings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
global using System.Text.Json;
global using Dapper;
global using EFCore.BulkExtensions;
global using Lucene.Net.Store;
global using Microsoft.EntityFrameworkCore;
global using Microsoft.EntityFrameworkCore.Metadata.Builders;
global using Microsoft.Extensions.DependencyInjection;
Expand All @@ -13,6 +14,9 @@
global using Spectre.Console;
global using Zilean.Database.Dtos;
global using Zilean.Database.ModelConfiguration;
global using Zilean.Database.Services;
global using Zilean.Database.Services.FuzzyString;
global using Zilean.Database.Services.Lucene;
global using Zilean.Shared.Features.Blacklist;
global using Zilean.Shared.Features.Configuration;
global using Zilean.Shared.Features.Dmm;
Expand Down
Loading
Loading