GetExternalSeriesMetadataForSeries(int seriesId, Series series)
{
diff --git a/API/Services/Tasks/Scanner/ProcessSeries.cs b/API/Services/Tasks/Scanner/ProcessSeries.cs
index d9ff92282..d24deccad 100644
--- a/API/Services/Tasks/Scanner/ProcessSeries.cs
+++ b/API/Services/Tasks/Scanner/ProcessSeries.cs
@@ -127,13 +127,14 @@ public class ProcessSeries : IProcessSeries
seriesCollisions = seriesCollisions.Where(collision =>
collision.Name != firstInfo.Series || collision.LocalizedName != firstInfo.LocalizedSeries).ToList();
- if (seriesCollisions.Any())
+ if (seriesCollisions.Count > 1)
{
- var tableRows = seriesCollisions.Select(collision =>
- $"Name: {firstInfo.Series} | Name: {collision.Name} |
" +
- $"Localized: {firstInfo.LocalizedSeries} | Localized: {collision.LocalizedName} |
" +
- $"Filename: {Parser.Parser.NormalizePath(_directoryService.FileSystem.FileInfo.New(firstInfo.FullFilePath).Directory?.ToString())} | Filename: {Parser.Parser.NormalizePath(collision.FolderPath)} |
"
- );
+ var firstCollision = seriesCollisions[0];
+ var secondCollision = seriesCollisions[1];
+
+ var tableRows = $"Name: {firstCollision.Name} | Name: {secondCollision.Name} |
" +
+ $"Localized: {firstCollision.LocalizedName} | Localized: {secondCollision.LocalizedName} |
" +
+ $"Filename: {Parser.Parser.NormalizePath(firstCollision.FolderPath)} | Filename: {Parser.Parser.NormalizePath(secondCollision.FolderPath)} |
";
var htmlTable = $"Series 1 | Series 2 |
{string.Join(string.Empty, tableRows)}
";
diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts
index 2d27cad1a..b740928e3 100644
--- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts
+++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts
@@ -704,22 +704,12 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
this.ratings = [...data.ratings];
// Recommendations
- data.recommendations.ownedSeries.map(r => {
- this.seriesService.getMetadata(r.id).subscribe(m => r.summary = m.summary);
- });
this.combinedRecs = [...data.recommendations.ownedSeries, ...data.recommendations.externalSeries];
this.hasRecommendations = this.combinedRecs.length > 0;
this.cdRef.markForCheck();
});
}
- loadReviews() {
- this.seriesService.getReviews(this.seriesId).subscribe(reviews => {
- this.reviews = [...reviews];
- this.cdRef.markForCheck();
- });
- }
-
setContinuePoint() {
this.readerService.hasSeriesProgress(this.seriesId).subscribe(hasProgress => {
diff --git a/openapi.json b/openapi.json
index 1d779afe5..5e743d735 100644
--- a/openapi.json
+++ b/openapi.json
@@ -7,7 +7,7 @@
"name": "GPL-3.0",
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
},
- "version": "0.7.13.9"
+ "version": "0.7.13.10"
},
"servers": [
{
@@ -20337,6 +20337,12 @@
"type": "string",
"nullable": true
},
+ "number": {
+ "type": "number",
+ "description": "This will map to MinNumber. Number was removed in v0.7.13.8",
+ "format": "float",
+ "deprecated": true
+ },
"pages": {
"type": "integer",
"format": "int32"