alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-10 12:22:09 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fixes #15 - SortRemoveWords config change not working

Browse Source
This commit is contained in:
LukePulverenti
2013-03-11 21:46:46 -04:00
parent f4ec4876d3
commit 76dbab939c
9 changed files with 89 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Controller/Entities/Audio/Audio.cs
View File

@@ -74,5 +74,15 @@ namespace MediaBrowser.Controller.Entities.Audio
return Model.Entities.MediaType.Audio;
}
}
/// <summary>
/// Creates the name of the sort.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateSortName()
{
return (ProductionYear != null ? ProductionYear.Value.ToString("000-") : "")
+ (IndexNumber != null ? IndexNumber.Value.ToString("0000 - ") : "") + Name;
}
}
}

9
MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
View File

@@ -129,5 +129,14 @@ namespace MediaBrowser.Controller.Entities.Audio
base.Studios = value;
}
}
/// <summary>
/// Creates the name of the sort.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateSortName()
{
return ProductionYear != null ? ProductionYear.Value.ToString("0000") : Name;
}
}
}

51
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -370,11 +370,58 @@ namespace MediaBrowser.Controller.Entities
}
}
/// <summary>
/// Gets or sets the name of the forced sort.
/// </summary>
/// <value>The name of the forced sort.</value>
public string ForcedSortName { get; set; }
private string _sortName;
/// <summary>
/// Gets or sets the name of the sort.
/// </summary>
/// <value>The name of the sort.</value>
public string SortName { get; set; }
[IgnoreDataMember]
public string SortName
{
get
{
return ForcedSortName ?? _sortName ?? (_sortName = CreateSortName());
}
}
/// <summary>
/// Creates the name of the sort.
/// </summary>
/// <returns>System.String.</returns>
protected virtual string CreateSortName()
{
if (Name == null) return null; //some items may not have name filled in properly
var sortable = Name.Trim().ToLower();
sortable = ConfigurationManager.Configuration.SortRemoveCharacters.Aggregate(sortable, (current, search) => current.Replace(search.ToLower(), string.Empty));
sortable = ConfigurationManager.Configuration.SortReplaceCharacters.Aggregate(sortable, (current, search) => current.Replace(search.ToLower(), " "));
foreach (var search in ConfigurationManager.Configuration.SortRemoveWords)
{
var searchLower = search.ToLower();
// Remove from beginning if a space follows
if (sortable.StartsWith(searchLower + " "))
{
sortable = sortable.Remove(0, searchLower.Length + 1);
}
// Remove from middle if surrounded by spaces
sortable = sortable.Replace(" " + searchLower + " ", " ");
// Remove from end if followed by a space
if (sortable.EndsWith(" " + searchLower))
{
sortable = sortable.Remove(sortable.Length - (searchLower.Length + 1));
}
}
return sortable;
}
/// <summary>
/// Gets or sets the parent.
@@ -686,7 +733,7 @@ namespace MediaBrowser.Controller.Entities
public virtual void ClearMetaValues()
{
Images = null;
SortName = null;
ForcedSortName = null;
PremiereDate = null;
BackdropImagePaths = null;
OfficialRating = null;

4
MediaBrowser.Controller/Entities/IndexFolder.cs
View File

@@ -28,7 +28,7 @@ namespace MediaBrowser.Controller.Entities
GroupContents = groupContents;
if (shadow == null)
{
Name = SortName = "<Unknown>";
Name = ForcedSortName = "<Unknown>";
}
else
{
@@ -167,7 +167,7 @@ namespace MediaBrowser.Controller.Entities
if (ShadowItem != null)
{
Name = ShadowItem.Name;
SortName = ShadowItem.SortName;
ForcedSortName = ShadowItem.SortName;
Genres = ShadowItem.Genres;
Studios = ShadowItem.Studios;
OfficialRating = ShadowItem.OfficialRating;

9
MediaBrowser.Controller/Entities/TV/Episode.cs
View File

@@ -159,5 +159,14 @@ namespace MediaBrowser.Controller.Entities.TV
get { return _season ?? (_season = FindParent<Season>()); }
}
/// <summary>
/// Creates the name of the sort.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateSortName()
{
return (ParentIndexNumber != null ? ParentIndexNumber.Value.ToString("000-") : "")
+ (IndexNumber != null ? IndexNumber.Value.ToString("0000 - ") : "") + Name;
}
}
}

9
MediaBrowser.Controller/Entities/TV/Season.cs
View File

@@ -138,5 +138,14 @@ namespace MediaBrowser.Controller.Entities.TV
return args;
}
/// <summary>
/// Creates the name of the sort.
/// </summary>
/// <returns>System.String.</returns>
protected override string CreateSortName()
{
return IndexNumber != null ? IndexNumber.Value.ToString("0000") : Name;
}
}
}