cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-18 03:19:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2558 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-03-30 14:03:40 -04:00 committed by GitHub
commit bfb177f8b6
7 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BDInfo/BDROM.cs
View File

@ -137,19 +137,19 @@ namespace BDInfo
}
if (DirectoryBDJO != null &&
_fileSystem.GetFiles(DirectoryBDJO.FullName).Any())
_fileSystem.GetFilePaths(DirectoryBDJO.FullName).Any())
{
IsBDJava = true;
}
if (DirectorySNP != null &&
GetFiles(DirectorySNP.FullName, ".mnv").Any())
GetFilePaths(DirectorySNP.FullName, ".mnv").Any())
{
IsPSP = true;
}
if (DirectorySSIF != null &&
_fileSystem.GetFiles(DirectorySSIF.FullName).Any())
_fileSystem.GetFilePaths(DirectorySSIF.FullName).Any())
{
Is3D = true;
}
@ -209,6 +209,11 @@ namespace BDInfo
return _fileSystem.GetFiles(path, new[] { extension }, false, false);
}
private IEnumerable<string> GetFilePaths(string path, string extension)
{
return _fileSystem.GetFilePaths(path, new[] { extension }, false, false);
}
public void Scan()
{
List<TSStreamClipFile> errorStreamClipFiles = new List<TSStreamClipFile>();

32
Emby.Common.Implementations/IO/ManagedFileSystem.cs
View File

@ -662,7 +662,7 @@ namespace Emby.Common.Implementations.IO
public IEnumerable<FileSystemMetadata> GetFiles(string path, bool recursive = false)
{
return GetFiles(path, null, true, recursive);
return GetFiles(path, null, false, recursive);
}
public IEnumerable<FileSystemMetadata> GetFiles(string path, string[] extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
@ -790,9 +790,37 @@ namespace Emby.Common.Implementations.IO
}
public IEnumerable<string> GetFilePaths(string path, bool recursive = false)
{
return GetFilePaths(path, null, false, recursive);
}
public IEnumerable<string> GetFilePaths(string path, string[] extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
{
var searchOption = recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
return Directory.EnumerateFiles(path, "*", searchOption);
// On linux and osx the search pattern is case sensitive
// If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
if (enableCaseSensitiveExtensions && extensions != null && extensions.Length == 1)
{
return Directory.EnumerateFiles(path, "*" + extensions[0], searchOption);
}
var files = Directory.EnumerateFiles(path, "*", searchOption);
if (extensions != null && extensions.Length > 0)
{
files = files.Where(i =>
{
var ext = Path.GetExtension(i);
if (ext == null)
{
return false;
}
return extensions.Contains(ext, StringComparer.OrdinalIgnoreCase);
});
}
return files;
}
public IEnumerable<string> GetFileSystemEntryPaths(string path, bool recursive = false)

6
Emby.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
View File

@ -178,18 +178,18 @@ namespace Emby.Server.Implementations.FileOrganization
/// <param name="extensions">The extensions.</param>
private void DeleteLeftOverFiles(string path, IEnumerable<string> extensions)
{
var eligibleFiles = _fileSystem.GetFiles(path, extensions.ToArray(), false, true)
var eligibleFiles = _fileSystem.GetFilePaths(path, extensions.ToArray(), false, true)
.ToList();
foreach (var file in eligibleFiles)
{
try
{
_fileSystem.DeleteFile(file.FullName);
_fileSystem.DeleteFile(file);
}
catch (Exception ex)
{
_logger.ErrorException("Error deleting file {0}", ex, file.FullName);
_logger.ErrorException("Error deleting file {0}", ex, file);
}
}
}

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

@ -1255,9 +1255,9 @@ namespace Emby.Server.Implementations.Library
private string GetCollectionType(string path)
{
return _fileSystem.GetFiles(path, new[] { ".collection" }, true, false)
return _fileSystem.GetFilePaths(path, new[] { ".collection" }, true, false)
.Select(i => _fileSystem.GetFileNameWithoutExtension(i))
.FirstOrDefault();
.FirstOrDefault(i => !string.IsNullOrWhiteSpace(i));
}
/// <summary>

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
View File

@ -382,7 +382,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{
id = "native";
}
id += "_" + url.GetMD5().ToString("N");
id += "_" + channelId.GetMD5().ToString("N") + "_" + url.GetMD5().ToString("N");
var mediaSource = new MediaSourceInfo
{

1
MediaBrowser.Model/IO/IFileSystem.cs
View File

@ -298,6 +298,7 @@ namespace MediaBrowser.Model.IO
/// <param name="recursive">if set to <c>true</c> [recursive].</param>
/// <returns>IEnumerable&lt;System.String&gt;.</returns>
IEnumerable<string> GetFilePaths(string path, bool recursive = false);
IEnumerable<string> GetFilePaths(string path, string[] extensions, bool enableCaseSensitiveExtensions, bool recursive);
/// <summary>
/// Gets the file system entry paths.

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.9.3")]
[assembly: AssemblyVersion("3.2.10.1")]