mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-12-26 17:36:52 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Address comments

Browse source
This commit is contained in:
Bond_009 2020-04-01 19:05:41 +02:00
parent 787049f35f
commit 3ab50f5a3f
33 changed files with 13 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Emby.Notifications/Api/NotificationsService.cs
View file

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

1
Emby.Notifications/CoreNotificationTypes.cs
View file

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

1
Emby.Notifications/NotificationConfigurationFactory.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
View file

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

1
Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
View file

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

1
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View file

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

1
Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
View file

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

1
Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
View file

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

1
Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
View file

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

1
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View file

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

1
Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View file

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

1
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
View file

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

2
Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
View file

@ -155,7 +155,7 @@ namespace Emby.Server.Implementations.MediaEncoder
}
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;

1
MediaBrowser.Controller/Entities/Folder.cs
View file

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

1
MediaBrowser.Controller/Library/IMediaSourceProvider.cs
View file

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

1
MediaBrowser.Controller/MediaEncoding/IEncodingManager.cs
View file

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

1
MediaBrowser.Providers/Chapters/ChapterManager.cs
View file

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

5
MediaBrowser.Providers/Manager/ProviderManager.cs
View file

@ -1,5 +1,4 @@
#pragma warning disable CS1591
#pragma warning disable SA1600
using System;
using System.Collections.Concurrent;
@ -976,10 +975,10 @@ namespace MediaBrowser.Providers.Manager
(_) => throw new Exception(
string.Format(
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.Id.ToString("N", CultureInfo.InvariantCulture))),
(_, _) => progress);
(_, __) => progress);
RefreshProgress?.Invoke(this, new GenericEventArgs<Tuple<BaseItem, double>>(new Tuple<BaseItem, double>(item, progress)));
}

1
MediaBrowser.Providers/MediaBrowser.Providers.csproj
View file

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

20
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View file

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