alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-29 13:26:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fixes #200 - MB3 Locking Folders for a long time

Browse Source
This commit is contained in:
Luke Pulverenti
2013-04-28 01:29:27 -04:00
parent 90bb3d46c4
commit b443d591a2
33 changed files with 254 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -244,13 +244,13 @@ namespace MediaBrowser.Controller.Entities
// Record the name of each file
// Need to sort these because accoring to msdn docs, our i/o methods are not guaranteed in any order
foreach (var file in ResolveArgs.FileSystemChildren.OrderBy(f => f.cFileName))
foreach (var file in ResolveArgs.FileSystemChildren.OrderBy(f => f.Name))
{
sb.Append(file.cFileName);
sb.Append(file.Name);
}
foreach (var file in ResolveArgs.MetadataFiles.OrderBy(f => f.cFileName))
foreach (var file in ResolveArgs.MetadataFiles.OrderBy(f => f.Name))
{
sb.Append(file.cFileName);
sb.Append(file.Name);
}
return sb.ToString().GetMD5();
@@ -307,7 +307,7 @@ namespace MediaBrowser.Controller.Entities
/// Resets the resolve args.
/// </summary>
/// <param name="pathInfo">The path info.</param>
public void ResetResolveArgs(WIN32_FIND_DATA? pathInfo)
public void ResetResolveArgs(FileSystemInfo pathInfo)
{
ResolveArgs = CreateResolveArgs(pathInfo);
}
@@ -318,17 +318,14 @@ namespace MediaBrowser.Controller.Entities
/// <param name="pathInfo">The path info.</param>
/// <returns>ItemResolveArgs.</returns>
/// <exception cref="System.IO.IOException">Unable to retrieve file system info for + path</exception>
protected internal virtual ItemResolveArgs CreateResolveArgs(WIN32_FIND_DATA? pathInfo = null)
protected internal virtual ItemResolveArgs CreateResolveArgs(FileSystemInfo pathInfo = null)
{
var path = Path;
// non file-system entries will not have a path
if (LocationType != LocationType.FileSystem || string.IsNullOrEmpty(path))
{
return new ItemResolveArgs(ConfigurationManager.ApplicationPaths)
{
FileInfo = new WIN32_FIND_DATA()
};
return new ItemResolveArgs(ConfigurationManager.ApplicationPaths);
}
if (UseParentPathToCreateResolveArgs)
@@ -336,16 +333,16 @@ namespace MediaBrowser.Controller.Entities
path = System.IO.Path.GetDirectoryName(path);
}
pathInfo = pathInfo ?? FileSystem.GetFileData(path);
pathInfo = pathInfo ?? FileSystem.GetFileSystemInfo(path);
if (!pathInfo.HasValue)
if (pathInfo == null || !pathInfo.Exists)
{
throw new IOException("Unable to retrieve file system info for " + path);
}
var args = new ItemResolveArgs(ConfigurationManager.ApplicationPaths)
{
FileInfo = pathInfo.Value,
FileInfo = pathInfo,
Path = path,
Parent = Parent
};
@@ -735,11 +732,11 @@ namespace MediaBrowser.Controller.Entities
return new List<Trailer>();
}
IEnumerable<WIN32_FIND_DATA> files;
IEnumerable<FileSystemInfo> files;
try
{
files = FileSystem.GetFiles(folder.Value.Path);
files = new DirectoryInfo(folder.FullName).EnumerateFiles();
}
catch (IOException ex)
{
@@ -793,11 +790,11 @@ namespace MediaBrowser.Controller.Entities
return new List<Audio.Audio>();
}
IEnumerable<WIN32_FIND_DATA> files;
IEnumerable<FileSystemInfo> files;
try
{
files = FileSystem.GetFiles(folder.Value.Path);
files = new DirectoryInfo(folder.FullName).EnumerateFiles();
}
catch (IOException ex)
{

2
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -768,7 +768,7 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IEnumerable{BaseItem}.</returns>
protected virtual IEnumerable<BaseItem> GetNonCachedChildren()
{
IEnumerable<WIN32_FIND_DATA> fileSystemChildren;
IEnumerable<FileSystemInfo> fileSystemChildren;
try
{

6
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@@ -115,7 +115,7 @@ namespace MediaBrowser.Controller.Entities.Movies
/// <returns>IEnumerable{Video}.</returns>
private IEnumerable<Video> LoadSpecialFeatures()
{
WIN32_FIND_DATA? folder;
FileSystemInfo folder;
try
{
@@ -133,11 +133,11 @@ namespace MediaBrowser.Controller.Entities.Movies
return new List<Video>();
}
IEnumerable<WIN32_FIND_DATA> files;
IEnumerable<FileSystemInfo> files;
try
{
files = FileSystem.GetFiles(folder.Value.Path);
files = new DirectoryInfo(folder.FullName).EnumerateFiles();
}
catch (IOException ex)
{

7
MediaBrowser.Controller/Entities/TV/Season.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.IO;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
@@ -134,9 +135,9 @@ namespace MediaBrowser.Controller.Entities.TV
{
var folder = args.GetFileSystemEntryByName("metadata");
if (folder.HasValue)
if (folder != null)
{
args.AddMetadataFiles(FileSystem.GetFiles(folder.Value.Path));
args.AddMetadataFiles(new DirectoryInfo(folder.FullName).EnumerateFiles());
}
}
@@ -145,7 +146,7 @@ namespace MediaBrowser.Controller.Entities.TV
/// </summary>
/// <param name="pathInfo">The path info.</param>
/// <returns>ItemResolveArgs.</returns>
protected internal override ItemResolveArgs CreateResolveArgs(WIN32_FIND_DATA? pathInfo = null)
protected internal override ItemResolveArgs CreateResolveArgs(FileSystemInfo pathInfo = null)
{
var args = base.CreateResolveArgs(pathInfo);

5
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Common.Extensions;
using System.IO;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Localization;
@@ -68,7 +69,7 @@ namespace MediaBrowser.Controller.Entities.TV
/// </summary>
/// <param name="pathInfo">The path info.</param>
/// <returns>ItemResolveArgs.</returns>
protected internal override ItemResolveArgs CreateResolveArgs(WIN32_FIND_DATA? pathInfo = null)
protected internal override ItemResolveArgs CreateResolveArgs(FileSystemInfo pathInfo = null)
{
var args = base.CreateResolveArgs(pathInfo);