Merge pull request #3089 from MediaBrowser/beta

Beta
MediaBrowser · Dec 20, 2017 · f13ec1e · f13ec1e
2 parents e5eac73 + 4c798a3
commit f13ec1e
Show file tree

Hide file tree

Showing 167 changed files with 711 additions and 2,348 deletions.
diff --git a/BDInfo/BDROM.cs b/BDInfo/BDROM.cs
@@ -57,8 +57,6 @@ public class BDROM
         public Dictionary<string, TSInterleavedFile> InterleavedFiles =
             new Dictionary<string, TSInterleavedFile>();
 
-        private static List<string> ExcludeDirs = new List<string> { "ANY!", "AACS", "BDSVM", "ANYVM", "SLYVM" };
-
         public delegate bool OnStreamClipFileScanError(
             TSStreamClipFile streamClipFile, Exception ex);
 
@@ -421,7 +419,7 @@ private string GetVolumeLabel(FileSystemMetadata dir)
             return dir.Name;
         }
 
-        public static int CompareStreamFiles(
+        public int CompareStreamFiles(
             TSStreamFile x,
             TSStreamFile y)
         {

diff --git a/BDInfo/TSPlaylistFile.cs b/BDInfo/TSPlaylistFile.cs
@@ -954,7 +954,7 @@ public bool IsValid
             }
         }
 
-        public static int CompareVideoStreams(
+        public int CompareVideoStreams(
             TSVideoStream x, 
             TSVideoStream y)
         {
@@ -995,7 +995,7 @@ public static int CompareVideoStreams(
             }
         }
 
-        public static int CompareAudioStreams(
+        public int CompareAudioStreams(
             TSAudioStream x, 
             TSAudioStream y)
         {
@@ -1067,7 +1067,7 @@ public static int CompareAudioStreams(
             }
         }
 
-        public static int CompareTextStreams(
+        public int CompareTextStreams(
             TSTextStream x,
             TSTextStream y)
         {
@@ -1123,7 +1123,7 @@ public static int CompareTextStreams(
             }
         }
 
-        private static int CompareGraphicsStreams(
+        private int CompareGraphicsStreams(
             TSGraphicsStream x,
             TSGraphicsStream y)
         {
@@ -1189,7 +1189,7 @@ private static int CompareGraphicsStreams(
             }
         }
 
-        private static int GetStreamTypeSortIndex(TSStreamType streamType)
+        private int GetStreamTypeSortIndex(TSStreamType streamType)
         {
             switch (streamType)
             {

diff --git a/BDInfo/TSStreamFile.cs b/BDInfo/TSStreamFile.cs
@@ -865,7 +865,7 @@ public void Scan(List<TSPlaylistFile> playlists, bool isFullScan)
                                                 k += streamInfoLength;
                                             }
                                         }
-                                        catch (Exception ex)
+                                        catch
                                         {
                                             // TODO
                                             //Console.WriteLine(ex.Message);

diff --git a/DvdLib/Ifo/ProgramChain.cs b/DvdLib/Ifo/ProgramChain.cs
@@ -15,8 +15,6 @@ public enum ProgramPlaybackMode
 
     public class ProgramChain
     {
-        private ushort _unknown1;
-
         private byte _programCount;
         public readonly List<Program> Programs;
 

diff --git a/Emby.Dlna/ContentDirectory/ContentDirectoryBrowser.cs b/Emby.Dlna/ContentDirectory/ContentDirectoryBrowser.cs
diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
@@ -45,7 +45,6 @@
     <Compile Include="ConnectionManager\ControlHandler.cs" />
     <Compile Include="ConnectionManager\ServiceActionListBuilder.cs" />
     <Compile Include="ContentDirectory\ContentDirectory.cs" />
-    <Compile Include="ContentDirectory\ContentDirectoryBrowser.cs" />
     <Compile Include="ContentDirectory\ContentDirectoryXmlBuilder.cs" />
     <Compile Include="ContentDirectory\ControlHandler.cs" />
     <Compile Include="ContentDirectory\ServiceActionListBuilder.cs" />
@@ -108,7 +107,6 @@
     <Compile Include="Profiles\XboxOneProfile.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server\DescriptionXmlBuilder.cs" />
-    <Compile Include="Server\UpnpDevice.cs" />
     <Compile Include="Service\BaseControlHandler.cs" />
     <Compile Include="Service\BaseService.cs" />
     <Compile Include="Service\ControlErrorHandler.cs" />

diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -169,8 +169,8 @@ private void LogMessage(string msg)
 
         private void StartPublishing(ISsdpCommunicationsServer communicationsServer)
         {
-            SsdpDevicePublisherBase.LogFunction = LogMessage;
             _Publisher = new SsdpDevicePublisher(communicationsServer, _timerFactory, _environmentInfo.OperatingSystemName, _environmentInfo.OperatingSystemVersion);
+            _Publisher.LogFunction = LogMessage;
         }
 
         private void StartDeviceDiscovery(ISsdpCommunicationsServer communicationsServer)

diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
@@ -492,7 +492,7 @@ private async void TimerCallback(object sender)
                     RestartTimerInactive();
                 }
             }
-            catch (HttpException ex)
+            catch (HttpException)
             {
                 if (_disposed)
                     return;

diff --git a/Emby.Dlna/PlayTo/TransportCommands.cs b/Emby.Dlna/PlayTo/TransportCommands.cs
@@ -91,7 +91,7 @@ private static Argument ArgumentFromXml(XElement container)
             };
         }
 
-        public static StateVariable FromXml(XElement container)
+        private static StateVariable FromXml(XElement container)
         {
             var allowedValues = new List<string>();
             var element = container.Descendants(uPnpNamespaces.svc + "allowedValueList")

diff --git a/Emby.Dlna/Server/UpnpDevice.cs b/Emby.Dlna/Server/UpnpDevice.cs
diff --git a/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs b/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs
@@ -2,14 +2,7 @@
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Drawing;
-using System;
-using System.IO;
-using System.Threading.Tasks;
-
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
-using System.Reflection;
-using MediaBrowser.Common.Progress;
 
 namespace Emby.Drawing.Skia
 {
@@ -28,7 +21,7 @@ public PlayedIndicatorDrawer(IApplicationPaths appPaths, IHttpClient iHttpClient
             _fileSystem = fileSystem;
         }
 
-        public async Task DrawPlayedIndicator(SKCanvas canvas, ImageSize imageSize)
+        public void DrawPlayedIndicator(SKCanvas canvas, ImageSize imageSize)
         {
             var x = imageSize.Width - OffsetFromTopRightCorner;
 
@@ -61,35 +54,5 @@ public async Task DrawPlayedIndicator(SKCanvas canvas, ImageSize imageSize)
                 canvas.DrawText(text, (float)x-20, OffsetFromTopRightCorner + 12, paint);
             }
         }
-
-        internal static async Task<string> DownloadFont(string name, string url, IApplicationPaths paths, IHttpClient httpClient, IFileSystem fileSystem)
-        {
-            var filePath = Path.Combine(paths.ProgramDataPath, "fonts", name);
-
-            if (fileSystem.FileExists(filePath))
-            {
-                return filePath;
-            }
-
-            var tempPath = await httpClient.GetTempFile(new HttpRequestOptions
-            {
-                Url = url,
-                Progress = new SimpleProgress<double>()
-
-            }).ConfigureAwait(false);
-
-            fileSystem.CreateDirectory(fileSystem.GetDirectoryName(filePath));
-
-            try
-            {
-                fileSystem.CopyFile(tempPath, filePath, false);
-            }
-            catch (IOException)
-            {
-
-            }
-
-            return tempPath;
-        }
     }
 }
diff --git a/Emby.Drawing.Skia/SkiaEncoder.cs b/Emby.Drawing.Skia/SkiaEncoder.cs
@@ -621,8 +621,7 @@ private void DrawIndicator(SKCanvas canvas, int imageWidth, int imageHeight, Ima
 
                 if (options.AddPlayedIndicator)
                 {
-                    var task = new PlayedIndicatorDrawer(_appPaths, _httpClientFactory(), _fileSystem).DrawPlayedIndicator(canvas, currentImageSize);
-                    Task.WaitAll(task);
+                    new PlayedIndicatorDrawer(_appPaths, _httpClientFactory(), _fileSystem).DrawPlayedIndicator(canvas, currentImageSize);
                 }
                 else if (options.UnplayedCount.HasValue)
                 {

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
@@ -169,7 +169,7 @@ public ImageFormat[] GetSupportedImageOutputFormats()
             return _imageEncoder.SupportedOutputFormats;
         }
 
-        private static readonly string[] TransparentImageTypes = new string[] { ".png", ".webp" };
+        private readonly string[] TransparentImageTypes = new string[] { ".png", ".webp" };
         public bool SupportsTransparency(string path)
         {
             return TransparentImageTypes.Contains(Path.GetExtension(path) ?? string.Empty);
@@ -358,21 +358,6 @@ private void CopyFile(string src, string destination)
             }
         }
 
-        //private static  int[][] OPERATIONS = new int[][] {
-        // TopLeft
-        //new int[] {  0, NONE},
-        // TopRight
-        //new int[] {  0, HORIZONTAL},
-        //new int[] {180, NONE},
-        // LeftTop
-        //new int[] {  0, VERTICAL},
-        //new int[] { 90, HORIZONTAL},
-        // RightTop
-        //new int[] { 90, NONE},
-        //new int[] {-90, HORIZONTAL},
-        //new int[] {-90, NONE},
-        //};
-
         private string GetMimeType(ImageFormat format, string path)
         {
             if (format == ImageFormat.Bmp)
-Original file line number
+Diff line change
@@ Expand Up @@
                                                     k += streamInfoLength;
                                                 }
                                             }
-                                            catch (Exception ex)
+                                            catch
                                             {
                                                 // TODO
                                                 //Console.WriteLine(ex.Message);
@@ Expand Down @@