Bond_009 пре 5 година
родитељ
комит
3ab50f5a3f
33 измењених фајлова са 13 додато и 44 уклоњено
  1. 0 1
      Emby.Notifications/Api/NotificationsService.cs
  2. 0 1
      Emby.Notifications/CoreNotificationTypes.cs
  3. 0 1
      Emby.Notifications/NotificationConfigurationFactory.cs
  4. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs
  5. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
  6. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs
  7. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs
  8. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
  9. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs
  10. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs
  11. 0 1
      Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs
  12. 0 1
      Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
  13. 0 1
      Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
  14. 0 1
      Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs
  15. 0 1
      Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs
  16. 0 1
      Emby.Server.Implementations/LiveTv/LiveTvManager.cs
  17. 0 1
      Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
  18. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
  19. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
  20. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
  21. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
  22. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs
  23. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
  24. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
  25. 0 1
      Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs
  26. 1 1
      Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
  27. 0 1
      MediaBrowser.Controller/Entities/Folder.cs
  28. 0 1
      MediaBrowser.Controller/Library/IMediaSourceProvider.cs
  29. 0 1
      MediaBrowser.Controller/MediaEncoding/IEncodingManager.cs
  30. 0 1
      MediaBrowser.Providers/Chapters/ChapterManager.cs
  31. 2 3
      MediaBrowser.Providers/Manager/ProviderManager.cs
  32. 0 1
      MediaBrowser.Providers/MediaBrowser.Providers.csproj
  33. 10 10
      MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs

+ 0 - 1
Emby.Notifications/Api/NotificationsService.cs

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

+ 0 - 1
Emby.Notifications/CoreNotificationTypes.cs

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

+ 0 - 1
Emby.Notifications/NotificationConfigurationFactory.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/LiveTvManager.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs

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

+ 0 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs

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

+ 1 - 1
Emby.Server.Implementations/MediaEncoder/EncodingManager.cs

@@ -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;

+ 0 - 1
MediaBrowser.Controller/Entities/Folder.cs

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

+ 0 - 1
MediaBrowser.Controller/Library/IMediaSourceProvider.cs

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

+ 0 - 1
MediaBrowser.Controller/MediaEncoding/IEncodingManager.cs

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

+ 0 - 1
MediaBrowser.Providers/Chapters/ChapterManager.cs

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

+ 2 - 3
MediaBrowser.Providers/Manager/ProviderManager.cs

@@ -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)));
         }

+ 0 - 1
MediaBrowser.Providers/MediaBrowser.Providers.csproj

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

+ 10 - 10
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs

@@ -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)