|
|
|
@ -83,7 +83,8 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
{ |
|
|
|
{ |
|
|
|
decimal percentCompletion = (decimal)allShowFolders.IndexOf(showFolder) / allShowFolders.Count; |
|
|
|
decimal percentCompletion = (decimal)allShowFolders.IndexOf(showFolder) / allShowFolders.Count; |
|
|
|
await _mediator.Publish( |
|
|
|
await _mediator.Publish( |
|
|
|
new LibraryScanProgress(libraryPath.LibraryId, progressMin + percentCompletion * progressSpread)); |
|
|
|
new LibraryScanProgress(libraryPath.LibraryId, progressMin + percentCompletion * progressSpread), |
|
|
|
|
|
|
|
cancellationToken); |
|
|
|
|
|
|
|
|
|
|
|
Either<BaseError, MediaItemScanResult<Show>> maybeShow = |
|
|
|
Either<BaseError, MediaItemScanResult<Show>> maybeShow = |
|
|
|
await FindOrCreateShow(libraryPath.Id, showFolder) |
|
|
|
await FindOrCreateShow(libraryPath.Id, showFolder) |
|
|
|
@ -92,16 +93,17 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
.BindT(show => UpdateArtworkForShow(show, showFolder, ArtworkKind.FanArt, cancellationToken)) |
|
|
|
.BindT(show => UpdateArtworkForShow(show, showFolder, ArtworkKind.FanArt, cancellationToken)) |
|
|
|
.BindT(show => UpdateArtworkForShow(show, showFolder, ArtworkKind.Thumbnail, cancellationToken)); |
|
|
|
.BindT(show => UpdateArtworkForShow(show, showFolder, ArtworkKind.Thumbnail, cancellationToken)); |
|
|
|
|
|
|
|
|
|
|
|
await maybeShow.Match( |
|
|
|
foreach (BaseError error in maybeShow.LeftToSeq()) |
|
|
|
async result => |
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
await ScanSeasons( |
|
|
|
_logger.LogWarning( |
|
|
|
libraryPath, |
|
|
|
"Error processing show in folder {Folder}: {Error}", |
|
|
|
ffmpegPath, |
|
|
|
|
|
|
|
ffprobePath, |
|
|
|
|
|
|
|
result.Item, |
|
|
|
|
|
|
|
showFolder, |
|
|
|
showFolder, |
|
|
|
cancellationToken); |
|
|
|
error.Value); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach (MediaItemScanResult<Show> result in maybeShow.RightToSeq()) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
await ScanSeasons(libraryPath, ffmpegPath, ffprobePath, result.Item, showFolder, cancellationToken); |
|
|
|
|
|
|
|
|
|
|
|
if (result.IsAdded) |
|
|
|
if (result.IsAdded) |
|
|
|
{ |
|
|
|
{ |
|
|
|
@ -111,15 +113,7 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
{ |
|
|
|
{ |
|
|
|
await _searchIndex.UpdateItems(_searchRepository, new List<MediaItem> { result.Item }); |
|
|
|
await _searchIndex.UpdateItems(_searchRepository, new List<MediaItem> { result.Item }); |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
} |
|
|
|
error => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_logger.LogWarning( |
|
|
|
|
|
|
|
"Error processing show in folder {Folder}: {Error}", |
|
|
|
|
|
|
|
showFolder, |
|
|
|
|
|
|
|
error.Value); |
|
|
|
|
|
|
|
return Task.FromResult(Unit.Default); |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
foreach (string path in await _televisionRepository.FindEpisodePaths(libraryPath)) |
|
|
|
foreach (string path in await _televisionRepository.FindEpisodePaths(libraryPath)) |
|
|
|
@ -249,16 +243,15 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
.BindT(e => FlagNormal(new MediaItemScanResult<Episode>(e))) |
|
|
|
.BindT(e => FlagNormal(new MediaItemScanResult<Episode>(e))) |
|
|
|
.MapT(r => r.Item); |
|
|
|
.MapT(r => r.Item); |
|
|
|
|
|
|
|
|
|
|
|
await maybeEpisode.Match( |
|
|
|
foreach (BaseError error in maybeEpisode.LeftToSeq()) |
|
|
|
async episode => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
await _searchIndex.UpdateItems(_searchRepository, new List<MediaItem> { episode }); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
error => |
|
|
|
|
|
|
|
{ |
|
|
|
{ |
|
|
|
_logger.LogWarning("Error processing episode at {Path}: {Error}", file, error.Value); |
|
|
|
_logger.LogWarning("Error processing episode at {Path}: {Error}", file, error.Value); |
|
|
|
return Task.CompletedTask; |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
foreach (Episode episode in maybeEpisode.RightToSeq()) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
await _searchIndex.UpdateItems(_searchRepository, new List<MediaItem> { episode }); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// TODO: remove missing episodes?
|
|
|
|
// TODO: remove missing episodes?
|
|
|
|
@ -273,8 +266,21 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
try |
|
|
|
try |
|
|
|
{ |
|
|
|
{ |
|
|
|
Show show = result.Item; |
|
|
|
Show show = result.Item; |
|
|
|
await LocateNfoFileForShow(showFolder).Match( |
|
|
|
|
|
|
|
async nfoFile => |
|
|
|
Option<string> maybeNfo = LocateNfoFileForShow(showFolder); |
|
|
|
|
|
|
|
if (maybeNfo.IsNone) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (!Optional(show.ShowMetadata).Flatten().Any()) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", showFolder); |
|
|
|
|
|
|
|
if (await _localMetadataProvider.RefreshFallbackMetadata(show, showFolder)) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
result.IsUpdated = true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach (string nfoFile in maybeNfo) |
|
|
|
{ |
|
|
|
{ |
|
|
|
bool shouldUpdate = Optional(show.ShowMetadata).Flatten().HeadOrNone().Match( |
|
|
|
bool shouldUpdate = Optional(show.ShowMetadata).Flatten().HeadOrNone().Match( |
|
|
|
m => m.MetadataKind == MetadataKind.Fallback || |
|
|
|
m => m.MetadataKind == MetadataKind.Fallback || |
|
|
|
@ -289,18 +295,7 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
result.IsUpdated = true; |
|
|
|
result.IsUpdated = true; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
async () => |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (!Optional(show.ShowMetadata).Flatten().Any()) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
_logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", showFolder); |
|
|
|
|
|
|
|
if (await _localMetadataProvider.RefreshFallbackMetadata(show, showFolder)) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
result.IsUpdated = true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -337,33 +332,34 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
{ |
|
|
|
{ |
|
|
|
try |
|
|
|
try |
|
|
|
{ |
|
|
|
{ |
|
|
|
await LocateNfoFile(episode).Match( |
|
|
|
Option<string> maybeNfo = LocateNfoFile(episode); |
|
|
|
async nfoFile => |
|
|
|
if (maybeNfo.IsNone) |
|
|
|
{ |
|
|
|
{ |
|
|
|
bool shouldUpdate = Optional(episode.EpisodeMetadata).Flatten().HeadOrNone().Match( |
|
|
|
bool shouldUpdate = Optional(episode.EpisodeMetadata).Flatten().HeadOrNone().Match( |
|
|
|
m => m.MetadataKind == MetadataKind.Fallback || |
|
|
|
m => m.DateUpdated == SystemTime.MinValueUtc, |
|
|
|
m.DateUpdated != _localFileSystem.GetLastWriteTime(nfoFile), |
|
|
|
|
|
|
|
true); |
|
|
|
true); |
|
|
|
|
|
|
|
|
|
|
|
if (shouldUpdate) |
|
|
|
if (shouldUpdate) |
|
|
|
{ |
|
|
|
{ |
|
|
|
_logger.LogDebug("Refreshing {Attribute} from {Path}", "Sidecar Metadata", nfoFile); |
|
|
|
string path = episode.MediaVersions.Head().MediaFiles.Head().Path; |
|
|
|
await _localMetadataProvider.RefreshSidecarMetadata(episode, nfoFile); |
|
|
|
_logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", path); |
|
|
|
|
|
|
|
await _localMetadataProvider.RefreshFallbackMetadata(episode); |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
} |
|
|
|
async () => |
|
|
|
|
|
|
|
|
|
|
|
foreach (string nfoFile in maybeNfo) |
|
|
|
{ |
|
|
|
{ |
|
|
|
bool shouldUpdate = Optional(episode.EpisodeMetadata).Flatten().HeadOrNone().Match( |
|
|
|
bool shouldUpdate = Optional(episode.EpisodeMetadata).Flatten().HeadOrNone().Match( |
|
|
|
m => m.DateUpdated == SystemTime.MinValueUtc, |
|
|
|
m => m.MetadataKind == MetadataKind.Fallback || |
|
|
|
|
|
|
|
m.DateUpdated != _localFileSystem.GetLastWriteTime(nfoFile), |
|
|
|
true); |
|
|
|
true); |
|
|
|
|
|
|
|
|
|
|
|
if (shouldUpdate) |
|
|
|
if (shouldUpdate) |
|
|
|
{ |
|
|
|
{ |
|
|
|
string path = episode.MediaVersions.Head().MediaFiles.Head().Path; |
|
|
|
_logger.LogDebug("Refreshing {Attribute} from {Path}", "Sidecar Metadata", nfoFile); |
|
|
|
_logger.LogDebug("Refreshing {Attribute} for {Path}", "Fallback Metadata", path); |
|
|
|
await _localMetadataProvider.RefreshSidecarMetadata(episode, nfoFile); |
|
|
|
await _localMetadataProvider.RefreshFallbackMetadata(episode); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return episode; |
|
|
|
return episode; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -383,12 +379,12 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
try |
|
|
|
try |
|
|
|
{ |
|
|
|
{ |
|
|
|
Show show = result.Item; |
|
|
|
Show show = result.Item; |
|
|
|
await LocateArtworkForShow(showFolder, artworkKind).IfSomeAsync( |
|
|
|
Option<string> maybeArtwork = LocateArtworkForShow(showFolder, artworkKind); |
|
|
|
async artworkFile => |
|
|
|
foreach (string artworkFile in maybeArtwork) |
|
|
|
{ |
|
|
|
{ |
|
|
|
ShowMetadata metadata = show.ShowMetadata.Head(); |
|
|
|
ShowMetadata metadata = show.ShowMetadata.Head(); |
|
|
|
await RefreshArtwork(artworkFile, metadata, artworkKind, None, None, cancellationToken); |
|
|
|
await RefreshArtwork(artworkFile, metadata, artworkKind, None, None, cancellationToken); |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -406,12 +402,12 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
{ |
|
|
|
{ |
|
|
|
try |
|
|
|
try |
|
|
|
{ |
|
|
|
{ |
|
|
|
await LocatePoster(season, seasonFolder).IfSomeAsync( |
|
|
|
Option<string> maybePoster = LocatePoster(season, seasonFolder); |
|
|
|
async posterFile => |
|
|
|
foreach (string posterFile in maybePoster) |
|
|
|
{ |
|
|
|
{ |
|
|
|
SeasonMetadata metadata = season.SeasonMetadata.Head(); |
|
|
|
SeasonMetadata metadata = season.SeasonMetadata.Head(); |
|
|
|
await RefreshArtwork(posterFile, metadata, ArtworkKind.Poster, None, None, cancellationToken); |
|
|
|
await RefreshArtwork(posterFile, metadata, ArtworkKind.Poster, None, None, cancellationToken); |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return season; |
|
|
|
return season; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -426,20 +422,20 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan |
|
|
|
{ |
|
|
|
{ |
|
|
|
try |
|
|
|
try |
|
|
|
{ |
|
|
|
{ |
|
|
|
await LocateThumbnail(episode).IfSomeAsync( |
|
|
|
Option<string> maybeThumbnail = LocateThumbnail(episode); |
|
|
|
async posterFile => |
|
|
|
foreach (string thumbnailFile in maybeThumbnail) |
|
|
|
{ |
|
|
|
{ |
|
|
|
foreach (EpisodeMetadata metadata in episode.EpisodeMetadata) |
|
|
|
foreach (EpisodeMetadata metadata in episode.EpisodeMetadata) |
|
|
|
{ |
|
|
|
{ |
|
|
|
await RefreshArtwork( |
|
|
|
await RefreshArtwork( |
|
|
|
posterFile, |
|
|
|
thumbnailFile, |
|
|
|
metadata, |
|
|
|
metadata, |
|
|
|
ArtworkKind.Thumbnail, |
|
|
|
ArtworkKind.Thumbnail, |
|
|
|
None, |
|
|
|
None, |
|
|
|
None, |
|
|
|
None, |
|
|
|
cancellationToken); |
|
|
|
cancellationToken); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return episode; |
|
|
|
return episode; |
|
|
|
} |
|
|
|
} |
|
|
|
|