* Code cleanup. Fixed OPDS images missing api key. Fixed theme color on site manifest not being black. * Removed a console.log from timeago pipe * Reading list page is now alphabetical and the modal for adding to a reading list is ordered by most recent. * Fixed a bug where remove read from reading list failed due to Calculating Start and End date assuming chapter would always be there. * Fixed a bug where reading list cover would get reset when editing the reading list. * Fixed a bug where reading list item didn't have not read badge. It's on old style. * Fixed a bug where user-preferences was hitting an admin only api when there was a better alternative * Slight memory improvement on a common db call * Fixed a bug where resetting to default theme when a theme was deleted was throwing an exception and failing. * All Login dtos now have the active KavitaVersion to make external apps able to handle what version of the API they are connecting with. * Fixed up a case where getVolume repo method always assumed there was a volume by that Id.
105 lines
3.6 KiB
C#
105 lines
3.6 KiB
C#
using System;
|
|
using System.Linq;
|
|
using System.Text.RegularExpressions;
|
|
using System.Threading.Tasks;
|
|
using API.Services;
|
|
using BenchmarkDotNet.Attributes;
|
|
using BenchmarkDotNet.Order;
|
|
using HtmlAgilityPack;
|
|
using VersOne.Epub;
|
|
|
|
namespace API.Benchmark;
|
|
|
|
[StopOnFirstError]
|
|
[MemoryDiagnoser]
|
|
[RankColumn]
|
|
[Orderer(SummaryOrderPolicy.FastestToSlowest)]
|
|
[SimpleJob(launchCount: 1, warmupCount: 5, invocationCount: 20)]
|
|
public class EpubBenchmark
|
|
{
|
|
private const string FilePath = @"E:\Books\Invaders of the Rokujouma\Invaders of the Rokujouma - Volume 01.epub";
|
|
private readonly Regex _wordRegex = new Regex(@"\b\w+\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
|
|
[Benchmark]
|
|
public async Task GetWordCount_PassByRef()
|
|
{
|
|
using var book = await EpubReader.OpenBookAsync(FilePath, BookService.BookReaderOptions);
|
|
foreach (var bookFile in book.Content.Html.Values)
|
|
{
|
|
await GetBookWordCount_PassByRef(bookFile);
|
|
}
|
|
}
|
|
|
|
[Benchmark]
|
|
public async Task GetBookWordCount_SumEarlier()
|
|
{
|
|
using var book = await EpubReader.OpenBookAsync(FilePath, BookService.BookReaderOptions);
|
|
foreach (var bookFile in book.Content.Html.Values)
|
|
{
|
|
await GetBookWordCount_SumEarlier(bookFile);
|
|
}
|
|
}
|
|
|
|
[Benchmark]
|
|
public async Task GetBookWordCount_Regex()
|
|
{
|
|
using var book = await EpubReader.OpenBookAsync(FilePath, BookService.BookReaderOptions);
|
|
foreach (var bookFile in book.Content.Html.Values)
|
|
{
|
|
await GetBookWordCount_Regex(bookFile);
|
|
}
|
|
}
|
|
|
|
private int GetBookWordCount_PassByString(string fileContents)
|
|
{
|
|
var doc = new HtmlDocument();
|
|
doc.LoadHtml(fileContents);
|
|
var delimiter = new char[] {' '};
|
|
|
|
return doc.DocumentNode.SelectNodes("//body//text()[not(parent::script)]")
|
|
.Select(node => node.InnerText)
|
|
.Select(text => text.Split(delimiter, StringSplitOptions.RemoveEmptyEntries)
|
|
.Where(s => char.IsLetter(s[0])))
|
|
.Select(words => words.Count())
|
|
.Where(wordCount => wordCount > 0)
|
|
.Sum();
|
|
}
|
|
|
|
private async Task<int> GetBookWordCount_PassByRef(EpubContentFileRef bookFile)
|
|
{
|
|
var doc = new HtmlDocument();
|
|
doc.LoadHtml(await bookFile.ReadContentAsTextAsync());
|
|
var delimiter = new char[] {' '};
|
|
|
|
var textNodes = doc.DocumentNode.SelectNodes("//body//text()[not(parent::script)]");
|
|
if (textNodes == null) return 0;
|
|
return textNodes.Select(node => node.InnerText)
|
|
.Select(text => text.Split(delimiter, StringSplitOptions.RemoveEmptyEntries)
|
|
.Where(s => char.IsLetter(s[0])))
|
|
.Select(words => words.Count())
|
|
.Where(wordCount => wordCount > 0)
|
|
.Sum();
|
|
}
|
|
|
|
private async Task<int> GetBookWordCount_SumEarlier(EpubContentFileRef bookFile)
|
|
{
|
|
var doc = new HtmlDocument();
|
|
doc.LoadHtml(await bookFile.ReadContentAsTextAsync());
|
|
|
|
return doc.DocumentNode.SelectNodes("//body//text()[not(parent::script)]")
|
|
.DefaultIfEmpty()
|
|
.Select(node => node.InnerText.Split(' ', StringSplitOptions.RemoveEmptyEntries)
|
|
.Where(s => char.IsLetter(s[0])))
|
|
.Sum(words => words.Count());
|
|
}
|
|
|
|
private async Task<int> GetBookWordCount_Regex(EpubContentFileRef bookFile)
|
|
{
|
|
var doc = new HtmlDocument();
|
|
doc.LoadHtml(await bookFile.ReadContentAsTextAsync());
|
|
|
|
|
|
return doc.DocumentNode.SelectNodes("//body//text()[not(parent::script)]")
|
|
.Sum(node => _wordRegex.Matches(node.InnerText).Count);
|
|
}
|
|
}
|