Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 13:10:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1728 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2016-05-11 10:41:30 -04:00
parent 237fc24100 3118196ac6
commit e53b89063f
21 changed files with 408 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Api/TvShowsService.cs
View file

@ -429,7 +429,7 @@ namespace MediaBrowser.Api
if (request.IsMissing.HasValue)
{
var val = request.IsMissing.Value;
items = items.Where(i => i.IsMissingSeason == val);
items = items.Where(i => (i.IsMissingSeason ?? false) == val);
}
if (request.IsVirtualUnaired.HasValue)

6
MediaBrowser.Controller/Entities/BaseItem.cs
View file

@ -149,6 +149,12 @@ namespace MediaBrowser.Controller.Entities
}
}
[IgnoreDataMember]
public bool IsUnaired
{
get { return PremiereDate.HasValue && PremiereDate.Value.ToLocalTime().Date >= DateTime.Now.Date; }
}
public string OriginalTitle { get; set; }
/// <summary>

3
MediaBrowser.Controller/Entities/Folder.cs
View file

@ -1316,7 +1316,8 @@ namespace MediaBrowser.Controller.Entities
{
var folder = (Folder)child;
folder.AddChildrenToList(result, includeLinkedChildren, true, filter);
// We can only support includeLinkedChildren for the first folder, or we might end up stuck in a loop of linked items
folder.AddChildrenToList(result, false, true, filter);
}
}

6
MediaBrowser.Controller/Entities/TV/Episode.cs
View file

@ -210,12 +210,6 @@ namespace MediaBrowser.Controller.Entities.TV
}
}
[IgnoreDataMember]
public bool IsUnaired
{
get { return PremiereDate.HasValue && PremiereDate.Value.ToLocalTime().Date >= DateTime.Now.Date; }
}
[IgnoreDataMember]
public bool IsVirtualUnaired
{

33
MediaBrowser.Controller/Entities/TV/Season.cs
View file

@ -54,8 +54,8 @@ namespace MediaBrowser.Controller.Entities.TV
// Genre, Rating and Stuido will all be the same
protected override IEnumerable<string> GetIndexByOptions()
{
return new List<string> {
{"None"},
return new List<string> {
{"None"},
{"Performer"},
{"Director"},
{"Year"},
@ -128,22 +128,23 @@ namespace MediaBrowser.Controller.Entities.TV
return IndexNumber != null ? IndexNumber.Value.ToString("0000") : Name;
}
[IgnoreDataMember]
public bool IsMissingSeason
public override bool RequiresRefresh()
{
get { return LocationType == LocationType.Virtual && GetEpisodes().All(i => i.IsMissingEpisode); }
}
var result = base.RequiresRefresh();
private bool GetIsUnaired()
{
return GetEpisodes().All(i => i.IsUnaired);
if (!result)
{
if (!IsMissingSeason.HasValue)
{
return true;
}
}
return result;
}
[IgnoreDataMember]
public bool IsUnaired
{
get { return GetIsUnaired(); }
}
public bool? IsMissingSeason { get; set; }
[IgnoreDataMember]
public bool IsVirtualUnaired
@ -154,7 +155,7 @@ namespace MediaBrowser.Controller.Entities.TV
[IgnoreDataMember]
public bool IsMissingOrVirtualUnaired
{
get { return LocationType == LocationType.Virtual && GetEpisodes().All(i => i.IsVirtualUnaired || i.IsMissingEpisode); }
get { return (IsMissingSeason ?? false) || (LocationType == LocationType.Virtual && IsUnaired); }
}
[IgnoreDataMember]
@ -223,7 +224,7 @@ namespace MediaBrowser.Controller.Entities.TV
episodes = list.DistinctBy(i => i.Id);
}
if (!includeMissingEpisodes)
{
episodes = episodes.Where(i => !i.IsMissingEpisode);
@ -238,7 +239,7 @@ namespace MediaBrowser.Controller.Entities.TV
.Cast<Episode>();
}
private IEnumerable<Episode> GetEpisodes()
public IEnumerable<Episode> GetEpisodes()
{
var episodes = GetRecursiveChildren().OfType<Episode>();
var series = Series;

70
MediaBrowser.Controller/Entities/TV/Series.cs
View file

@ -201,23 +201,30 @@ namespace MediaBrowser.Controller.Entities.TV
public IEnumerable<Season> GetSeasons(User user, bool includeMissingSeasons, bool includeVirtualUnaired)
{
var seriesIds = LibraryManager.GetItemIds(new InternalItemsQuery(user)
{
PresentationUniqueKey = PresentationUniqueKey,
IncludeItemTypes = new[] { typeof(Series).Name }
});
IEnumerable<Season> seasons;
if (seriesIds.Count > 1)
if (EnablePooling())
{
seasons = LibraryManager.GetItemList(new InternalItemsQuery(user)
var seriesIds = LibraryManager.GetItemIds(new InternalItemsQuery(user)
{
AncestorIds = seriesIds.Select(i => i.ToString("N")).ToArray(),
IncludeItemTypes = new[] { typeof(Season).Name },
SortBy = new[] { ItemSortBy.SortName }
PresentationUniqueKey = PresentationUniqueKey,
IncludeItemTypes = new[] { typeof(Series).Name }
});
}).Cast<Season>();
if (seriesIds.Count > 1)
{
seasons = LibraryManager.GetItemList(new InternalItemsQuery(user)
{
AncestorIds = seriesIds.Select(i => i.ToString("N")).ToArray(),
IncludeItemTypes = new[] { typeof(Season).Name },
SortBy = new[] { ItemSortBy.SortName }
}).Cast<Season>();
}
else
{
seasons = LibraryManager.Sort(base.GetChildren(user, true), user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).OfType<Season>();
}
}
else
{
@ -232,7 +239,7 @@ namespace MediaBrowser.Controller.Entities.TV
{
if (!includeMissingSeasons)
{
seasons = seasons.Where(i => !i.IsMissingSeason);
seasons = seasons.Where(i => !(i.IsMissingSeason ?? false));
}
if (!includeVirtualUnaired)
{
@ -338,25 +345,38 @@ namespace MediaBrowser.Controller.Entities.TV
return GetEpisodes(user, seasonNumber, config.DisplayMissingEpisodes, config.DisplayUnairedEpisodes);
}
private bool EnablePooling()
{
return false;
}
public IEnumerable<Episode> GetEpisodes(User user, int seasonNumber, bool includeMissingEpisodes, bool includeVirtualUnairedEpisodes)
{
var seriesIds = LibraryManager.GetItemIds(new InternalItemsQuery(user)
{
PresentationUniqueKey = PresentationUniqueKey,
IncludeItemTypes = new[] { typeof(Series).Name }
});
IEnumerable<Episode> episodes;
if (seriesIds.Count > 1)
if (EnablePooling())
{
episodes = LibraryManager.GetItemList(new InternalItemsQuery(user)
var seriesIds = LibraryManager.GetItemIds(new InternalItemsQuery(user)
{
AncestorIds = seriesIds.Select(i => i.ToString("N")).ToArray(),
IncludeItemTypes = new[] { typeof(Episode).Name },
SortBy = new[] { ItemSortBy.SortName }
PresentationUniqueKey = PresentationUniqueKey,
IncludeItemTypes = new[] { typeof(Series).Name }
});
}).Cast<Episode>();
if (seriesIds.Count > 1)
{
episodes = LibraryManager.GetItemList(new InternalItemsQuery(user)
{
AncestorIds = seriesIds.Select(i => i.ToString("N")).ToArray(),
IncludeItemTypes = new[] { typeof(Episode).Name },
SortBy = new[] { ItemSortBy.SortName }
}).Cast<Episode>();
}
else
{
episodes = GetRecursiveChildren(user, i => i is Episode)
.Cast<Episode>();
}
}
else
{

2
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View file

@ -1077,7 +1077,7 @@ namespace MediaBrowser.Controller.Entities
var e = i as Season;
if (e != null)
{
return e.IsMissingSeason == val;
return (e.IsMissingSeason ?? false) == val;
}
return true;
});

16
MediaBrowser.Controller/Library/IUserDataManager.cs
View file

@ -29,22 +29,6 @@ namespace MediaBrowser.Controller.Library
/// <returns>Task.</returns>
Task SaveUserData(Guid userId, IHasUserData item, UserItemData userData, UserDataSaveReason reason, CancellationToken cancellationToken);
/// <summary>
/// Gets the user data.
/// </summary>
/// <param name="userId">The user id.</param>
/// <param name="key">The key.</param>
/// <returns>Task{UserItemData}.</returns>
UserItemData GetUserData(string userId, string key);
/// <summary>
/// Gets the user data.
/// </summary>
/// <param name="userId">The user id.</param>
/// <param name="key">The key.</param>
/// <returns>Task{UserItemData}.</returns>
UserItemData GetUserData(Guid userId, string key);
UserItemData GetUserData(IHasUserData user, IHasUserData item);
UserItemData GetUserData(string userId, IHasUserData item);

3
MediaBrowser.Controller/Playlists/Playlist.cs
View file

@ -142,7 +142,8 @@ namespace MediaBrowser.Controller.Playlists
Recursive = true,
IsFolder = false,
SortBy = new[] { ItemSortBy.SortName },
MediaTypes = new[] { mediaType }
MediaTypes = new[] { mediaType },
EnableTotalRecordCount = false
};
var itemsResult = await folder.GetItems(query).ConfigureAwait(false);

94
MediaBrowser.Dlna/Profiles/BubbleUpnpProfile.cs
View file

@ -1,5 +1,5 @@
using System.Xml.Serialization;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dlna;
using System.Xml.Serialization;
namespace MediaBrowser.Dlna.Profiles
{
@ -10,8 +10,6 @@ namespace MediaBrowser.Dlna.Profiles
{
Name = "BubbleUPnp";
TimelineOffsetSeconds = 5;
Identification = new DeviceIdentification
{
ModelName = "BubbleUPnp",
@ -27,16 +25,18 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile
{
Container = "mp3",
Type = DlnaProfileType.Audio,
AudioCodec = "mp3"
AudioCodec = "mp3",
Type = DlnaProfileType.Audio
},
new TranscodingProfile
{
Container = "ts",
Type = DlnaProfileType.Video,
VideoCodec = "h264",
AudioCodec = "aac"
AudioCodec = "aac",
VideoCodec = "h264"
},
new TranscodingProfile
{
Container = "jpeg",
@ -48,21 +48,20 @@ namespace MediaBrowser.Dlna.Profiles
{
new DirectPlayProfile
{
Container = "avi,mpeg,mkv,ts,mp4,mov,m4v,asf,webm,ogg,ogv,iso",
Container = "",
Type = DlnaProfileType.Video
},
new DirectPlayProfile
{
Container = "mp3,flac,asf,off,oga,aac",
Container = "",
Type = DlnaProfileType.Audio
},
new DirectPlayProfile
{
Container = "",
Type = DlnaProfileType.Photo,
Container = "jpeg,png,gif,bmp,tiff"
}
};
@ -71,6 +70,77 @@ namespace MediaBrowser.Dlna.Profiles
ContainerProfiles = new ContainerProfile[] { };
CodecProfiles = new CodecProfile[] { };
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ass",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ssa",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "smi",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "dvdsub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgs",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgssub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
}
};
}
}
}

93
MediaBrowser.Dlna/Profiles/VlcProfile.cs
View file

@ -1,5 +1,5 @@
using System.Xml.Serialization;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dlna;
using System.Xml.Serialization;
namespace MediaBrowser.Dlna.Profiles
{
@ -10,6 +10,7 @@ namespace MediaBrowser.Dlna.Profiles
{
Name = "Vlc";
TimelineOffsetSeconds = 5;
Identification = new DeviceIdentification
@ -27,16 +28,18 @@ namespace MediaBrowser.Dlna.Profiles
new TranscodingProfile
{
Container = "mp3",
Type = DlnaProfileType.Audio,
AudioCodec = "mp3"
AudioCodec = "mp3",
Type = DlnaProfileType.Audio
},
new TranscodingProfile
{
Container = "ts",
Type = DlnaProfileType.Video,
VideoCodec = "h264",
AudioCodec = "aac"
AudioCodec = "aac",
VideoCodec = "h264"
},
new TranscodingProfile
{
Container = "jpeg",
@ -48,21 +51,20 @@ namespace MediaBrowser.Dlna.Profiles
{
new DirectPlayProfile
{
Container = "avi,mpeg,mkv,ts,mp4,mov,m4v,asf,webm,ogg,ogv,iso",
Container = "",
Type = DlnaProfileType.Video
},
new DirectPlayProfile
{
Container = "mp3,flac,asf,off,oga,aac",
Container = "",
Type = DlnaProfileType.Audio
},
new DirectPlayProfile
{
Container = "",
Type = DlnaProfileType.Photo,
Container = "jpeg,png,gif,bmp,tiff"
}
};
@ -71,6 +73,77 @@ namespace MediaBrowser.Dlna.Profiles
ContainerProfiles = new ContainerProfile[] { };
CodecProfiles = new CodecProfile[] { };
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.External,
},
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ass",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "ssa",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "smi",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "dvdsub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgs",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "pgssub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
},
new SubtitleProfile
{
Format = "sub",
Method = SubtitleDeliveryMethod.Embed,
DidlMode = "",
}
};
}
}
}

21
MediaBrowser.Dlna/Profiles/Xml/BubbleUPnp.xml
View file

File diff suppressed because one or more lines are too long

19
MediaBrowser.Dlna/Profiles/Xml/Vlc.xml
View file

@ -35,9 +35,9 @@
<IgnoreTranscodeByteRangeRequests>false</IgnoreTranscodeByteRangeRequests>
<XmlRootAttributes />
<DirectPlayProfiles>
<DirectPlayProfile container="avi,mpeg,mkv,ts,mp4,mov,m4v,asf,webm,ogg,ogv,iso" type="Video" />
<DirectPlayProfile container="mp3,flac,asf,off,oga,aac" type="Audio" />
<DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
<DirectPlayProfile container="" type="Video" />
<DirectPlayProfile container="" type="Audio" />
<DirectPlayProfile container="" type="Photo" />
</DirectPlayProfiles>
<TranscodingProfiles>
<TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" forceLiveStream="false" />
@ -47,5 +47,16 @@
<ContainerProfiles />
<CodecProfiles />
<ResponseProfiles />
<SubtitleProfiles />
<SubtitleProfiles>
<SubtitleProfile format="srt" method="External" />
<SubtitleProfile format="sub" method="External" />
<SubtitleProfile format="srt" method="Embed" didlMode="" />
<SubtitleProfile format="ass" method="Embed" didlMode="" />
<SubtitleProfile format="ssa" method="Embed" didlMode="" />
<SubtitleProfile format="smi" method="Embed" didlMode="" />
<SubtitleProfile format="dvdsub" method="Embed" didlMode="" />
<SubtitleProfile format="pgs" method="Embed" didlMode="" />
<SubtitleProfile format="pgssub" method="Embed" didlMode="" />
<SubtitleProfile format="sub" method="Embed" didlMode="" />
</SubtitleProfiles>
</Profile>

8
MediaBrowser.Providers/Music/ArtistMetadataService.cs
View file

@ -27,10 +27,12 @@ namespace MediaBrowser.Providers.Music
{
if (!item.IsLocked)
{
var itemFilter = item.GetItemFilter();
var taggedItems = item.IsAccessedByName ?
LibraryManager.RootFolder.GetRecursiveChildren(i => !i.IsFolder && itemFilter(i)).ToList() :
item.GetTaggedItems(new Controller.Entities.InternalItemsQuery()
{
Recursive = true,
IsFolder = false
}) :
item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder).ToList();
if (!item.LockedFields.Contains(MetadataFields.Genres))

41
MediaBrowser.Providers/TV/SeasonMetadataService.cs
View file

@ -7,6 +7,7 @@ using MediaBrowser.Model.Logging;
using MediaBrowser.Providers.Manager;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CommonIO;
@ -31,6 +32,13 @@ namespace MediaBrowser.Providers.TV
}
}
if (isFullRefresh || currentUpdateType > ItemUpdateType.None)
{
var episodes = item.GetEpisodes().ToList();
updateType |= SavePremiereDate(item, episodes);
updateType |= SaveIsMissing(item, episodes);
}
return updateType;
}
@ -38,5 +46,38 @@ namespace MediaBrowser.Providers.TV
{
ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
}
private ItemUpdateType SavePremiereDate(Season item, List<Episode> episodes)
{
var dates = episodes.Where(i => i.PremiereDate.HasValue).Select(i => i.PremiereDate.Value).ToList();
DateTime? premiereDate = null;
if (dates.Count > 0)
{
premiereDate = dates.Min();
}
if (item.PremiereDate != premiereDate)
{
item.PremiereDate = premiereDate;
return ItemUpdateType.MetadataEdit;
}
return ItemUpdateType.None;
}
private ItemUpdateType SaveIsMissing(Season item, List<Episode> episodes)
{
var isMissing = item.LocationType == LocationType.Virtual && episodes.All(i => i.IsMissingEpisode);
if (item.IsMissingSeason != isMissing)
{
item.IsMissingSeason = isMissing;
return ItemUpdateType.MetadataEdit;
}
return ItemUpdateType.None;
}
}
}

2
MediaBrowser.Providers/TV/TheTVDB/TvdbEpisodeProvider.cs
View file

@ -749,7 +749,7 @@ namespace MediaBrowser.Providers.TV
private void AddPeople<T>(MetadataResult<T> result, string val, string personType)
{
// Sometimes tvdb actors have leading spaces
foreach (var person in val.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries)
foreach (var person in val.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
.Where(i => !string.IsNullOrWhiteSpace(i))
.Select(str => new PersonInfo { Type = personType, Name = str.Trim() }))
{

18
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View file

@ -115,11 +115,10 @@ namespace MediaBrowser.Server.Implementations.Dto
{
if (options.Fields.Contains(ItemFields.ItemCounts))
{
var itemFilter = byName.GetItemFilter();
var libraryItems = user != null ?
user.RootFolder.GetRecursiveChildren(user, itemFilter) :
_libraryManager.RootFolder.GetRecursiveChildren(itemFilter);
var libraryItems = byName.GetTaggedItems(new InternalItemsQuery(user)
{
Recursive = true
});
SetItemByNameInfo(item, dto, libraryItems.ToList(), user);
}
@ -618,9 +617,12 @@ namespace MediaBrowser.Server.Implementations.Dto
{
if (!string.IsNullOrEmpty(item.Album))
{
var parentAlbum = _libraryManager.RootFolder
.GetRecursiveChildren(i => i is MusicAlbum && string.Equals(i.Name, item.Album, StringComparison.OrdinalIgnoreCase))
.FirstOrDefault();
var parentAlbum = _libraryManager.GetItemList(new InternalItemsQuery
{
IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
Name = item.Album
}).FirstOrDefault();
if (parentAlbum != null)
{

88
MediaBrowser.Server.Implementations/Library/UserDataManager.cs
View file

@ -140,6 +140,54 @@ namespace MediaBrowser.Server.Implementations.Library
return Repository.GetAllUserData(userId);
}
public UserItemData GetUserData(Guid userId, List<string> keys)
{
if (userId == Guid.Empty)
{
throw new ArgumentNullException("userId");
}
if (keys == null)
{
throw new ArgumentNullException("keys");
}
lock (_userData)
{
foreach (var key in keys)
{
var cacheKey = GetCacheKey(userId, key);
UserItemData value;
if (_userData.TryGetValue(cacheKey, out value))
{
return value;
}
value = Repository.GetUserData(userId, key);
if (value != null)
{
_userData[cacheKey] = value;
return value;
}
}
if (keys.Count > 0)
{
var key = keys[0];
var cacheKey = GetCacheKey(userId, key);
var userdata = new UserItemData
{
UserId = userId,
Key = key
};
_userData[cacheKey] = userdata;
return userdata;
}
return null;
}
}
/// <summary>
/// Gets the user data.
/// </summary>
@ -166,27 +214,22 @@ namespace MediaBrowser.Server.Implementations.Library
return value;
}
value = GetUserDataFromRepository(userId, key);
value = Repository.GetUserData(userId, key);
if (value == null)
{
value = new UserItemData
{
UserId = userId,
Key = key
};
}
_userData[cacheKey] = value;
return value;
}
}
private UserItemData GetUserDataFromRepository(Guid userId, string key)
{
var data = Repository.GetUserData(userId, key);
if (data == null)
{
data = new UserItemData
{
UserId = userId,
Key = key
};
}
return data;
}
/// <summary>
/// Gets the internal key.
/// </summary>
@ -200,22 +243,22 @@ namespace MediaBrowser.Server.Implementations.Library
public UserItemData GetUserData(IHasUserData user, IHasUserData item)
{
return GetUserData(user.Id, item.GetUserDataKeys().First());
return GetUserData(user.Id, item);
}
public UserItemData GetUserData(string userId, IHasUserData item)
{
return GetUserData(userId, item.GetUserDataKeys().First());
return GetUserData(new Guid(userId), item);
}
public UserItemData GetUserData(Guid userId, IHasUserData item)
{
return GetUserData(userId, item.GetUserDataKeys().First());
return GetUserData(userId, item.GetUserDataKeys());
}
public UserItemDataDto GetUserDataDto(IHasUserData item, User user)
{
var userData = GetUserData(user.Id, item.GetUserDataKeys().First());
var userData = GetUserData(user.Id, item);
var dto = GetUserItemDataDto(userData);
item.FillUserDataDtoValues(dto, userData, user);
@ -302,10 +345,5 @@ namespace MediaBrowser.Server.Implementations.Library
return playedToCompletion;
}
public UserItemData GetUserData(string userId, string key)
{
return GetUserData(new Guid(userId), key);
}
}
}

22
MediaBrowser.Server.Implementations/Library/Validators/StudiosValidator.cs
View file

@ -2,6 +2,7 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@ -34,20 +35,25 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
/// <returns>Task.</returns>
public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
{
var items = _libraryManager.GetItemList(new InternalItemsQuery
{
IncludeItemTypes = new[] { typeof(Studio).Name }
}).ToList();
var items = _libraryManager.RootFolder.GetRecursiveChildren(i => true)
.SelectMany(i => i.Studios)
.DistinctNames()
.ToList();
var numComplete = 0;
var count = items.Count;
foreach (var item in items)
var validIds = new List<Guid>();
foreach (var name in items)
{
try
{
await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);
var itemByName = _libraryManager.GetStudio(name);
validIds.Add(itemByName.Id);
await itemByName.RefreshMetadata(cancellationToken).ConfigureAwait(false);
}
catch (OperationCanceledException)
{
@ -56,7 +62,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
}
catch (Exception ex)
{
_logger.ErrorException("Error refreshing {0}", ex, item.Name);
_logger.ErrorException("Error refreshing {0}", ex, name);
}
numComplete++;

2
MediaBrowser.Server.Implementations/Library/Validators/YearsPostScanTask.cs
View file

@ -25,7 +25,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
var count = maxYear - yearNumber + 1;
var numComplete = 0;
while (yearNumber < DateTime.UtcNow.Year + 3)
while (yearNumber < maxYear)
{
try
{

6
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View file

@ -1870,9 +1870,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
{
Logger.Debug("GetItemIdsList query time: {0}ms. Query: {1}",
Convert.ToInt32((DateTime.UtcNow - now).TotalMilliseconds),
cmd.CommandText);
//Logger.Debug("GetItemIdsList query time: {0}ms. Query: {1}",
// Convert.ToInt32((DateTime.UtcNow - now).TotalMilliseconds),
// cmd.CommandText);
while (reader.Read())
{