alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 22:38:30 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

updated nuget

Browse Source
This commit is contained in:
Luke Pulverenti
2013-12-02 16:46:22 -05:00
parent cd279d98e0
commit 245e92c9cc
37 changed files with 180 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -129,17 +129,13 @@ namespace MediaBrowser.Server.Implementations.Dto
/// <param name="user">The user.</param>
private void AttachItemByNameCounts(BaseItemDto dto, IItemByName item, User user)
{
ItemByNameCounts counts;
if (user == null)
{
//counts = item.ItemCounts;
return;
}
if (!item.UserItemCounts.TryGetValue(user.Id, out counts))
{
counts = new ItemByNameCounts();
}
ItemByNameCounts counts = item.GetItemByNameCounts(user.Id) ?? new ItemByNameCounts();
dto.ChildCount = counts.TotalCount;

2
MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
View File

@@ -137,7 +137,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
if (userId.HasValue)
{
artist.UserItemCounts[userId.Value] = counts;
artist.SetItemByNameCounts(userId.Value, counts);
}
}

2
MediaBrowser.Server.Implementations/Library/Validators/GameGenresValidator.cs
View File

@@ -106,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
var itemCounts = CountHelpers.GetCounts(counts[libraryId]);
itemByName.UserItemCounts[libraryId] = itemCounts;
itemByName.SetItemByNameCounts(libraryId, itemCounts);
}
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);

2
MediaBrowser.Server.Implementations/Library/Validators/GenresValidator.cs
View File

@@ -107,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
var itemCounts = CountHelpers.GetCounts(counts[libraryId]);
itemByName.UserItemCounts[libraryId] = itemCounts;
itemByName.SetItemByNameCounts(libraryId, itemCounts);
}
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);

2
MediaBrowser.Server.Implementations/Library/Validators/MusicGenresValidator.cs
View File

@@ -107,7 +107,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
var itemCounts = CountHelpers.GetCounts(counts[libraryId]);
itemByName.UserItemCounts[libraryId] = itemCounts;
itemByName.SetItemByNameCounts(libraryId, itemCounts);
}
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);

2
MediaBrowser.Server.Implementations/Library/Validators/PeoplePostScanTask.cs
View File

@@ -94,7 +94,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
var itemCounts = CountHelpers.GetCounts(counts[libraryId]);
itemByName.UserItemCounts[libraryId] = itemCounts;
itemByName.SetItemByNameCounts(libraryId, itemCounts);
}
}
catch (Exception ex)

2
MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
View File

@@ -106,7 +106,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
{
var itemCounts = CountHelpers.GetCounts(counts[libraryId]);
itemByName.UserItemCounts[libraryId] = itemCounts;
itemByName.SetItemByNameCounts(libraryId, itemCounts);
}
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);

2
MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
View File

@@ -75,7 +75,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
// Dummy up the original url
var url = channel.ServiceName + channel.ChannelId;
await _providerManager.SaveImage(channel, response.Content, response.ContentType, ImageType.Primary, null, url, cancellationToken).ConfigureAwait(false);
await _providerManager.SaveImage(channel, response.Stream, response.MimeType, ImageType.Primary, null, url, cancellationToken).ConfigureAwait(false);
}
}

25
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -209,7 +209,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
OriginalAirDate = program.OriginalAirDate,
Audio = program.Audio,
CommunityRating = program.CommunityRating,
AspectRatio = program.AspectRatio
AspectRatio = program.AspectRatio,
IsRepeat = program.IsRepeat,
EpisodeTitle = program.EpisodeTitle
};
}
@@ -297,21 +299,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var returnArray = programs.ToArray();
var recordings = await GetRecordings(new RecordingQuery
{
}, cancellationToken).ConfigureAwait(false);
foreach (var program in returnArray)
{
var recording = recordings.Items
.FirstOrDefault(i => string.Equals(i.ProgramId, program.Id));
program.RecordingId = recording == null ? null : recording.Id;
program.RecordingStatus = recording == null ? (RecordingStatus?)null : recording.Status;
}
return new QueryResult<ProgramInfoDto>
{
Items = returnArray,
@@ -400,7 +387,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
Id = id,
ExternalId = info.Id,
ChannelId = GetInternalChannelId(service.Name, info.ChannelId, info.ChannelName).ToString("N"),
Status = info.Status
Status = info.Status,
Path = info.Path,
Genres = info.Genres,
IsRepeat = info.IsRepeat,
EpisodeTitle = info.EpisodeTitle
};
if (!string.IsNullOrEmpty(info.ProgramId))

2
MediaBrowser.Server.Implementations/Sorting/AlbumCountComparer.cs
View File

@@ -48,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
if (itemByName != null)
{
var counts = itemByName.GetItemByNameCounts(User);
var counts = itemByName.GetItemByNameCounts(User.Id);
if (counts != null)
{

2
MediaBrowser.Server.Implementations/Sorting/EpisodeCountComparer.cs
View File

@@ -48,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
if (itemByName != null)
{
var counts = itemByName.GetItemByNameCounts(User);
var counts = itemByName.GetItemByNameCounts(User.Id);
if (counts != null)
{

2
MediaBrowser.Server.Implementations/Sorting/MovieCountComparer.cs
View File

@@ -48,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
if (itemByName != null)
{
var counts = itemByName.GetItemByNameCounts(User);
var counts = itemByName.GetItemByNameCounts(User.Id);
if (counts != null)
{

2
MediaBrowser.Server.Implementations/Sorting/MusicVideoCountComparer.cs
View File

@@ -48,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
if (itemByName != null)
{
var counts = itemByName.GetItemByNameCounts(User);
var counts = itemByName.GetItemByNameCounts(User.Id);
if (counts != null)
{

2
MediaBrowser.Server.Implementations/Sorting/SeriesCountComparer.cs
View File

@@ -48,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
if (itemByName != null)
{
var counts = itemByName.GetItemByNameCounts(User);
var counts = itemByName.GetItemByNameCounts(User.Id);
if (counts != null)
{

2
MediaBrowser.Server.Implementations/Sorting/SongCountComparer.cs
View File

@@ -48,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
if (itemByName != null)
{
var counts = itemByName.GetItemByNameCounts(User);
var counts = itemByName.GetItemByNameCounts(User.Id);
if (counts != null)
{

2
MediaBrowser.Server.Implementations/Sorting/TrailerCountComparer.cs
View File

@@ -48,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
if (itemByName != null)
{
var counts = itemByName.GetItemByNameCounts(User);
var counts = itemByName.GetItemByNameCounts(User.Id);
if (counts != null)
{