Address comments

pull/2447/head
Bond_009 4 years ago
parent 787049f35f
commit 3ab50f5a3f

@ -1,6 +1,5 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1402 #pragma warning disable SA1402
#pragma warning disable SA1600
#pragma warning disable SA1649 #pragma warning disable SA1649
using System; using System;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic; using System.Collections.Generic;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.IO; using System.IO;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Controller.Plugins; using MediaBrowser.Controller.Plugins;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Threading; using System.Threading;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Globalization; using System.Globalization;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using MediaBrowser.Controller.LiveTv; using MediaBrowser.Controller.LiveTv;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic; using System.Collections.Generic;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Globalization; using System.Globalization;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Buffers; using System.Buffers;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -155,7 +155,7 @@ namespace Emby.Server.Implementations.MediaEncoder
} }
catch (IOException ex) catch (IOException ex)
{ {
_logger.LogError(ex, "Error deleting {Path}", tempFile); _logger.LogError(ex, "Error deleting temporary chapter image encoding file {Path}", tempFile);
} }
chapter.ImagePath = path; chapter.ImagePath = path;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
@ -976,10 +975,10 @@ namespace MediaBrowser.Providers.Manager
(_) => throw new Exception( (_) => throw new Exception(
string.Format( string.Format(
CultureInfo.InvariantCulture, CultureInfo.InvariantCulture,
"Refresh for item {0} {1} is not in progress", "Cannot update refresh progress of item '{0}' ({1}) because a refresh for this item is not running",
item.GetType().Name, item.GetType().Name,
item.Id.ToString("N", CultureInfo.InvariantCulture))), item.Id.ToString("N", CultureInfo.InvariantCulture))),
(_, _) => progress); (_, __) => progress);
RefreshProgress?.Invoke(this, new GenericEventArgs<Tuple<BaseItem, double>>(new Tuple<BaseItem, double>(item, progress))); RefreshProgress?.Invoke(this, new GenericEventArgs<Tuple<BaseItem, double>>(new Tuple<BaseItem, double>(item, progress)));
} }

@ -22,7 +22,6 @@
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>preview</LangVersion>
</PropertyGroup> </PropertyGroup>
<!-- Code Analyzers--> <!-- Code Analyzers-->

@ -1,5 +1,4 @@
#pragma warning disable CS1591 #pragma warning disable CS1591
#pragma warning disable SA1600
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -47,9 +46,6 @@ namespace MediaBrowser.Providers.MediaInfo
private readonly ILibraryManager _libraryManager; private readonly ILibraryManager _libraryManager;
private readonly IMediaSourceManager _mediaSourceManager; private readonly IMediaSourceManager _mediaSourceManager;
/// <summary>
/// The dummy chapter duration.
/// </summary>
private readonly long _dummyChapterDuration = TimeSpan.FromMinutes(5).Ticks; private readonly long _dummyChapterDuration = TimeSpan.FromMinutes(5).Ticks;
public FFProbeVideoInfo( public FFProbeVideoInfo(
@ -190,6 +186,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
video.RunTimeTicks = mediaInfo.RunTimeTicks; video.RunTimeTicks = mediaInfo.RunTimeTicks;
} }
video.Size = mediaInfo.Size; video.Size = mediaInfo.Size;
if (video.VideoType == VideoType.VideoFile) if (video.VideoType == VideoType.VideoFile)
@ -202,6 +199,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
video.Container = null; video.Container = null;
} }
video.Container = mediaInfo.Container; video.Container = mediaInfo.Container;
chapters = mediaInfo.Chapters == null ? Array.Empty<ChapterInfo>() : mediaInfo.Chapters; chapters = mediaInfo.Chapters == null ? Array.Empty<ChapterInfo>() : mediaInfo.Chapters;
@ -246,7 +244,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
if (chapters.Length == 0 && mediaStreams.Any(i => i.Type == MediaStreamType.Video)) if (chapters.Length == 0 && mediaStreams.Any(i => i.Type == MediaStreamType.Video))
{ {
CreateDummyChapters(video, ref chapters); chapters = CreateDummyChapters(video);
} }
NormalizeChapterNames(chapters); NormalizeChapterNames(chapters);
@ -563,11 +561,11 @@ namespace MediaBrowser.Providers.MediaInfo
} }
/// <summary> /// <summary>
/// Adds the dummy chapters. /// Creates dummy chapters.
/// </summary> /// </summary>
/// <param name="video">The video.</param> /// <param name="video">The video.</param>
/// <param name="chapters">The chapters.</param> /// <return>An array of dummy chapters.</returns>
private void CreateDummyChapters(Video video, ref ChapterInfo[] chapters) private ChapterInfo[] CreateDummyChapters(Video video)
{ {
var runtime = video.RunTimeTicks ?? 0; var runtime = video.RunTimeTicks ?? 0;
@ -583,12 +581,12 @@ namespace MediaBrowser.Providers.MediaInfo
if (runtime < _dummyChapterDuration) if (runtime < _dummyChapterDuration)
{ {
return; return Array.Empty<ChapterInfo>();
} }
// Limit to 100 chapters just in case there's some incorrect metadata here // Limit to 100 chapters just in case there's some incorrect metadata here
int chapterCount = (int)Math.Min(runtime / _dummyChapterDuration, 100); int chapterCount = (int)Math.Min(runtime / _dummyChapterDuration, 100);
chapters = new ChapterInfo[chapterCount]; var chapters = new ChapterInfo[chapterCount];
long currentChapterTicks = 0; long currentChapterTicks = 0;
for (int i = 0; i < chapterCount; i++) for (int i = 0; i < chapterCount; i++)
@ -600,6 +598,8 @@ namespace MediaBrowser.Providers.MediaInfo
currentChapterTicks += _dummyChapterDuration; currentChapterTicks += _dummyChapterDuration;
} }
return chapters;
} }
private string[] FetchFromDvdLib(Video item) private string[] FetchFromDvdLib(Video item)

Loading…
Cancel
Save