From 971053f8a28ad7ea599e70d9491dcd2a1715767f Mon Sep 17 00:00:00 2001
From: "kay.one" <kay.one@gmail.com>
Date: Sun, 24 Mar 2013 21:46:51 -0700
Subject: [PATCH] rebase cleanup.

---
 NzbDrone.Core/Datastore/Migration.cs        | 10 ----------
 NzbDrone.Core/Indexers/Indexer.cs           |  3 ---
 NzbDrone.Core/Indexers/NewznabDefinition.cs |  2 --
 NzbDrone.Core/Indexers/NewznabRepository.cs | 11 ++++-------
 NzbDrone.Core/Jobs/JobDefinition.cs         |  3 ---
 NzbDrone.Core/Jobs/JobRepository.cs         |  2 +-
 NzbDrone.Core/NzbDrone.Core.csproj          |  4 ++--
 NzbDrone.Core/Qualities/QualityProfile.cs   |  2 --
 NzbDrone.Core/Qualities/QualitySize.cs      |  2 --
 NzbDrone.Core/ReferenceData/SceneMapping.cs |  2 --
 NzbDrone.Core/Tv/Series.cs                  |  2 --
 11 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 NzbDrone.Core/Datastore/Migration.cs

diff --git a/NzbDrone.Core/Datastore/Migration.cs b/NzbDrone.Core/Datastore/Migration.cs
deleted file mode 100644
index 8e381389f..000000000
--- a/NzbDrone.Core/Datastore/Migration.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Data;
-using System.Linq;
-
-
-namespace NzbDrone.Core.Datastore
-{
-    public static class Migration
-    {
-    }
-}
diff --git a/NzbDrone.Core/Indexers/Indexer.cs b/NzbDrone.Core/Indexers/Indexer.cs
index fe97b7ef9..18a8e0fd5 100644
--- a/NzbDrone.Core/Indexers/Indexer.cs
+++ b/NzbDrone.Core/Indexers/Indexer.cs
@@ -1,11 +1,8 @@
 using System;
 using NzbDrone.Core.Datastore;
-using ServiceStack.DataAnnotations;
-
 
 namespace NzbDrone.Core.Indexers
 {
-    [Alias("IndexerDefinitions")]
     public class Indexer : ModelBase
     {
         public Boolean Enable { get; set; }
diff --git a/NzbDrone.Core/Indexers/NewznabDefinition.cs b/NzbDrone.Core/Indexers/NewznabDefinition.cs
index 2b52e2f78..9a8c373d1 100644
--- a/NzbDrone.Core/Indexers/NewznabDefinition.cs
+++ b/NzbDrone.Core/Indexers/NewznabDefinition.cs
@@ -1,11 +1,9 @@
 using System;
 using NzbDrone.Core.Datastore;
-using ServiceStack.DataAnnotations;
 
 
 namespace NzbDrone.Core.Indexers
 {
-    [Alias("NewznabDefinitions")]
     public class NewznabDefinition : ModelBase
     {
         public Boolean Enable { get; set; }
diff --git a/NzbDrone.Core/Indexers/NewznabRepository.cs b/NzbDrone.Core/Indexers/NewznabRepository.cs
index e591af314..d5f1e1f1b 100644
--- a/NzbDrone.Core/Indexers/NewznabRepository.cs
+++ b/NzbDrone.Core/Indexers/NewznabRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Core.Indexers
@@ -14,13 +10,14 @@ public interface INewznabRepository : IBasicRepository<NewznabDefinition>
 
     public class NewznabRepository : BasicRepository<NewznabDefinition>, INewznabRepository
     {
-        public NewznabRepository(IDatabase database) : base(database)
+        public NewznabRepository(IDatabase database)
+            : base(database)
         {
         }
 
         public IEnumerable<NewznabDefinition> Enabled()
         {
-            return Queryable().Where(n => n.Enabled);
+            return Queryable().Where(n => n.Enable);
         }
     }
 }
diff --git a/NzbDrone.Core/Jobs/JobDefinition.cs b/NzbDrone.Core/Jobs/JobDefinition.cs
index b17cc0f00..bd557526d 100644
--- a/NzbDrone.Core/Jobs/JobDefinition.cs
+++ b/NzbDrone.Core/Jobs/JobDefinition.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Linq;
 using NzbDrone.Core.Datastore;
-using ServiceStack.DataAnnotations;
 
 namespace NzbDrone.Core.Jobs
 {
-    [Alias("JobDefinitions")]
     public class JobDefinition : ModelBase
     {
         public Boolean Enable { get; set; }
diff --git a/NzbDrone.Core/Jobs/JobRepository.cs b/NzbDrone.Core/Jobs/JobRepository.cs
index 70185839f..84fd565c4 100644
--- a/NzbDrone.Core/Jobs/JobRepository.cs
+++ b/NzbDrone.Core/Jobs/JobRepository.cs
@@ -27,7 +27,7 @@ public JobRepository(IDatabase database, IEnumerable<IJob> jobs, Logger logger)
 
         public JobDefinition GetDefinition(Type type)
         {
-            return Queryable().Single(c => c.TypeName == type.FullName);
+            return Queryable().Single(c => c.Type == type.FullName);
         }
 
 
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 98c40be8a..859071c2a 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -132,6 +132,7 @@
     </Reference>
     <Reference Include="FluentMigrator.Runner">
       <HintPath>..\packages\FluentMigrator.1.0.6.0\tools\FluentMigrator.Runner.dll</HintPath>
+    </Reference>
     <Reference Include="FastReflection">
       <HintPath>..\packages\MarrDataMapper.3.17.4747.34302\lib\FastReflection.dll</HintPath>
     </Reference>
@@ -208,7 +209,6 @@
     <Compile Include="Datastore\Database.cs" />
     <Compile Include="Datastore\DbFactory.cs" />
     <Compile Include="Datastore\MigrationHelper.cs" />
-    <Compile Include="Datastore\Migration.cs" />
     <Compile Include="Datastore\Migrations\Migration20130324.cs" />
     <Compile Include="Datastore\Migrations\NzbDroneMigration.cs" />
     <Compile Include="Datastore\MigrationType.cs" />
@@ -602,4 +602,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/NzbDrone.Core/Qualities/QualityProfile.cs b/NzbDrone.Core/Qualities/QualityProfile.cs
index b33a6c8fa..5ec6f799f 100644
--- a/NzbDrone.Core/Qualities/QualityProfile.cs
+++ b/NzbDrone.Core/Qualities/QualityProfile.cs
@@ -1,11 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.Datastore;
-using ServiceStack.DataAnnotations;
 
 namespace NzbDrone.Core.Qualities
 {
-    [Alias("QualityProfiles")]
     public class QualityProfile : ModelBase
     {
         public string Name { get; set; }
diff --git a/NzbDrone.Core/Qualities/QualitySize.cs b/NzbDrone.Core/Qualities/QualitySize.cs
index b8521f2f1..3e9e31032 100644
--- a/NzbDrone.Core/Qualities/QualitySize.cs
+++ b/NzbDrone.Core/Qualities/QualitySize.cs
@@ -1,11 +1,9 @@
 using System.Linq;
 using NzbDrone.Core.Datastore;
-using ServiceStack.DataAnnotations;
 
 
 namespace NzbDrone.Core.Qualities
 {
-    [Alias("QualitySizes")]
     public class QualitySize : ModelBase
     {
         public int QualityId { get; set; }
diff --git a/NzbDrone.Core/ReferenceData/SceneMapping.cs b/NzbDrone.Core/ReferenceData/SceneMapping.cs
index de3ab5c92..e92d9b260 100644
--- a/NzbDrone.Core/ReferenceData/SceneMapping.cs
+++ b/NzbDrone.Core/ReferenceData/SceneMapping.cs
@@ -1,10 +1,8 @@
 using System.Linq;
 using NzbDrone.Core.Datastore;
-using ServiceStack.DataAnnotations;
 
 namespace NzbDrone.Core.ReferenceData
 {
-    [Alias("SceneMappings")]
     public class SceneMapping : ModelBase
     {
         public string CleanTitle { get; set; }
diff --git a/NzbDrone.Core/Tv/Series.cs b/NzbDrone.Core/Tv/Series.cs
index 4f900e05d..d23a80e5e 100644
--- a/NzbDrone.Core/Tv/Series.cs
+++ b/NzbDrone.Core/Tv/Series.cs
@@ -1,10 +1,8 @@
 using System.Collections.Generic;
-using System.Linq;
 using System;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Qualities;
-using ServiceStack.DataAnnotations;
 
 
 namespace NzbDrone.Core.Tv