From e1376397a7a7c83b10db3ab543f9fe119fb5f716 Mon Sep 17 00:00:00 2001 From: kayone Date: Wed, 27 Nov 2013 23:08:40 -0800 Subject: [PATCH] cleaned up Datastore folder --- .../Datastore/MappingExtentionFixture.cs | 1 + .../PagingSpecExtenstionsTests/PagingOffsetFixture.cs | 1 + .../PagingSpecExtenstionsTests/ToSortDirectionFixture.cs | 1 + .../InstrumentationTests/DatabaseTargetFixture.cs | 1 + src/NzbDrone.Core/Datastore/BasicRepository.cs | 1 + .../Datastore/{ => Extentions}/MappingExtensions.cs | 2 +- .../Datastore/{ => Extentions}/PagingSpecExtensions.cs | 2 +- .../Datastore/{ => Extentions}/RelationshipExtensions.cs | 2 +- .../Datastore/{ => Migration/Framework}/MigrationType.cs | 2 +- src/NzbDrone.Core/Datastore/TableMapping.cs | 1 + src/NzbDrone.Core/History/HistoryRepository.cs | 1 + src/NzbDrone.Core/NzbDrone.Core.csproj | 8 ++++---- src/NzbDrone.Core/Tv/EpisodeRepository.cs | 1 + 13 files changed, 16 insertions(+), 8 deletions(-) rename src/NzbDrone.Core/Datastore/{ => Extentions}/MappingExtensions.cs (97%) rename src/NzbDrone.Core/Datastore/{ => Extentions}/PagingSpecExtensions.cs (96%) rename src/NzbDrone.Core/Datastore/{ => Extentions}/RelationshipExtensions.cs (97%) rename src/NzbDrone.Core/Datastore/{ => Migration/Framework}/MigrationType.cs (55%) diff --git a/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs b/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs index 17110c38a..0aaaf840f 100644 --- a/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs @@ -5,6 +5,7 @@ using Marr.Data; using NUnit.Framework; using NzbDrone.Core.Datastore; using NzbDrone.Core.Datastore.Converters; +using NzbDrone.Core.Datastore.Extentions; using NzbDrone.Core.Tv; namespace NzbDrone.Core.Test.Datastore diff --git a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs index 134572a16..65819a686 100644 --- a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/PagingOffsetFixture.cs @@ -1,6 +1,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Datastore.Extentions; using NzbDrone.Core.Tv; namespace NzbDrone.Core.Test.Datastore.PagingSpecExtenstionsTests diff --git a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs index f33805191..de74a63f2 100644 --- a/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/PagingSpecExtenstionsTests/ToSortDirectionFixture.cs @@ -1,6 +1,7 @@ using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Datastore.Extentions; using NzbDrone.Core.Tv; namespace NzbDrone.Core.Test.Datastore.PagingSpecExtenstionsTests diff --git a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs index 2b88348aa..bb49dbfd3 100644 --- a/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs +++ b/src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs @@ -5,6 +5,7 @@ using NLog; using NUnit.Framework; using NzbDrone.Common.Instrumentation; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Datastore.Migration.Framework; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Instrumentation; using NzbDrone.Core.Test.Framework; diff --git a/src/NzbDrone.Core/Datastore/BasicRepository.cs b/src/NzbDrone.Core/Datastore/BasicRepository.cs index 74354e28f..68e44343e 100644 --- a/src/NzbDrone.Core/Datastore/BasicRepository.cs +++ b/src/NzbDrone.Core/Datastore/BasicRepository.cs @@ -6,6 +6,7 @@ using Marr.Data; using Marr.Data.QGen; using NzbDrone.Core.Datastore.Events; using NzbDrone.Common; +using NzbDrone.Core.Datastore.Extentions; using NzbDrone.Core.Messaging.Events; diff --git a/src/NzbDrone.Core/Datastore/MappingExtensions.cs b/src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs similarity index 97% rename from src/NzbDrone.Core/Datastore/MappingExtensions.cs rename to src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs index 509d81bca..e5a000004 100644 --- a/src/NzbDrone.Core/Datastore/MappingExtensions.cs +++ b/src/NzbDrone.Core/Datastore/Extentions/MappingExtensions.cs @@ -4,7 +4,7 @@ using Marr.Data; using Marr.Data.Mapping; using NzbDrone.Common.Reflection; -namespace NzbDrone.Core.Datastore +namespace NzbDrone.Core.Datastore.Extentions { public static class MappingExtensions { diff --git a/src/NzbDrone.Core/Datastore/PagingSpecExtensions.cs b/src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs similarity index 96% rename from src/NzbDrone.Core/Datastore/PagingSpecExtensions.cs rename to src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs index 15f09c625..d5593876e 100644 --- a/src/NzbDrone.Core/Datastore/PagingSpecExtensions.cs +++ b/src/NzbDrone.Core/Datastore/Extentions/PagingSpecExtensions.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Linq.Expressions; -namespace NzbDrone.Core.Datastore +namespace NzbDrone.Core.Datastore.Extentions { public static class PagingSpecExtensions { diff --git a/src/NzbDrone.Core/Datastore/RelationshipExtensions.cs b/src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs similarity index 97% rename from src/NzbDrone.Core/Datastore/RelationshipExtensions.cs rename to src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs index 1d82cb6ed..6bade070f 100644 --- a/src/NzbDrone.Core/Datastore/RelationshipExtensions.cs +++ b/src/NzbDrone.Core/Datastore/Extentions/RelationshipExtensions.cs @@ -4,7 +4,7 @@ using System.Linq.Expressions; using Marr.Data; using Marr.Data.Mapping; -namespace NzbDrone.Core.Datastore +namespace NzbDrone.Core.Datastore.Extentions { public static class RelationshipExtensions { diff --git a/src/NzbDrone.Core/Datastore/MigrationType.cs b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationType.cs similarity index 55% rename from src/NzbDrone.Core/Datastore/MigrationType.cs rename to src/NzbDrone.Core/Datastore/Migration/Framework/MigrationType.cs index b572755cc..eb72b996b 100644 --- a/src/NzbDrone.Core/Datastore/MigrationType.cs +++ b/src/NzbDrone.Core/Datastore/Migration/Framework/MigrationType.cs @@ -1,4 +1,4 @@ -namespace NzbDrone.Core.Datastore +namespace NzbDrone.Core.Datastore.Migration.Framework { public enum MigrationType { diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs index 78c6fa0fb..02c728f22 100644 --- a/src/NzbDrone.Core/Datastore/TableMapping.cs +++ b/src/NzbDrone.Core/Datastore/TableMapping.cs @@ -7,6 +7,7 @@ using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Configuration; using NzbDrone.Core.DataAugmentation.Scene; using NzbDrone.Core.Datastore.Converters; +using NzbDrone.Core.Datastore.Extentions; using NzbDrone.Core.Download; using NzbDrone.Core.Indexers; using NzbDrone.Core.Instrumentation; diff --git a/src/NzbDrone.Core/History/HistoryRepository.cs b/src/NzbDrone.Core/History/HistoryRepository.cs index b53c7faca..3d0070cac 100644 --- a/src/NzbDrone.Core/History/HistoryRepository.cs +++ b/src/NzbDrone.Core/History/HistoryRepository.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Marr.Data.QGen; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Datastore.Extentions; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 0c22a0648..1c5f6d42d 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -153,9 +153,11 @@ + + + - @@ -209,8 +211,8 @@ + - @@ -219,8 +221,6 @@ - - diff --git a/src/NzbDrone.Core/Tv/EpisodeRepository.cs b/src/NzbDrone.Core/Tv/EpisodeRepository.cs index dcbe99e1e..484ee1d6d 100644 --- a/src/NzbDrone.Core/Tv/EpisodeRepository.cs +++ b/src/NzbDrone.Core/Tv/EpisodeRepository.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Marr.Data.QGen; using NzbDrone.Core.Datastore; +using NzbDrone.Core.Datastore.Extentions; using NzbDrone.Core.Messaging.Events;