michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove left-over network path references (#12446)

Browse Source
This commit is contained in:
Niels van Velzen 2024-09-07 19:22:31 +02:00 committed by GitHub
parent df00909b85
commit 675a8a9ec9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -2725,33 +2725,9 @@ namespace Emby.Server.Implementations.Library
public string GetPathAfterNetworkSubstitution(string path, BaseItem? ownerItem)
{
string? newPath;
if (ownerItem is not null)
{
var libraryOptions = GetLibraryOptions(ownerItem);
if (libraryOptions is not null)
{
foreach (var pathInfo in libraryOptions.PathInfos)
{
if (path.TryReplaceSubPath(pathInfo.Path, pathInfo.NetworkPath, out newPath))
{
return newPath;
}
}
}
}
var metadataPath = _configurationManager.Configuration.MetadataPath;
var metadataNetworkPath = _configurationManager.Configuration.MetadataNetworkPath;
if (path.TryReplaceSubPath(metadataPath, metadataNetworkPath, out newPath))
{
return newPath;
}
foreach (var map in _configurationManager.Configuration.PathSubstitutions)
{
if (path.TryReplaceSubPath(map.From, map.To, out newPath))
if (path.TryReplaceSubPath(map.From, map.To, out var newPath))
{
return newPath;
}
@ -3070,15 +3046,6 @@ namespace Emby.Server.Implementations.Library
SyncLibraryOptionsToLocations(virtualFolderPath, libraryOptions);
foreach (var originalPathInfo in libraryOptions.PathInfos)
{
if (string.Equals(mediaPath.Path, originalPathInfo.Path, StringComparison.Ordinal))
{
originalPathInfo.NetworkPath = mediaPath.NetworkPath;
break;
}
}
CollectionFolder.SaveLibraryOptions(virtualFolderPath, libraryOptions);
}

2
MediaBrowser.Model/Configuration/MediaPathInfo.cs
View File

@ -16,7 +16,5 @@ namespace MediaBrowser.Model.Configuration
}
public string Path { get; set; }
public string? NetworkPath { get; set; }
}
}

2
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -96,8 +96,6 @@ public class ServerConfiguration : BaseApplicationConfiguration
/// <value>The metadata path.</value>
public string MetadataPath { get; set; } = string.Empty;
public string MetadataNetworkPath { get; set; } = string.Empty;
/// <summary>
/// Gets or sets the preferred metadata language.
/// </summary>