Browse Source

Visual Studio Reformat: MediaBrowser.MediaEncoding

Erwin de Haan 6 years ago
parent
commit
f2e50f50bd

+ 10 - 10
MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs

@@ -1,10 +1,10 @@
-using BDInfo;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.MediaInfo;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using BDInfo;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Text;
 
 namespace MediaBrowser.MediaEncoding.BdInfo
@@ -44,7 +44,7 @@ namespace MediaBrowser.MediaEncoding.BdInfo
 
             var outputStream = new BlurayDiscInfo
             {
-                MediaStreams = new MediaStream[] {}
+                MediaStreams = new MediaStream[] { }
             };
 
             if (playlist == null)
@@ -190,12 +190,12 @@ namespace MediaBrowser.MediaEncoding.BdInfo
         private void AddSubtitleStream(List<MediaStream> streams, TSGraphicsStream textStream)
         {
             streams.Add(new MediaStream
-                {
-                    Language = textStream.LanguageCode,
-                    Codec = textStream.CodecShortName,
-                    Type = MediaStreamType.Subtitle,
-                    Index = streams.Count
-                });
+            {
+                Language = textStream.LanguageCode,
+                Codec = textStream.CodecShortName,
+                Type = MediaStreamType.Subtitle,
+                Index = streams.Count
+            });
         }
     }
 }

+ 3 - 5
MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs

@@ -1,9 +1,7 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.MediaEncoding.Configuration

+ 3 - 3
MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs

@@ -1,11 +1,11 @@
-using MediaBrowser.Controller.Configuration;
+using System;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
-using System;
-using MediaBrowser.Model.Diagnostics;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {

+ 9 - 12
MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs

@@ -1,23 +1,20 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.MediaInfo;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Diagnostics;
-using MediaBrowser.Model.Dlna;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {

+ 1 - 1
MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs

@@ -20,7 +20,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         public EncodingJobOptions Options
         {
-            get { return (EncodingJobOptions) BaseRequest; }
+            get { return (EncodingJobOptions)BaseRequest; }
             set { BaseRequest = value; }
         }
 

+ 7 - 9
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs

@@ -1,18 +1,16 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.MediaInfo;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {

+ 2 - 2
MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Model.MediaInfo;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
+using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {

+ 12 - 13
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -1,3 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
@@ -5,24 +15,13 @@ using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.MediaEncoding.Probing;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Diagnostics;
-using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Encoder

+ 3 - 6
MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs

@@ -1,14 +1,11 @@
-using MediaBrowser.Controller.Configuration;
+using System;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
-using System;
-using System.IO;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Diagnostics;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {

+ 2 - 2
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs

@@ -955,7 +955,7 @@ namespace MediaBrowser.MediaEncoding.Probing
                 var artist = FFProbeHelpers.GetDictionaryValue(tags, "artist");
                 if (string.IsNullOrWhiteSpace(artist))
                 {
-                    audio.Artists = new string[] {};
+                    audio.Artists = new string[] { };
                 }
                 else
                 {
@@ -977,7 +977,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (string.IsNullOrWhiteSpace(albumArtist))
             {
-                audio.AlbumArtists = new string[] {};
+                audio.AlbumArtists = new string[] { };
             }
             else
             {

+ 9 - 8
MediaBrowser.MediaEncoding/Subtitles/AssParser.cs

@@ -1,11 +1,11 @@
-using MediaBrowser.Model.Extensions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
@@ -23,7 +23,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 string line;
                 while (reader.ReadLine() != "[Events]")
-                {}
+                { }
                 var headers = ParseFieldHeaders(reader.ReadLine());
 
                 while ((line = reader.ReadLine()) != null)
@@ -34,9 +34,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     {
                         continue;
                     }
-                    if(line.StartsWith("["))
+                    if (line.StartsWith("["))
                         break;
-                    if(string.IsNullOrEmpty(line))
+                    if (string.IsNullOrEmpty(line))
                         continue;
                     var subEvent = new SubtitleTrackEvent { Id = eventIndex.ToString(_usCulture) };
                     eventIndex++;
@@ -63,11 +63,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             TimeSpan span;
             return TimeSpan.TryParseExact(time, @"h\:mm\:ss\.ff", _usCulture, out span)
-                ? span.Ticks: 0;
+                ? span.Ticks : 0;
         }
 
-        private Dictionary<string,int> ParseFieldHeaders(string line) {
-            var fields = line.Substring(8).Split(',').Select(x=>x.Trim()).ToList();
+        private Dictionary<string, int> ParseFieldHeaders(string line)
+        {
+            var fields = line.Substring(8).Split(',').Select(x => x.Trim()).ToList();
 
             var result = new Dictionary<string, int> {
                                                          {"Start", fields.IndexOf("Start")},

+ 3 - 3
MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
-using System.IO;
+using System.IO;
 using System.Text;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {

+ 7 - 6
MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs

@@ -1,12 +1,12 @@
-using MediaBrowser.Model.Extensions;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -25,7 +25,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             var trackInfo = new SubtitleTrackInfo();
             List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
-            using ( var reader = new StreamReader(stream))
+            using (var reader = new StreamReader(stream))
             {
                 string line;
                 while ((line = reader.ReadLine()) != null)
@@ -36,7 +36,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     {
                         continue;
                     }
-                    var subEvent = new SubtitleTrackEvent {Id = line};
+                    var subEvent = new SubtitleTrackEvent { Id = line };
                     line = reader.ReadLine();
 
                     if (string.IsNullOrWhiteSpace(line))
@@ -81,7 +81,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return trackInfo;
         }
 
-        long GetTicks(string time) {
+        long GetTicks(string time)
+        {
             TimeSpan span;
             return TimeSpan.TryParseExact(time, @"hh\:mm\:ss\.fff", _usCulture, out span)
                 ? span.Ticks

+ 4 - 4
MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs

@@ -1,10 +1,10 @@
-using MediaBrowser.Model.Extensions;
-using System;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
-using System.Collections.Generic;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -132,7 +132,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 }
 
                 //if (header.Length > 0)
-                    //subtitle.Header = header.ToString();
+                //subtitle.Header = header.ToString();
 
                 //subtitle.Renumber(1);
             }

+ 1 - 1
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

@@ -12,10 +12,10 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Text;