michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added recording logging

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-04 23:43:54 -04:00
parent feed1c0b7d
commit 7caedd1aee
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Api/Library/LibraryService.cs
View File

@ -262,7 +262,7 @@ namespace MediaBrowser.Api.Library
/// Initializes a new instance of the <see cref="LibraryService" /> class. /// Initializes a new instance of the <see cref="LibraryService" /> class.
/// </summary> /// </summary>
public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager, public LibraryService(IItemRepository itemRepo, ILibraryManager libraryManager, IUserManager userManager,
IDtoService dtoService, IUserDataManager userDataManager, IAuthorizationContext authContext, IActivityManager activityManager, ILocalizationManager localization) IDtoService dtoService, IUserDataManager userDataManager, IAuthorizationContext authContext, IActivityManager activityManager, ILocalizationManager localization, ILiveTvManager liveTv)
{ {
_itemRepo = itemRepo; _itemRepo = itemRepo;
_libraryManager = libraryManager; _libraryManager = libraryManager;
@ -272,6 +272,7 @@ namespace MediaBrowser.Api.Library
_authContext = authContext; _authContext = authContext;
_activityManager = activityManager; _activityManager = activityManager;
_localization = localization; _localization = localization;
_liveTv = liveTv;
} }
public object Get(GetMediaFolders request) public object Get(GetMediaFolders request)

2
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -1217,7 +1217,7 @@ namespace MediaBrowser.Server.Implementations.Library
{ {
var result = ItemRepository.GetItemIdsList(query); var result = ItemRepository.GetItemIdsList(query);
var items = result.Select(GetItemById).ToArray(); var items = result.Select(GetItemById).Where(i => i != null).ToArray();
return new QueryResult<BaseItem> return new QueryResult<BaseItem>
{ {

5
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -541,13 +541,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
} }
recording.Status = RecordingStatus.Completed; recording.Status = RecordingStatus.Completed;
_logger.Info("Recording completed");
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
_logger.Info("Recording cancelled");
recording.Status = RecordingStatus.Completed; recording.Status = RecordingStatus.Completed;
} }
catch catch (Exception ex)
{ {
_logger.ErrorException("Error recording", ex);
recording.Status = RecordingStatus.Error; recording.Status = RecordingStatus.Error;
} }