starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-30 04:34:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

update components

Browse Source
This commit is contained in:
Luke Pulverenti
2015-07-13 17:26:11 -04:00
parent 365a992736
commit b1be4939df
11 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,7 +345,7 @@ namespace MediaBrowser.Server.Implementations.Library
try
{
await UpdateItem(season, ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
await UpdateItem(season, ItemUpdateType.MetadataDownload, cancellationToken).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -2071,10 +2071,17 @@ namespace MediaBrowser.Server.Implementations.Library
public List<PersonInfo> GetPeople(BaseItem item)
{
return item.People ?? GetPeople(new InternalPeopleQuery
var people = GetPeople(new InternalPeopleQuery
{
ItemId = item.Id
});
if (people.Count > 0)
{
return people;
}
return item.People ?? new List<PersonInfo>();
}
public List<Person> GetPeopleItems(InternalPeopleQuery query)
@@ -2106,15 +2113,9 @@ namespace MediaBrowser.Server.Implementations.Library
.ToList();
}
public async Task UpdatePeople(BaseItem item, List<PersonInfo> people)
public Task UpdatePeople(BaseItem item, List<PersonInfo> people)
{
await ItemRepository.UpdatePeople(item.Id, people).ConfigureAwait(false);
if (item.People != null)
{
item.People = null;
await item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
}
return ItemRepository.UpdatePeople(item.Id, people);
}
}
}

3
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@@ -1466,5 +1466,6 @@
"TabHomeScreen": "Home Screen",
"HeaderDisplay": "Display",
"HeaderNavigation": "Navigation",
"LegendTheseSettingsShared": "These settings are shared on all devices"
"LegendTheseSettingsShared": "These settings are shared on all devices",
"OptionEnableAutomaticServerUpdates": "Enable automatic server updates"
}

14
MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs
View File

@@ -209,6 +209,13 @@ namespace MediaBrowser.Server.Implementations.Sync
IsRequired = false
},
new ProfileCondition
{
Condition = ProfileConditionType.LessThanEqual,
Property = ProfileConditionValue.AudioBitrate,
Value = "320000",
IsRequired = true
},
new ProfileCondition
{
Condition = ProfileConditionType.Equals,
Property = ProfileConditionValue.IsSecondaryAudio,
@@ -231,6 +238,13 @@ namespace MediaBrowser.Server.Implementations.Sync
IsRequired = true
},
new ProfileCondition
{
Condition = ProfileConditionType.LessThanEqual,
Property = ProfileConditionValue.AudioBitrate,
Value = "320000",
IsRequired = true
},
new ProfileCondition
{
Condition = ProfileConditionType.Equals,
Property = ProfileConditionValue.IsSecondaryAudio,