pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Visual Studio Reformat: MediaBrowser.MediaEncoding

This commit is contained in:
Erwin de Haan 2019-01-13 20:26:04 +01:00
parent 22879a603e
commit f2e50f50bd
15 changed files with 80 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
View File

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

8
MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
View File

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

6
MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
View File

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

25
MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
View File

@ -1,23 +1,20 @@
using MediaBrowser.Common.Configuration; using System;
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.Entities;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
using MediaBrowser.Model.MediaInfo;
using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; 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.Diagnostics; using MediaBrowser.Model.Diagnostics;
using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.MediaEncoding.Encoder namespace MediaBrowser.MediaEncoding.Encoder
{ {

2
MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
View File

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

18
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
View File

@ -1,18 +1,16 @@
using MediaBrowser.Common.Configuration; using System;
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.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; 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.Entities;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.MediaEncoding.Encoder namespace MediaBrowser.MediaEncoding.Encoder
{ {

4
MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
View File

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

27
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -1,15 +1,3 @@
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Session;
using MediaBrowser.MediaEncoding.Probing;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Serialization;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
@ -17,12 +5,23 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Library;
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.Diagnostics;
using MediaBrowser.Model.System; using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Serialization;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace MediaBrowser.MediaEncoding.Encoder namespace MediaBrowser.MediaEncoding.Encoder

9
MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
View File

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

4
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

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

17
MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
View File

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

6
MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
View File

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

13
MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
View File

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

8
MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
View File

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

2
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

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