lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update name searching

Browse Source
This commit is contained in:
Luke Pulverenti 2016-05-12 22:36:01 -04:00
parent 829aa9e855
commit 04d3175473
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -933,21 +933,10 @@ namespace MediaBrowser.Server.Implementations.Library
Path.Combine(path, validFilename) :
Path.Combine(path, subFolderPrefix, validFilename);
var id = GetNewItemId(fullPath, type);
BaseItem obj;
if (!_libraryItemsCache.TryGetValue(id, out obj))
{
obj = CreateItemByName<T>(fullPath, name, id);
RegisterItem(id, obj);
return CreateItemByName<T>(fullPath, name);
}
return obj as T;
}
private T CreateItemByName<T>(string path, string name, Guid id)
private T CreateItemByName<T>(string path, string name)
where T : BaseItem, new()
{
var isArtist = typeof(T) == typeof(MusicArtist);
@ -970,6 +959,8 @@ namespace MediaBrowser.Server.Implementations.Library
}
}
var id = GetNewItemId(path, typeof(T));
var item = GetItemById(id) as T;
if (item == null)

9
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -89,10 +89,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
/// <summary>
/// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
/// </summary>
/// appPaths
/// or
/// jsonSerializer
/// </exception>
public SqliteItemRepository(IServerConfigurationManager config, IJsonSerializer jsonSerializer, ILogManager logManager)
: base(logManager)
{
@ -2317,13 +2313,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (_config.Configuration.SchemaVersion >= 66)
{
whereClauses.Add("CleanName=@Name");
cmd.Parameters.Add(cmd, "@Name", DbType.String).Value = query.Name.RemoveDiacritics();
}
else
{
whereClauses.Add("Name=@Name");
}
cmd.Parameters.Add(cmd, "@Name", DbType.String).Value = query.Name;
}
}
if (!string.IsNullOrWhiteSpace(query.NameContains))
{
@ -2335,7 +2332,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
whereClauses.Add("Name like @NameContains");
}
cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains + "%";
cmd.Parameters.Add(cmd, "@NameContains", DbType.String).Value = "%" + query.NameContains.RemoveDiacritics() + "%";
}
if (!string.IsNullOrWhiteSpace(query.NameStartsWith))
{