alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-02 13:58:29 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

make sure ._ osx files are properly ignored

Browse Source
This commit is contained in:
Luke Pulverenti
2015-11-04 18:49:06 -05:00
parent 60067b4c29
commit 6aa3313bc0
11 changed files with 85 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
View File

@@ -1235,6 +1235,7 @@ namespace MediaBrowser.Server.Implementations.Channels
{
BaseItem item;
bool isNew;
bool forceUpdate = false;
if (info.Type == ChannelItemType.Folder)
{
@@ -1265,6 +1266,7 @@ namespace MediaBrowser.Server.Implementations.Channels
item.ProviderIds = info.ProviderIds;
item.OfficialRating = info.OfficialRating;
item.DateCreated = info.DateCreated ?? DateTime.UtcNow;
item.Tags = info.Tags;
}
var channelItem = (IChannelItem)item;
@@ -1273,7 +1275,7 @@ namespace MediaBrowser.Server.Implementations.Channels
if (item.ParentId != internalChannelId)
{
isNew = true;
forceUpdate = true;
}
item.ParentId = internalChannelId;
@@ -1283,11 +1285,6 @@ namespace MediaBrowser.Server.Implementations.Channels
}
channelItem.ExternalId = info.Id;
if (isNew)
{
channelItem.Tags = info.Tags;
}
var channelMediaItem = item as IChannelMediaItem;
if (channelMediaItem != null)
@@ -1315,6 +1312,10 @@ namespace MediaBrowser.Server.Implementations.Channels
await _libraryManager.UpdatePeople(item, info.People ?? new List<PersonInfo>()).ConfigureAwait(false);
}
}
else if (forceUpdate)
{
await item.UpdateToRepository(ItemUpdateType.None, cancellationToken).ConfigureAwait(false);
}
return item;
}