diff options
10 files changed, 259 insertions, 239 deletions
diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs index 8cb59b056..d77919e47 100644 --- a/Emby.Dlna/ContentDirectory/ControlHandler.cs +++ b/Emby.Dlna/ContentDirectory/ControlHandler.cs @@ -509,7 +509,7 @@ namespace Emby.Dlna.ContentDirectory { var itemsResult = _libraryManager.GetItemsResult(new InternalItemsQuery(user) { - Person = person.Name, + PersonIds = new[] { person.Id.ToString("N") }, IncludeItemTypes = new[] { typeof(Movie).Name, typeof(Series).Name, typeof(Trailer).Name }, SortBy = new[] { ItemSortBy.SortName }, Limit = limit, diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs index a3c1ee690..e4ceca267 100644 --- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs +++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs @@ -3434,8 +3434,23 @@ namespace Emby.Server.Implementations.Data if (query.PersonIds.Length > 0) { - // Todo: improve without having to do this - query.Person = query.PersonIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).FirstOrDefault(); + // TODO: Should this query with CleanName ? + + var clauses = new List<string>(); + var index = 0; + foreach (var personId in query.PersonIds) + { + var paramName = "@PersonId" + index; + + clauses.Add("(select Name from TypedBaseItems where guid=" + paramName + ") in (select Name from People where ItemId=Guid)"); + if (statement != null) + { + statement.TryBind(paramName, personId.ToGuidParamValue()); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); } if (!string.IsNullOrWhiteSpace(query.Person)) @@ -3633,25 +3648,36 @@ namespace Emby.Server.Implementations.Data var index = 0; foreach (var artistId in query.ExcludeArtistIds) { - var artistItem = RetrieveItem(new Guid(artistId)); - if (artistItem != null) + var paramName = "@ExcludeArtistId" + index; + + clauses.Add("(select CleanName from TypedBaseItems where guid=" + paramName + ") not in (select CleanValue from itemvalues where ItemId=Guid and Type<=1)"); + if (statement != null) { - clauses.Add("@ExcludeArtistName" + index + " not in (select CleanValue from itemvalues where ItemId=Guid and Type <= 1)"); - if (statement != null) - { - statement.TryBind("@ExcludeArtistName" + index, GetCleanValue(artistItem.Name)); - } - index++; + statement.TryBind(paramName, artistId.ToGuidParamValue()); } + index++; } - var clause = "(" + string.Join(" AND ", clauses.ToArray()) + ")"; + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; whereClauses.Add(clause); } if (query.GenreIds.Length > 0) { - // Todo: improve without having to do this - query.Genres = query.GenreIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); + var clauses = new List<string>(); + var index = 0; + foreach (var genreId in query.GenreIds) + { + var paramName = "@GenreId" + index; + + clauses.Add("(select CleanName from TypedBaseItems where guid=" + paramName + ") in (select CleanValue from itemvalues where ItemId=Guid and Type=2)"); + if (statement != null) + { + statement.TryBind(paramName, genreId.ToGuidParamValue()); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); } if (query.Genres.Length > 0) @@ -3690,8 +3716,21 @@ namespace Emby.Server.Implementations.Data if (query.StudioIds.Length > 0) { - // Todo: improve without having to do this - query.Studios = query.StudioIds.Select(i => RetrieveItem(new Guid(i))).Where(i => i != null).Select(i => i.Name).ToArray(); + var clauses = new List<string>(); + var index = 0; + foreach (var studioId in query.StudioIds) + { + var paramName = "@StudioId" + index; + + clauses.Add("(select CleanName from TypedBaseItems where guid=" + paramName + ") in (select CleanValue from itemvalues where ItemId=Guid and Type=3)"); + if (statement != null) + { + statement.TryBind(paramName, studioId.ToGuidParamValue()); + } + index++; + } + var clause = "(" + string.Join(" OR ", clauses.ToArray()) + ")"; + whereClauses.Add(clause); } if (query.Studios.Length > 0) @@ -4655,205 +4694,204 @@ namespace Emby.Server.Implementations.Data ("Type=" + itemValueTypes[0].ToString(CultureInfo.InvariantCulture)) : ("Type in (" + string.Join(",", itemValueTypes.Select(i => i.ToString(CultureInfo.InvariantCulture)).ToArray()) + ")"); + InternalItemsQuery typeSubQuery = null; + + var itemCountColumns = new List<Tuple<string, string>>(); + + var typesToCount = query.IncludeItemTypes.ToList(); + + if (typesToCount.Count > 0) + { + var itemCountColumnQuery = "select group_concat(type, '|')" + GetFromText("B"); + + typeSubQuery = new InternalItemsQuery(query.User) + { + ExcludeItemTypes = query.ExcludeItemTypes, + IncludeItemTypes = query.IncludeItemTypes, + MediaTypes = query.MediaTypes, + AncestorIds = query.AncestorIds, + ExcludeItemIds = query.ExcludeItemIds, + ItemIds = query.ItemIds, + TopParentIds = query.TopParentIds, + ParentId = query.ParentId, + IsPlayed = query.IsPlayed + }; + var whereClauses = GetWhereClauses(typeSubQuery, null, "itemTypes"); + + whereClauses.Add("guid in (select ItemId from ItemValues where ItemValues.CleanValue=A.CleanName AND " + typeClause + ")"); + + var typeWhereText = whereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", whereClauses.ToArray()); + + itemCountColumnQuery += typeWhereText; + + //itemCountColumnQuery += ")"; + + itemCountColumns.Add(new Tuple<string, string>("itemTypes", "(" + itemCountColumnQuery + ") as itemTypes")); + } + + var columns = _retriveItemColumns.ToList(); + columns.AddRange(itemCountColumns.Select(i => i.Item2).ToArray()); + + var commandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, columns.ToArray())) + GetFromText(); + commandText += GetJoinUserDataText(query); + + var innerQuery = new InternalItemsQuery(query.User) + { + ExcludeItemTypes = query.ExcludeItemTypes, + IncludeItemTypes = query.IncludeItemTypes, + MediaTypes = query.MediaTypes, + AncestorIds = query.AncestorIds, + ExcludeItemIds = query.ExcludeItemIds, + ItemIds = query.ItemIds, + TopParentIds = query.TopParentIds, + ParentId = query.ParentId, + IsPlayed = query.IsPlayed + }; + + var innerWhereClauses = GetWhereClauses(innerQuery, null); + + var innerWhereText = innerWhereClauses.Count == 0 ? + string.Empty : + " where " + string.Join(" AND ", innerWhereClauses.ToArray()); + + var whereText = " where Type=@SelectType"; + + if (typesToCount.Count == 0) + { + whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; + } + else + { + //whereText += " And itemTypes not null"; + whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; + } + + var outerQuery = new InternalItemsQuery(query.User) + { + IsFavorite = query.IsFavorite, + IsFavoriteOrLiked = query.IsFavoriteOrLiked, + IsLiked = query.IsLiked, + IsLocked = query.IsLocked, + NameLessThan = query.NameLessThan, + NameStartsWith = query.NameStartsWith, + NameStartsWithOrGreater = query.NameStartsWithOrGreater, + AlbumArtistStartsWithOrGreater = query.AlbumArtistStartsWithOrGreater, + Tags = query.Tags, + OfficialRatings = query.OfficialRatings, + GenreIds = query.GenreIds, + Genres = query.Genres, + Years = query.Years + }; + + var outerWhereClauses = GetWhereClauses(outerQuery, null); + + whereText += outerWhereClauses.Count == 0 ? + string.Empty : + " AND " + string.Join(" AND ", outerWhereClauses.ToArray()); + //cmd.CommandText += GetGroupBy(query); + + commandText += whereText; + commandText += " group by PresentationUniqueKey"; + + commandText += " order by SortName"; + + if (query.Limit.HasValue || query.StartIndex.HasValue) + { + var offset = query.StartIndex ?? 0; + + if (query.Limit.HasValue || offset > 0) + { + commandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); + } + + if (offset > 0) + { + commandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); + } + } + + var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; + + var list = new List<Tuple<BaseItem, ItemCounts>>(); + var count = 0; + using (WriteLock.Write()) { - // var itemCountColumns = new List<Tuple<string, string>>(); - - // var typesToCount = query.IncludeItemTypes.ToList(); - - // if (typesToCount.Count > 0) - // { - // var itemCountColumnQuery = "select group_concat(type, '|')" + GetFromText("B"); - - // var typeSubQuery = new InternalItemsQuery(query.User) - // { - // ExcludeItemTypes = query.ExcludeItemTypes, - // IncludeItemTypes = query.IncludeItemTypes, - // MediaTypes = query.MediaTypes, - // AncestorIds = query.AncestorIds, - // ExcludeItemIds = query.ExcludeItemIds, - // ItemIds = query.ItemIds, - // TopParentIds = query.TopParentIds, - // ParentId = query.ParentId, - // IsPlayed = query.IsPlayed - // }; - // var whereClauses = GetWhereClauses(typeSubQuery, cmd, "itemTypes"); - - // whereClauses.Add("guid in (select ItemId from ItemValues where ItemValues.CleanValue=A.CleanName AND " + typeClause + ")"); - - // var typeWhereText = whereClauses.Count == 0 ? - // string.Empty : - // " where " + string.Join(" AND ", whereClauses.ToArray()); - - // itemCountColumnQuery += typeWhereText; - - // //itemCountColumnQuery += ")"; - - // itemCountColumns.Add(new Tuple<string, string>("itemTypes", "(" + itemCountColumnQuery + ") as itemTypes")); - // } - - // var columns = _retriveItemColumns.ToList(); - // columns.AddRange(itemCountColumns.Select(i => i.Item2).ToArray()); - - // cmd.CommandText = "select " + string.Join(",", GetFinalColumnsToSelect(query, columns.ToArray(), cmd)) + GetFromText(); - // cmd.CommandText += GetJoinUserDataText(query); - - // var innerQuery = new InternalItemsQuery(query.User) - // { - // ExcludeItemTypes = query.ExcludeItemTypes, - // IncludeItemTypes = query.IncludeItemTypes, - // MediaTypes = query.MediaTypes, - // AncestorIds = query.AncestorIds, - // ExcludeItemIds = query.ExcludeItemIds, - // ItemIds = query.ItemIds, - // TopParentIds = query.TopParentIds, - // ParentId = query.ParentId, - // IsPlayed = query.IsPlayed - // }; - - // var innerWhereClauses = GetWhereClauses(innerQuery, cmd); - - // var innerWhereText = innerWhereClauses.Count == 0 ? - // string.Empty : - // " where " + string.Join(" AND ", innerWhereClauses.ToArray()); - - // var whereText = " where Type=@SelectType"; - - // if (typesToCount.Count == 0) - // { - // whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; - // } - // else - // { - // //whereText += " And itemTypes not null"; - // whereText += " And CleanName In (Select CleanValue from ItemValues where " + typeClause + " AND ItemId in (select guid from TypedBaseItems" + innerWhereText + "))"; - // } - - // var outerQuery = new InternalItemsQuery(query.User) - // { - // IsFavorite = query.IsFavorite, - // IsFavoriteOrLiked = query.IsFavoriteOrLiked, - // IsLiked = query.IsLiked, - // IsLocked = query.IsLocked, - // NameLessThan = query.NameLessThan, - // NameStartsWith = query.NameStartsWith, - // NameStartsWithOrGreater = query.NameStartsWithOrGreater, - // AlbumArtistStartsWithOrGreater = query.AlbumArtistStartsWithOrGreater, - // Tags = query.Tags, - // OfficialRatings = query.OfficialRatings, - // GenreIds = query.GenreIds, - // Genres = query.Genres, - // Years = query.Years - // }; - - // var outerWhereClauses = GetWhereClauses(outerQuery, cmd); - - // whereText += outerWhereClauses.Count == 0 ? - // string.Empty : - // " AND " + string.Join(" AND ", outerWhereClauses.ToArray()); - // //cmd.CommandText += GetGroupBy(query); - - // cmd.CommandText += whereText; - // cmd.CommandText += " group by PresentationUniqueKey"; - - // cmd.Parameters.Add(cmd, "@SelectType", DbType.String).Value = returnType; - - // if (EnableJoinUserData(query)) - // { - // cmd.Parameters.Add(cmd, "@UserId", DbType.Guid).Value = query.User.Id; - // } - - // cmd.CommandText += " order by SortName"; - - // if (query.Limit.HasValue || query.StartIndex.HasValue) - // { - // var offset = query.StartIndex ?? 0; - - // if (query.Limit.HasValue || offset > 0) - // { - // cmd.CommandText += " LIMIT " + (query.Limit ?? int.MaxValue).ToString(CultureInfo.InvariantCulture); - // } - - // if (offset > 0) - // { - // cmd.CommandText += " OFFSET " + offset.ToString(CultureInfo.InvariantCulture); - // } - // } - - // cmd.CommandText += ";"; - - // var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0; - - // if (isReturningZeroItems) - // { - // cmd.CommandText = ""; - // } - - // if (query.EnableTotalRecordCount) - // { - // cmd.CommandText += "select count (distinct PresentationUniqueKey)" + GetFromText(); - - // cmd.CommandText += GetJoinUserDataText(query); - // cmd.CommandText += whereText; - // } - // else - // { - // cmd.CommandText = cmd.CommandText.TrimEnd(';'); - // } - - // var list = new List<Tuple<BaseItem, ItemCounts>>(); - // var count = 0; - - // var commandBehavior = isReturningZeroItems || !query.EnableTotalRecordCount - // ? (CommandBehavior.SequentialAccess | CommandBehavior.SingleResult) - // : CommandBehavior.SequentialAccess; - - // //Logger.Debug("GetItemValues: " + cmd.CommandText); - - // using (var reader = cmd.ExecuteReader(commandBehavior)) - // { - // LogQueryTime("GetItemValues", cmd, now); - - // if (isReturningZeroItems) - // { - // if (reader.Read()) - // { - // count = reader.GetInt32(0); - // } - // } - // else - // { - // while (reader.Read()) - // { - // var item = GetItem(reader); - // if (item != null) - // { - // var countStartColumn = columns.Count - 1; - - // list.Add(new Tuple<BaseItem, ItemCounts>(item, GetItemCounts(reader, countStartColumn, typesToCount))); - // } - // } - - // if (reader.NextResult() && reader.Read()) - // { - // count = reader.GetInt32(0); - // } - // } - // } - - // if (count == 0) - // { - // count = list.Count; - // } - - // return new QueryResult<Tuple<BaseItem, ItemCounts>> - // { - // Items = list.ToArray(), - // TotalRecordCount = count - // }; - } - - return new QueryResult<Tuple<BaseItem, ItemCounts>>(); + if (!isReturningZeroItems) + { + using (var statement = _connection.PrepareStatement(commandText)) + { + statement.TryBind("@SelectType", returnType); + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + if (typeSubQuery != null) + { + GetWhereClauses(typeSubQuery, null, "itemTypes"); + } + BindSimilarParams(query, statement); + GetWhereClauses(innerQuery, statement); + GetWhereClauses(outerQuery, statement); + + foreach (var row in statement.ExecuteQuery()) + { + var item = GetItem(row); + if (item != null) + { + var countStartColumn = columns.Count - 1; + + list.Add(new Tuple<BaseItem, ItemCounts>(item, GetItemCounts(row, countStartColumn, typesToCount))); + } + } + + LogQueryTime("GetItemValues", commandText, now); + } + } + + if (query.EnableTotalRecordCount) + { + commandText = "select count (distinct PresentationUniqueKey)" + GetFromText(); + + commandText += GetJoinUserDataText(query); + commandText += whereText; + + using (var statement = _connection.PrepareStatement(commandText)) + { + statement.TryBind("@SelectType", returnType); + if (EnableJoinUserData(query)) + { + statement.TryBind("@UserId", query.User.Id); + } + + if (typeSubQuery != null) + { + GetWhereClauses(typeSubQuery, null, "itemTypes"); + } + BindSimilarParams(query, statement); + GetWhereClauses(innerQuery, statement); + GetWhereClauses(outerQuery, statement); + + count = statement.ExecuteQuery().SelectScalarInt().First(); + + LogQueryTime("GetItemValues", commandText, now); + } + } + } + + if (count == 0) + { + count = list.Count; + } + + return new QueryResult<Tuple<BaseItem, ItemCounts>> + { + Items = list.ToArray(), + TotalRecordCount = count + }; } private ItemCounts GetItemCounts(IReadOnlyList<IResultSetValue> reader, int countStartColumn, List<string> typesToCount) diff --git a/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs b/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs index 48a85e0e0..5be7ba7ad 100644 --- a/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs +++ b/Emby.Server.Implementations/FileOrganization/OrganizerScheduledTask.cs @@ -74,7 +74,7 @@ namespace Emby.Server.Implementations.FileOrganization return new[] { // Every so often - new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromMinutes(15).Ticks} + new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromMinutes(5).Ticks} }; } diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs index 79d2a2ee5..0c36442af 100644 --- a/MediaBrowser.Controller/Entities/Person.cs +++ b/MediaBrowser.Controller/Entities/Person.cs @@ -40,7 +40,7 @@ namespace MediaBrowser.Controller.Entities public IEnumerable<BaseItem> GetTaggedItems(InternalItemsQuery query) { - query.Person = Name; + query.PersonIds = new[] { Id.ToString("N") }; return LibraryManager.GetItemList(query); } @@ -95,7 +95,7 @@ namespace MediaBrowser.Controller.Entities { var itemsWithPerson = LibraryManager.GetItemIds(new InternalItemsQuery { - Person = Name + PersonIds = new[] { Id.ToString("N") } }); return inputItems.Where(i => itemsWithPerson.Contains(i.Id)); diff --git a/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs b/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs index 817b9d71a..0384ddd25 100644 --- a/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs +++ b/MediaBrowser.Providers/People/TvdbPersonImageProvider.cs @@ -62,13 +62,10 @@ namespace MediaBrowser.Providers.People public Task<IEnumerable<RemoteImageInfo>> GetImages(IHasImages item, CancellationToken cancellationToken) { - // Avoid implicitly captured closure - var itemName = item.Name; - var seriesWithPerson = _libraryManager.GetItemList(new InternalItemsQuery { IncludeItemTypes = new[] { typeof(Series).Name }, - Person = itemName + PersonIds = new[] { item.Id.ToString("N") } }).Cast<Series>() .Where(i => TvdbSeriesProvider.IsValidSeries(i.ProviderIds)) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index f80513c51..9df2df2ff 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -115,9 +115,6 @@ <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="System.Data.SQLite">
- <HintPath>..\ThirdParty\System.Data.SQLite.ManagedOnly\1.0.94.0\System.Data.SQLite.dll</HintPath>
- </Reference>
<Reference Include="System.Data" />
<Reference Include="Emby.Common.Implementations">
<HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath>
@@ -151,9 +148,6 @@ <Compile Include="Main.cs" />
<Compile Include="MenuBarIcon.cs" />
<Compile Include="Native\DbConnector.cs" />
- <Compile Include="..\MediaBrowser.Server.Startup.Common\Persistence\SqliteExtensions.cs">
- <Link>Native\SqliteExtensions.cs</Link>
- </Compile>
<Compile Include="MacAppHost.cs" />
<Compile Include="Native\MonoFileSystem.cs" />
<Compile Include="Native\PowerManagement.cs" />
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 13d67ace5..485bbf3a9 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -88,16 +88,15 @@ <HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll</HintPath> <Private>True</Private> </Reference> - <Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL"> - <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath> - <Private>True</Private> - </Reference> <Reference Include="System" /> <Reference Include="MediaBrowser.IsoMounting.Linux"> <HintPath>..\ThirdParty\MediaBrowser.IsoMounting.Linux\MediaBrowser.IsoMounting.Linux.dll</HintPath> </Reference> <Reference Include="System.Configuration" /> <Reference Include="System.Data" /> + <Reference Include="System.Data.SQLite"> + <HintPath>..\ThirdParty\SQLitePCLRaw.provider.sqlite3.net45\System.Data.SQLite.dll</HintPath> + </Reference> <Reference Include="System.IO.Compression" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.ServiceModel" /> @@ -223,10 +222,6 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> <None Include="packages.config" /> - <None Include="SQLitePCLRaw.provider.sqlite3.dll.config"> - <SubType>Designer</SubType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> <None Include="System.Data.SQLite.dll.config"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <SubType>Designer</SubType> diff --git a/MediaBrowser.Server.Mono/SQLitePCLRaw.provider.sqlite3.dll.config b/MediaBrowser.Server.Mono/SQLitePCLRaw.provider.sqlite3.dll.config deleted file mode 100644 index 83a6cd9f3..000000000 --- a/MediaBrowser.Server.Mono/SQLitePCLRaw.provider.sqlite3.dll.config +++ /dev/null @@ -1,3 +0,0 @@ -<configuration> - <dllmap dll="sqlite3" target="libsqlite3.so" os="linux"/> -</configuration>
\ No newline at end of file diff --git a/MediaBrowser.Server.Mono/packages.config b/MediaBrowser.Server.Mono/packages.config index e82ef0ed0..6e3fe428c 100644 --- a/MediaBrowser.Server.Mono/packages.config +++ b/MediaBrowser.Server.Mono/packages.config @@ -6,5 +6,4 @@ <package id="SharpCompress" version="0.14.0" targetFramework="net46" /> <package id="SimpleInjector" version="3.2.4" targetFramework="net46" /> <package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="net46" /> - <package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1-pre20161109081005" targetFramework="net46" /> </packages>
\ No newline at end of file diff --git a/MediaBrowser.XbmcMetadata/EntryPoint.cs b/MediaBrowser.XbmcMetadata/EntryPoint.cs index bf3d3c303..cd18e5670 100644 --- a/MediaBrowser.XbmcMetadata/EntryPoint.cs +++ b/MediaBrowser.XbmcMetadata/EntryPoint.cs @@ -52,7 +52,7 @@ namespace MediaBrowser.XbmcMetadata var items = _libraryManager.GetItemList(new InternalItemsQuery { - Person = person.Name + PersonIds = new [] { person.Id.ToString("N") } }).ToList(); |