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

update startup tests

This commit is contained in:
Luke Pulverenti 2016-06-30 21:06:18 -04:00
parent 106087b685
commit 580a68d19c
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
View File

@ -68,7 +68,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
private Stream OpenFile(string path) private Stream OpenFile(string path)
{ {
_logger.Info("Deserializing file {0}", path); _logger.Debug("Deserializing file {0}", path);
return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 131072); return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 131072);
} }

4
MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
View File

@ -80,7 +80,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
/// <param name="file">The file.</param> /// <param name="file">The file.</param>
public void SerializeToFile(object obj, string file) public void SerializeToFile(object obj, string file)
{ {
_logger.Info("Serializing to file {0}", file); _logger.Debug("Serializing to file {0}", file);
using (var stream = new FileStream(file, FileMode.Create)) using (var stream = new FileStream(file, FileMode.Create))
{ {
SerializeToStream(obj, stream); SerializeToStream(obj, stream);
@ -95,7 +95,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
/// <returns>System.Object.</returns> /// <returns>System.Object.</returns>
public object DeserializeFromFile(Type type, string file) public object DeserializeFromFile(Type type, string file)
{ {
_logger.Info("Deserializing file {0}", file); _logger.Debug("Deserializing file {0}", file);
using (var stream = _fileSystem.OpenRead(file)) using (var stream = _fileSystem.OpenRead(file))
{ {
return DeserializeFromStream(type, stream); return DeserializeFromStream(type, stream);

12
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@ -78,17 +78,19 @@ namespace MediaBrowser.MediaEncoding.Encoder
"libx265", "libx265",
"mpeg4", "mpeg4",
"msmpeg4", "msmpeg4",
//"libvpx", "libvpx",
//"libvpx-vp9", "libvpx-vp9",
"aac", "aac",
"libmp3lame", "libmp3lame",
"libopus", "libopus",
//"libvorbis", "libvorbis",
"srt", "srt",
"h264_nvenc", "h264_nvenc",
"h264_qsv" "h264_qsv"
}; };
output = output ?? string.Empty;
foreach (var codec in required) foreach (var codec in required)
{ {
var srch = " " + codec + " "; var srch = " " + codec + " ";
@ -116,7 +118,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
ErrorDialog = false, ErrorDialog = false,
RedirectStandardOutput = true, RedirectStandardOutput = true,
RedirectStandardError = true //RedirectStandardError = true
} }
}; };
@ -126,7 +128,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
try try
{ {
process.BeginErrorReadLine(); //process.BeginErrorReadLine();
return process.StandardOutput.ReadToEnd(); return process.StandardOutput.ReadToEnd();
} }