mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
removed some preemptive file filtering
This commit is contained in:
parent
7b9a5ba3cb
commit
fab983b6dc
@ -48,10 +48,9 @@ namespace MediaBrowser.Controller.IO
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var data = FileSystem.GetFileSystemInfo(newPath);
|
// Don't check if it exists here because that could return false for network shares.
|
||||||
|
var data = new DirectoryInfo(newPath);
|
||||||
|
|
||||||
if (data.Exists)
|
|
||||||
{
|
|
||||||
// add to our physical locations
|
// add to our physical locations
|
||||||
if (args != null)
|
if (args != null)
|
||||||
{
|
{
|
||||||
@ -60,11 +59,6 @@ namespace MediaBrowser.Controller.IO
|
|||||||
|
|
||||||
dict[data.FullName] = data;
|
dict[data.FullName] = data;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
logger.Warn("Cannot add unavailble/non-existent location {0}", data.FullName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (flattenFolderDepth > 0 && isDirectory)
|
else if (flattenFolderDepth > 0 && isDirectory)
|
||||||
{
|
{
|
||||||
foreach (var child in GetFilteredFileSystemEntries(entry.FullName, logger, flattenFolderDepth: flattenFolderDepth - 1, resolveShortcuts: resolveShortcuts))
|
foreach (var child in GetFilteredFileSystemEntries(entry.FullName, logger, flattenFolderDepth: flattenFolderDepth - 1, resolveShortcuts: resolveShortcuts))
|
||||||
|
@ -460,12 +460,6 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||||||
|
|
||||||
fileInfo = fileInfo ?? FileSystem.GetFileSystemInfo(path);
|
fileInfo = fileInfo ?? FileSystem.GetFileSystemInfo(path);
|
||||||
|
|
||||||
if (!fileInfo.Exists)
|
|
||||||
{
|
|
||||||
_logger.Error("Path in library does not exist or is unavailable: " + path);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths)
|
var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths)
|
||||||
{
|
{
|
||||||
Parent = parent,
|
Parent = parent,
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using MediaBrowser.Common.IO;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Configuration;
|
|
||||||
using MediaBrowser.Controller.Localization;
|
using MediaBrowser.Controller.Localization;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Globalization;
|
using MediaBrowser.Model.Globalization;
|
||||||
@ -10,7 +9,6 @@ using System.Collections.Generic;
|
|||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Server.Implementations.Localization
|
namespace MediaBrowser.Server.Implementations.Localization
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user