OpenSource/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-10-26 16:45:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #18236 from jellyfin/release-12.z

Browse Source 
Fix user preferences when renaming libraries

Original-merge: 9203258175

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Cody Robibero <cody@robibe.ro>
This commit is contained in:
z0rimo authored and Cody Robibero committed 2026-10-05 19:18:51 -04:00
1 parent 8c7878afaa
commit d624b7c57a
4 files changed
+321 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Emby.Server.Implementations/Library/LibraryManager.cs
+21 -12
View File
@@ -3052,14 +3052,7 @@ namespace Emby.Server.Implementations.Library
CollectionType? viewType,
string sortName)
{
var parentIdString = parentId.IsEmpty()
? null
: parentId.ToString("N", CultureInfo.InvariantCulture);
// The name is either localized (grouped views) or the library folder's own name.
var idValues = "38_namedview_" + user.Id.ToString("N", CultureInfo.InvariantCulture) + (parentIdString ?? string.Empty) + (viewType?.ToString() ?? string.Empty);
var id = GetNewItemId(idValues, typeof(UserView));
var id = GetNamedViewId(user, parentId, viewType);
var path = Path.Combine(_configurationManager.ApplicationPaths.InternalMetadataPath, "views", id.ToString("N", CultureInfo.InvariantCulture));
@@ -3117,6 +3110,18 @@ namespace Emby.Server.Implementations.Library
return item;
}
public Guid GetNamedViewId(User user, Guid parentId, CollectionType? viewType)
{
var parentIdString = parentId.IsEmpty()
? null
: parentId.ToString("N", CultureInfo.InvariantCulture);
// The name is either localized (grouped views) or the library folder's own name.
var idValues = "38_namedview_" + user.Id.ToString("N", CultureInfo.InvariantCulture) + (parentIdString ?? string.Empty) + (viewType?.ToString() ?? string.Empty);
return GetNewItemId(idValues, typeof(UserView));
}
public UserView GetShadowView(
BaseItem parent,
CollectionType? viewType,
@@ -3126,10 +3131,7 @@ namespace Emby.Server.Implementations.Library
var name = parent.Name;
var parentId = parent.Id;
var idValues = "38_namedview_" + name + parentId + (viewType?.ToString() ?? string.Empty);
var id = GetNewItemId(idValues, typeof(UserView));
var id = GetShadowViewId(name, parentId, viewType);
var path = parent.Path;
@@ -3181,6 +3183,13 @@ namespace Emby.Server.Implementations.Library
return item;
}
public Guid GetShadowViewId(string name, Guid parentId, CollectionType? viewType)
{
var idValues = "38_namedview_" + name + parentId + (viewType?.ToString() ?? string.Empty);
return GetNewItemId(idValues, typeof(UserView));
}
public UserView GetNamedView(
string name,
Guid parentId,