The Free Software Media System - Server Backend & API
Backport pull request #15965 from jellyfin/release-10.11.z
Collin-Swishafcaec0a894d
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.csindex bdf04edc2e..f7f5c387e1 100644--- a/Emby.Server.Implementations/Library/LibraryManager.cs+++ b/Emby.Server.Implementations/Library/LibraryManager.cs@@ -3201,19 +3201,7 @@ namespace Emby.Server.Implementations.Libraryvar rootFolderPath = _configurationManager.ApplicationPaths.DefaultUserViewsPath;var virtualFolderPath = Path.Combine(rootFolderPath, virtualFolderName);- var shortcutFilename = Path.GetFileNameWithoutExtension(path);-- var lnk = Path.Combine(virtualFolderPath, shortcutFilename + ShortcutFileExtension);-- while (File.Exists(lnk))- {- shortcutFilename += "1";- lnk = Path.Combine(virtualFolderPath, shortcutFilename + ShortcutFileExtension);- }-- _fileSystem.CreateShortcut(lnk, _appHost.ReverseVirtualPath(path));-- RemoveContentTypeOverrides(path);+ CreateShortcut(virtualFolderPath, pathInfo);if (saveLibraryOptions){@@ -3378,5 +3366,24 @@ namespace Emby.Server.Implementations.Libraryreturn item is UserRootFolder || item.IsVisibleStandalone(user);}++ public void CreateShortcut(string virtualFolderPath, MediaPathInfo pathInfo)+ {+ var path = pathInfo.Path;+ var rootFolderPath = _configurationManager.ApplicationPaths.DefaultUserViewsPath;++ var shortcutFilename = Path.GetFileNameWithoutExtension(path);++ var lnk = Path.Combine(virtualFolderPath, shortcutFilename + ShortcutFileExtension);++ while (File.Exists(lnk))+ {+ shortcutFilename += "1";+ lnk = Path.Combine(virtualFolderPath, shortcutFilename + ShortcutFileExtension);+ }++ _fileSystem.CreateShortcut(lnk, _appHost.ReverseVirtualPath(path));+ RemoveContentTypeOverrides(path);+ }}}diff --git a/Jellyfin.Api/Controllers/LibraryStructureController.cs b/Jellyfin.Api/Controllers/LibraryStructureController.csindex 2a885662b5..117811429a 100644--- a/Jellyfin.Api/Controllers/LibraryStructureController.cs+++ b/Jellyfin.Api/Controllers/LibraryStructureController.cs@@ -342,6 +342,17 @@ public class LibraryStructureController : BaseJellyfinApiControllerreturn NotFound();}+ LibraryOptions options = item.GetLibraryOptions();+ foreach (var mediaPath in request.LibraryOptions!.PathInfos)+ {+ if (options.PathInfos.Any(i => i.Path == mediaPath.Path))+ {+ continue;+ }++ _libraryManager.CreateShortcut(item.Path, mediaPath);+ }+item.UpdateLibraryOptions(request.LibraryOptions);return NoContent();}diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.csindex 675812ac23..df1c98f3f7 100644--- a/MediaBrowser.Controller/Library/ILibraryManager.cs+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs@@ -660,5 +660,12 @@ namespace MediaBrowser.Controller.Library/// This exists so plugins can trigger a library scan./// </remarks>void QueueLibraryScan();++ /// <summary>+ /// Add mblink file for a media path.+ /// </summary>+ /// <param name="virtualFolderPath">The path to the virtualfolder.</param>+ /// <param name="pathInfo">The new virtualfolder.</param>+ public void CreateShortcut(string virtualFolderPath, MediaPathInfo pathInfo);}}