From c3f9a0336c4c1a3b3e405c08e605c7d8e945f90b Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 11 Aug 2016 20:30:18 -0700 Subject: [PATCH] Move platform files to proper folders --- .../DiskProviderTests/DiskProviderFixture.cs | 1 + .../DiskProviderTests/FreeSpaceFixture.cs | 1 + src/NzbDrone.Mono/{ => Disk}/DiskProvider.cs | 2 +- .../{ => Disk}/LinuxPermissionsException.cs | 2 +- src/NzbDrone.Mono/{ => Disk}/ProcMount.cs | 9 ++------- src/NzbDrone.Mono/{ => Disk}/ProcMountProvider.cs | 2 +- src/NzbDrone.Mono/{ => Disk}/SymbolicLinkResolver.cs | 2 +- .../{ => EnvironmentInfo}/MonoRuntimeProvider.cs | 2 +- .../DiskProviderTests/DiskProviderFixture.cs | 1 + .../DiskProviderTests/FreeSpaceFixture.cs | 1 + src/NzbDrone.Windows/{ => Disk}/DiskProvider.cs | 2 +- .../{ => EnvironmentInfo}/DotNetRuntimeProvider.cs | 2 +- 12 files changed, 13 insertions(+), 14 deletions(-) rename src/NzbDrone.Mono/{ => Disk}/DiskProvider.cs (99%) rename src/NzbDrone.Mono/{ => Disk}/LinuxPermissionsException.cs (91%) rename src/NzbDrone.Mono/{ => Disk}/ProcMount.cs (91%) rename src/NzbDrone.Mono/{ => Disk}/ProcMountProvider.cs (99%) rename src/NzbDrone.Mono/{ => Disk}/SymbolicLinkResolver.cs (99%) rename src/NzbDrone.Mono/{ => EnvironmentInfo}/MonoRuntimeProvider.cs (96%) rename src/NzbDrone.Windows/{ => Disk}/DiskProvider.cs (99%) rename src/NzbDrone.Windows/{ => EnvironmentInfo}/DotNetRuntimeProvider.cs (91%) diff --git a/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs b/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs index ed5c2ed64..47cb7fccc 100644 --- a/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs +++ b/src/NzbDrone.Mono.Test/DiskProviderTests/DiskProviderFixture.cs @@ -2,6 +2,7 @@ using Mono.Unix; using NUnit.Framework; using NzbDrone.Common.Test.DiskTests; +using NzbDrone.Mono.Disk; namespace NzbDrone.Mono.Test.DiskProviderTests { diff --git a/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs b/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs index cf484be1e..5c2e67b4d 100644 --- a/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs +++ b/src/NzbDrone.Mono.Test/DiskProviderTests/FreeSpaceFixture.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using NzbDrone.Common.Test.DiskTests; +using NzbDrone.Mono.Disk; namespace NzbDrone.Mono.Test.DiskProviderTests { diff --git a/src/NzbDrone.Mono/DiskProvider.cs b/src/NzbDrone.Mono/Disk/DiskProvider.cs similarity index 99% rename from src/NzbDrone.Mono/DiskProvider.cs rename to src/NzbDrone.Mono/Disk/DiskProvider.cs index efd61679a..88ad3adf3 100644 --- a/src/NzbDrone.Mono/DiskProvider.cs +++ b/src/NzbDrone.Mono/Disk/DiskProvider.cs @@ -10,7 +10,7 @@ using NzbDrone.Common.EnsureThat; using NzbDrone.Common.Extensions; using NzbDrone.Common.Instrumentation; -namespace NzbDrone.Mono +namespace NzbDrone.Mono.Disk { public class DiskProvider : DiskProviderBase { diff --git a/src/NzbDrone.Mono/LinuxPermissionsException.cs b/src/NzbDrone.Mono/Disk/LinuxPermissionsException.cs similarity index 91% rename from src/NzbDrone.Mono/LinuxPermissionsException.cs rename to src/NzbDrone.Mono/Disk/LinuxPermissionsException.cs index 4b3587c36..964eb3a08 100644 --- a/src/NzbDrone.Mono/LinuxPermissionsException.cs +++ b/src/NzbDrone.Mono/Disk/LinuxPermissionsException.cs @@ -1,6 +1,6 @@ using NzbDrone.Common.Exceptions; -namespace NzbDrone.Mono +namespace NzbDrone.Mono.Disk { public class LinuxPermissionsException : NzbDroneException { diff --git a/src/NzbDrone.Mono/ProcMount.cs b/src/NzbDrone.Mono/Disk/ProcMount.cs similarity index 91% rename from src/NzbDrone.Mono/ProcMount.cs rename to src/NzbDrone.Mono/Disk/ProcMount.cs index f6912d579..7326ad38a 100644 --- a/src/NzbDrone.Mono/ProcMount.cs +++ b/src/NzbDrone.Mono/Disk/ProcMount.cs @@ -1,14 +1,9 @@ -using System; using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using NLog; -using NzbDrone.Common.Disk; -using NzbDrone.Common.Extensions; using Mono.Unix; +using NzbDrone.Common.Disk; -namespace NzbDrone.Mono +namespace NzbDrone.Mono.Disk { public class ProcMount : IMount { diff --git a/src/NzbDrone.Mono/ProcMountProvider.cs b/src/NzbDrone.Mono/Disk/ProcMountProvider.cs similarity index 99% rename from src/NzbDrone.Mono/ProcMountProvider.cs rename to src/NzbDrone.Mono/Disk/ProcMountProvider.cs index 3c695bc61..61b111051 100644 --- a/src/NzbDrone.Mono/ProcMountProvider.cs +++ b/src/NzbDrone.Mono/Disk/ProcMountProvider.cs @@ -7,7 +7,7 @@ using NLog; using NzbDrone.Common.Disk; using NzbDrone.Common.Extensions; -namespace NzbDrone.Mono +namespace NzbDrone.Mono.Disk { public interface IProcMountProvider { diff --git a/src/NzbDrone.Mono/SymbolicLinkResolver.cs b/src/NzbDrone.Mono/Disk/SymbolicLinkResolver.cs similarity index 99% rename from src/NzbDrone.Mono/SymbolicLinkResolver.cs rename to src/NzbDrone.Mono/Disk/SymbolicLinkResolver.cs index f2206f28d..28edae7ca 100644 --- a/src/NzbDrone.Mono/SymbolicLinkResolver.cs +++ b/src/NzbDrone.Mono/Disk/SymbolicLinkResolver.cs @@ -4,7 +4,7 @@ using Mono.Unix; using Mono.Unix.Native; using NLog; -namespace NzbDrone.Mono +namespace NzbDrone.Mono.Disk { public interface ISymbolicLinkResolver { diff --git a/src/NzbDrone.Mono/MonoRuntimeProvider.cs b/src/NzbDrone.Mono/EnvironmentInfo/MonoRuntimeProvider.cs similarity index 96% rename from src/NzbDrone.Mono/MonoRuntimeProvider.cs rename to src/NzbDrone.Mono/EnvironmentInfo/MonoRuntimeProvider.cs index 95f4b6f4a..b9884df77 100644 --- a/src/NzbDrone.Mono/MonoRuntimeProvider.cs +++ b/src/NzbDrone.Mono/EnvironmentInfo/MonoRuntimeProvider.cs @@ -3,7 +3,7 @@ using System.Reflection; using NLog; using NzbDrone.Common.EnvironmentInfo; -namespace NzbDrone.Mono +namespace NzbDrone.Mono.EnvironmentInfo { public class MonoRuntimeProvider : RuntimeInfoBase { diff --git a/src/NzbDrone.Windows.Test/DiskProviderTests/DiskProviderFixture.cs b/src/NzbDrone.Windows.Test/DiskProviderTests/DiskProviderFixture.cs index c60052c72..847e03b92 100644 --- a/src/NzbDrone.Windows.Test/DiskProviderTests/DiskProviderFixture.cs +++ b/src/NzbDrone.Windows.Test/DiskProviderTests/DiskProviderFixture.cs @@ -3,6 +3,7 @@ using System.Security.AccessControl; using System.Security.Principal; using NUnit.Framework; using NzbDrone.Common.Test.DiskTests; +using NzbDrone.Windows.Disk; namespace NzbDrone.Windows.Test.DiskProviderTests { diff --git a/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs b/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs index 384cc4ea3..c68de2451 100644 --- a/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs +++ b/src/NzbDrone.Windows.Test/DiskProviderTests/FreeSpaceFixture.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using NzbDrone.Common.Test.DiskTests; +using NzbDrone.Windows.Disk; namespace NzbDrone.Windows.Test.DiskProviderTests { diff --git a/src/NzbDrone.Windows/DiskProvider.cs b/src/NzbDrone.Windows/Disk/DiskProvider.cs similarity index 99% rename from src/NzbDrone.Windows/DiskProvider.cs rename to src/NzbDrone.Windows/Disk/DiskProvider.cs index c82a1f17d..83ee14c50 100644 --- a/src/NzbDrone.Windows/DiskProvider.cs +++ b/src/NzbDrone.Windows/Disk/DiskProvider.cs @@ -6,7 +6,7 @@ using NzbDrone.Common.Disk; using NzbDrone.Common.EnsureThat; using NzbDrone.Common.Instrumentation; -namespace NzbDrone.Windows +namespace NzbDrone.Windows.Disk { public class DiskProvider : DiskProviderBase { diff --git a/src/NzbDrone.Windows/DotNetRuntimeProvider.cs b/src/NzbDrone.Windows/EnvironmentInfo/DotNetRuntimeProvider.cs similarity index 91% rename from src/NzbDrone.Windows/DotNetRuntimeProvider.cs rename to src/NzbDrone.Windows/EnvironmentInfo/DotNetRuntimeProvider.cs index 6f1a82733..a1d1f75ad 100644 --- a/src/NzbDrone.Windows/DotNetRuntimeProvider.cs +++ b/src/NzbDrone.Windows/EnvironmentInfo/DotNetRuntimeProvider.cs @@ -2,7 +2,7 @@ using NLog; using NzbDrone.Common.EnvironmentInfo; -namespace NzbDrone.Windows +namespace NzbDrone.Windows.EnvironmentInfo { public class DotNetRuntimeProvider : RuntimeInfoBase {