Merge branch 'master' into culture

This commit is contained in:
Bond-009
2019-01-30 16:57:15 +01:00
committed by GitHub
121 changed files with 536 additions and 887 deletions

View File

@@ -108,7 +108,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
{
if (!SupportsUrlAfterClosingXmlTag)
{
using (var fileStream = FileSystem.OpenRead(metadataFile))
using (var fileStream = File.OpenRead(metadataFile))
{
using (var streamReader = new StreamReader(fileStream, Encoding.UTF8))
{
@@ -140,7 +140,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
return;
}
using (var fileStream = FileSystem.OpenRead(metadataFile))
using (var fileStream = File.OpenRead(metadataFile))
{
using (var streamReader = new StreamReader(fileStream, Encoding.UTF8))
{

View File

@@ -28,7 +28,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
protected override void Fetch(MetadataResult<Episode> item, string metadataFile, XmlReaderSettings settings, CancellationToken cancellationToken)
{
using (var fileStream = FileSystem.OpenRead(metadataFile))
using (var fileStream = File.OpenRead(metadataFile))
{
using (var streamReader = new StreamReader(fileStream, Encoding.UTF8))
{

View File

@@ -193,7 +193,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
private void SaveToFile(Stream stream, string path)
{
FileSystem.CreateDirectory(FileSystem.GetDirectoryName(path));
Directory.CreateDirectory(Path.GetDirectoryName(path));
// On Windows, savint the file will fail if the file is hidden or readonly
FileSystem.SetAttributes(path, false, false);
@@ -975,7 +975,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
settings.IgnoreProcessingInstructions = true;
settings.IgnoreComments = true;
using (var fileStream = fileSystem.OpenRead(path))
using (var fileStream = File.OpenRead(path))
{
using (var streamReader = new StreamReader(fileStream, Encoding.UTF8))
{

View File

@@ -36,7 +36,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
return false;
}
return updateType >= MinimumUpdateType || (updateType >= ItemUpdateType.MetadataImport && FileSystem.FileExists(GetSavePath(item)));
return updateType >= MinimumUpdateType || (updateType >= ItemUpdateType.MetadataImport && File.Exists(GetSavePath(item)));
}
protected override void WriteCustomElements(BaseItem item, XmlWriter writer)