Remove left-over network path references (#12446)
This commit is contained in:
parent
df00909b85
commit
675a8a9ec9
|
@ -2725,33 +2725,9 @@ namespace Emby.Server.Implementations.Library
|
||||||
|
|
||||||
public string GetPathAfterNetworkSubstitution(string path, BaseItem? ownerItem)
|
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)
|
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;
|
return newPath;
|
||||||
}
|
}
|
||||||
|
@ -3070,15 +3046,6 @@ namespace Emby.Server.Implementations.Library
|
||||||
|
|
||||||
SyncLibraryOptionsToLocations(virtualFolderPath, libraryOptions);
|
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);
|
CollectionFolder.SaveLibraryOptions(virtualFolderPath, libraryOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,5 @@ namespace MediaBrowser.Model.Configuration
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Path { get; set; }
|
public string Path { get; set; }
|
||||||
|
|
||||||
public string? NetworkPath { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -96,8 +96,6 @@ public class ServerConfiguration : BaseApplicationConfiguration
|
||||||
/// <value>The metadata path.</value>
|
/// <value>The metadata path.</value>
|
||||||
public string MetadataPath { get; set; } = string.Empty;
|
public string MetadataPath { get; set; } = string.Empty;
|
||||||
|
|
||||||
public string MetadataNetworkPath { get; set; } = string.Empty;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the preferred metadata language.
|
/// Gets or sets the preferred metadata language.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user