alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-20 22:50:35 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy.

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 20:26:35 -05:00
parent 931c0ea455
commit fdafa59683
88 changed files with 1025 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs
View File

@@ -66,10 +66,10 @@ namespace MediaBrowser.Api.HttpHandlers
await Kernel.UserDataManager.OnPlaybackStopped(user, item, positionTicks, clientType, device).ConfigureAwait(false);
}
}
var data = item.GetUserData(user, true);
return DtoBuilder.GetDtoUserItemData(data);
return new DtoBuilder(null).GetDtoUserItemData(data);
}
/// <summary>

8
MediaBrowser.Api/LibraryService.cs
View File

@@ -128,7 +128,7 @@ namespace MediaBrowser.Api
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true));
var result = DtoBuilder.GetDtoBaseItem(item, fields.ToList()).Result;
var result = new DtoBuilder(Logger).GetDtoBaseItem(item, fields.ToList()).Result;
return ToOptimizedResult(result);
}
@@ -147,7 +147,7 @@ namespace MediaBrowser.Api
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true));
var result = DtoBuilder.GetDtoBaseItem(item, fields.ToList()).Result;
var result = new DtoBuilder(Logger).GetDtoBaseItem(item, fields.ToList()).Result;
return ToOptimizedResult(result);
}
@@ -166,7 +166,7 @@ namespace MediaBrowser.Api
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true));
var result = DtoBuilder.GetDtoBaseItem(item, fields.ToList()).Result;
var result = new DtoBuilder(Logger).GetDtoBaseItem(item, fields.ToList()).Result;
return ToOptimizedResult(result);
}
@@ -185,7 +185,7 @@ namespace MediaBrowser.Api
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true));
var result = DtoBuilder.GetDtoBaseItem(item, fields.ToList()).Result;
var result = new DtoBuilder(Logger).GetDtoBaseItem(item, fields.ToList()).Result;
return ToOptimizedResult(result);
}

4
MediaBrowser.Api/Streaming/BaseHlsPlaylistHandler.cs
View File

@@ -208,12 +208,12 @@ namespace MediaBrowser.Api.Streaming
{
try
{
Logger.Info("Deleting HLS file {0}", file);
//Logger.Info("Deleting HLS file {0}", file);
File.Delete(file);
}
catch (IOException ex)
{
Logger.ErrorException("Error deleting HLS file {0}", ex, file);
//Logger.ErrorException("Error deleting HLS file {0}", ex, file);
}
}
}

2
MediaBrowser.Api/Streaming/BaseProgressiveStreamingHandler.cs
View File

@@ -94,7 +94,7 @@ namespace MediaBrowser.Api.Streaming
}
catch (Exception ex)
{
Logger.ErrorException("Error streaming media", ex);
//Logger.ErrorException("Error streaming media", ex);
}
finally
{

14
MediaBrowser.Api/Streaming/BaseStreamingHandler.cs
View File

@@ -889,7 +889,7 @@ namespace MediaBrowser.Api.Streaming
Plugin.Instance.OnTranscodeBeginning(outputPath, TranscodingJobType, process);
Logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
//Logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
var logFilePath = Path.Combine(Kernel.ApplicationPaths.LogDirectoryPath, "ffmpeg-" + Guid.NewGuid() + ".txt");
@@ -904,7 +904,7 @@ namespace MediaBrowser.Api.Streaming
}
catch (Win32Exception ex)
{
Logger.ErrorException("Error starting ffmpeg", ex);
//Logger.ErrorException("Error starting ffmpeg", ex);
Plugin.Instance.OnTranscodeFailedToStart(outputPath, TranscodingJobType);
@@ -953,11 +953,11 @@ namespace MediaBrowser.Api.Streaming
try
{
exitCode = process.ExitCode;
Logger.Info("FFMpeg exited with code {0} for {1}", exitCode.Value, outputFilePath);
//Logger.Info("FFMpeg exited with code {0} for {1}", exitCode.Value, outputFilePath);
}
catch
{
Logger.Info("FFMpeg exited with an error for {0}", outputFilePath);
//Logger.Info("FFMpeg exited with an error for {0}", outputFilePath);
}
process.Dispose();
@@ -966,7 +966,7 @@ namespace MediaBrowser.Api.Streaming
if (!exitCode.HasValue || exitCode.Value != 0)
{
Logger.Info("Deleting partial stream file(s) {0}", outputFilePath);
//Logger.Info("Deleting partial stream file(s) {0}", outputFilePath);
try
{
@@ -974,12 +974,12 @@ namespace MediaBrowser.Api.Streaming
}
catch (IOException ex)
{
Logger.ErrorException("Error deleting partial stream file(s) {0}", ex, outputFilePath);
//Logger.ErrorException("Error deleting partial stream file(s) {0}", ex, outputFilePath);
}
}
else
{
Logger.Info("FFMpeg completed and exited normally for {0}", outputFilePath);
//Logger.Info("FFMpeg completed and exited normally for {0}", outputFilePath);
}
}

3
MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
View File

@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Logging;
using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic;
@@ -114,7 +115,7 @@ namespace MediaBrowser.Api.UserLibrary
return null;
}
var dto = await DtoBuilder.GetDtoBaseItem(item, user, fields).ConfigureAwait(false);
var dto = await new DtoBuilder(Logger).GetDtoBaseItem(item, user, fields).ConfigureAwait(false);
dto.ChildCount = stub.Item2();

4
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@@ -191,7 +191,9 @@ namespace MediaBrowser.Api.UserLibrary
var fields = GetItemFields(request).ToList();
var returnItems = await Task.WhenAll(pagedItems.Select(i => DtoBuilder.GetDtoBaseItem(i, user, fields))).ConfigureAwait(false);
var dtoBuilder = new DtoBuilder(Logger);
var returnItems = await Task.WhenAll(pagedItems.Select(i => dtoBuilder.GetDtoBaseItem(i, user, fields))).ConfigureAwait(false);
return new ItemsResult
{

12
MediaBrowser.Api/UserLibrary/UserLibraryService.cs
View File

@@ -268,7 +268,9 @@ namespace MediaBrowser.Api.UserLibrary
var movie = (Movie)item;
var items = movie.SpecialFeatures.Select(i => DtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList();
var dtoBuilder = new DtoBuilder(Logger);
var items = movie.SpecialFeatures.Select(i => dtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList();
return ToOptimizedResult(items);
}
@@ -284,7 +286,9 @@ namespace MediaBrowser.Api.UserLibrary
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
var items = item.LocalTrailers.Select(i => DtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList();
var dtoBuilder = new DtoBuilder(Logger);
var items = item.LocalTrailers.Select(i => dtoBuilder.GetDtoBaseItem(item, user, fields)).AsParallel().Select(t => t.Result).ToList();
return ToOptimizedResult(items);
}
@@ -305,7 +309,9 @@ namespace MediaBrowser.Api.UserLibrary
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
var result = DtoBuilder.GetDtoBaseItem(item, user, fields).Result;
var dtoBuilder = new DtoBuilder(Logger);
var result = dtoBuilder.GetDtoBaseItem(item, user, fields).Result;
return ToOptimizedResult(result);
}

8
MediaBrowser.Api/UserService.cs
View File

@@ -146,7 +146,9 @@ namespace MediaBrowser.Api
{
var kernel = (Kernel)Kernel;
var result = kernel.Users.OrderBy(u => u.Name).Select(DtoBuilder.GetDtoUser).ToList();
var dtoBuilder = new DtoBuilder(Logger);
var result = kernel.Users.OrderBy(u => u.Name).Select(dtoBuilder.GetDtoUser).ToList();
return ToOptimizedResult(result);
}
@@ -167,7 +169,7 @@ namespace MediaBrowser.Api
throw new ResourceNotFoundException("User not found");
}
var result = DtoBuilder.GetDtoUser(user);
var result = new DtoBuilder(Logger).GetDtoUser(user);
return ToOptimizedResult(result);
}
@@ -289,7 +291,7 @@ namespace MediaBrowser.Api
var newUser = kernel.UserManager.CreateUser(dtoUser.Name).Result;
var result = DtoBuilder.GetDtoUser(newUser);
var result = new DtoBuilder(Logger).GetDtoUser(newUser);
return ToOptimizedResult(result);
}