Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: FolderWritable check for CIFS shares mounted in Unix 

This reverts commit 8c892a732ed57af9bb1f39743e0c16361f41b50f.

(cherry picked from commit 96384521c59233dab5bd8289e7c84043f75b84a2)
This commit is contained in:
ta264 2020-12-23 22:01:18 +01:00 committed by Mark McDowall
parent 07cbd7c8d2
commit d9acbf5682
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/NzbDrone.Common.Test/DiskTests/DiskProviderFixtureBase.cs
View File

@ -10,6 +10,16 @@ namespace NzbDrone.Common.Test.DiskTests
public abstract class DiskProviderFixtureBase<TSubject> : TestBase<TSubject> public abstract class DiskProviderFixtureBase<TSubject> : TestBase<TSubject>
where TSubject : class, IDiskProvider where TSubject : class, IDiskProvider
{ {
[Test]
public void writealltext_should_truncate_existing()
{
var file = GetTempFilePath();
Subject.WriteAllText(file, "A pretty long string");
Subject.WriteAllText(file, "A short string");
Subject.ReadAllText(file).Should().Be("A short string");
}
[Test] [Test]
[Retry(5)] [Retry(5)]
public void directory_exist_should_be_able_to_find_existing_folder() public void directory_exist_should_be_able_to_find_existing_folder()

13
src/NzbDrone.Common/Disk/DiskProviderBase.cs
View File

@ -131,7 +131,7 @@ namespace NzbDrone.Common.Disk
{ {
var testPath = Path.Combine(path, "sonarr_write_test.txt"); var testPath = Path.Combine(path, "sonarr_write_test.txt");
var testContent = $"This file was created to verify if '{path}' is writable. It should've been automatically deleted. Feel free to delete it."; var testContent = $"This file was created to verify if '{path}' is writable. It should've been automatically deleted. Feel free to delete it.";
File.WriteAllText(testPath, testContent); WriteAllText(testPath, testContent);
File.Delete(testPath); File.Delete(testPath);
return true; return true;
} }
@ -311,7 +311,16 @@ namespace NzbDrone.Common.Disk
{ {
Ensure.That(filename, () => filename).IsValidPath(PathValidationType.CurrentOs); Ensure.That(filename, () => filename).IsValidPath(PathValidationType.CurrentOs);
RemoveReadOnly(filename); RemoveReadOnly(filename);
File.WriteAllText(filename, contents);
// File.WriteAllText is broken on net core when writing to some CIFS mounts
// This workaround from https://github.com/dotnet/runtime/issues/42790#issuecomment-700362617
using (var fs = new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None))
{
using (var writer = new StreamWriter(fs))
{
writer.Write(contents);
}
}
} }
public void FolderSetLastWriteTime(string path, DateTime dateTime) public void FolderSetLastWriteTime(string path, DateTime dateTime)