open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'markus101'

Browse Source 
Conflicts:
	NzbDrone.Core/Datastore/Migrations/Migration.cs
pull/4/head
kay.one 13 years ago
parent f4801901a7 01944acbb1
commit f11b4af305
4 changed files with 138 additions and 125 deletions
Show Stats Download Patch File Download Diff File

4
NzbDrone.Core.Test/IndexerProviderTest.cs
Unescape View File

@ -29,7 +29,7 @@ namespace NzbDrone.Core.Test
{
var mocker = new AutoMoqer();
mocker.SetConstant(MockLib.GetEmptyRepository());
mocker.SetConstant(MockLib.GetEmptyDatabase());
//Act
var indexerProvider = mocker.Resolve<IndexerProvider>();
@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test
{
var mocker = new AutoMoqer();
mocker.SetConstant(MockLib.GetEmptyRepository());
mocker.SetConstant(MockLib.GetEmptyDatabase());
//Act
var indexerProvider = mocker.Resolve<IndexerProvider>();

42
NzbDrone.Core/Datastore/Migrations/Migration.cs
Unescape View File

@ -37,7 +37,7 @@ namespace NzbDrone.Core.Datastore.Migrations
{
public override void Up()
{
Database.AddTable("Series", "SQLite", new[]
Database.AddTable("Series", new[]
{
new Column("SeriesId", DbType.Int32, ColumnProperty.PrimaryKey),
new Column("Title", DbType.String, ColumnProperty.NotNull, String.Empty),
@ -55,7 +55,7 @@ namespace NzbDrone.Core.Datastore.Migrations
new Column("LastDiskSync", DbType.DateTime, ColumnProperty.Null)
});
Database.AddTable("Episodes", "SQLite", new[]
Database.AddTable("Episodes", new[]
{
new Column("EpisodeId", DbType.Int32, ColumnProperty.PrimaryKeyWithIdentity),
new Column("TvDbEpisodeId", DbType.Int32, ColumnProperty.Null),
@ -71,7 +71,7 @@ namespace NzbDrone.Core.Datastore.Migrations
});
Database.AddTable("EpisodeFiles", "SQLite", new[]
Database.AddTable("EpisodeFiles", new[]
{
new Column("EpisodeFileId", DbType.Int32,
ColumnProperty.PrimaryKeyWithIdentity),
@ -85,13 +85,20 @@ namespace NzbDrone.Core.Datastore.Migrations
});
Database.AddTable("Config", "SQLite", new[]
Database.AddTable("Config", new[]
{
new Column("Key", DbType.String, ColumnProperty.PrimaryKey),
new Column("Value", DbType.String, ColumnProperty.NotNull)
});
Database.AddTable("History", "SQLite", new[]
Database.AddTable("SceneMappings", new[]
{
new Column("CleanTitle", DbType.String, ColumnProperty.PrimaryKey),
new Column("SeriesId", DbType.Int32, ColumnProperty.NotNull),
new Column("SceneName", DbType.String, ColumnProperty.NotNull)
});
Database.AddTable("History", new[]
{
new Column("HistoryId", DbType.Int64, ColumnProperty.PrimaryKey),
new Column("EpisodeId", DbType.Int32, ColumnProperty.NotNull),
@ -103,23 +110,21 @@ namespace NzbDrone.Core.Datastore.Migrations
new Column("Indexer", DbType.String, ColumnProperty.NotNull)
});
Database.AddTable("RootDirs", "SQLite", new[]
Database.AddTable("RootDirs", new[]
{
new Column("Id", DbType.Int32, ColumnProperty.PrimaryKey),
new Column("Path", DbType.String, ColumnProperty.NotNull)
});
Database.AddTable("ExternalNotificationSettings", "SQLite", new[]
Database.AddTable("ExternalNotificationSettings", new[]
{
new Column("Id", DbType.Int32, ColumnProperty.PrimaryKey),
new Column("Enabled", DbType.Boolean, ColumnProperty.NotNull)
,
new Column("NotifierName", DbType.String,
ColumnProperty.NotNull),
new Column("Enabled", DbType.Boolean, ColumnProperty.NotNull),
new Column("NotifierName", DbType.String, ColumnProperty.NotNull),
new Column("Name", DbType.String, ColumnProperty.NotNull)
});
Database.AddTable("JobSettings", "SQLite", new[]
Database.AddTable("JobSettings", new[]
{
new Column("Id", DbType.Int32, ColumnProperty.PrimaryKey),
new Column("Enable", DbType.Boolean, ColumnProperty.NotNull),
@ -130,7 +135,7 @@ namespace NzbDrone.Core.Datastore.Migrations
new Column("Success", DbType.Boolean, ColumnProperty.NotNull)
});
Database.AddTable("QualityProfiles", "SQLite", new[]
Database.AddTable("QualityProfiles", new[]
{
new Column("QualityProfileId", DbType.Int32, ColumnProperty.PrimaryKey),
new Column("Name", DbType.String, ColumnProperty.NotNull),
@ -138,7 +143,7 @@ namespace NzbDrone.Core.Datastore.Migrations
new Column("SonicAllowed", DbType.String, ColumnProperty.NotNull),
});
Database.AddTable("Logs", "SQLite", new[]
Database.AddTable("Logs", new[]
{
new Column("LogId", DbType.Int64, ColumnProperty.PrimaryKey),
new Column("Message", DbType.String, ColumnProperty.NotNull),
@ -149,8 +154,15 @@ namespace NzbDrone.Core.Datastore.Migrations
new Column("ExceptionType", DbType.String, ColumnProperty.Null),
new Column("Level", DbType.String, ColumnProperty.NotNull)
});
}
Database.AddTable("IndexerSettings", new[]
{
new Column("Id", DbType.Int32, ColumnProperty.PrimaryKey),
new Column("Enable", DbType.Boolean, ColumnProperty.NotNull),
new Column("IndexProviderType", DbType.String, ColumnProperty.NotNull),
new Column("Name", DbType.String, ColumnProperty.NotNull),
});
}
public override void Down()

16
NzbDrone.Core/Providers/IndexerProvider.cs
Unescape View File

@ -5,21 +5,21 @@ using Ninject;
using NLog;
using NzbDrone.Core.Providers.Indexer;
using NzbDrone.Core.Repository;
using SubSonic.Repository;
using PetaPoco;
namespace NzbDrone.Core.Providers
{
public class IndexerProvider
{
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private readonly IRepository _repository;
private readonly IDatabase _database;
private IList<IndexerBase> _indexers = new List<IndexerBase>();
[Inject]
public IndexerProvider(IRepository repository)
public IndexerProvider(IDatabase database)
{
_repository = repository;
_database = database;
}
public IndexerProvider()
@ -35,7 +35,7 @@ namespace NzbDrone.Core.Providers
public virtual List<IndexerSetting> GetAllISettings()
{
return _repository.All<IndexerSetting>().ToList();
return _database.Fetch<IndexerSetting>();
}
public virtual void SaveSettings(IndexerSetting settings)
@ -43,18 +43,18 @@ namespace NzbDrone.Core.Providers
if (settings.Id == 0)
{
Logger.Debug("Adding Indexer settings for {0}", settings.Name);
_repository.Add(settings);
_database.Insert(settings);
}
else
{
Logger.Debug("Updating Indexer settings for {0}", settings.Name);
_repository.Update(settings);
_database.Update(settings);
}
}
public virtual IndexerSetting GetSettings(Type type)
{
return _repository.Single<IndexerSetting>(s => s.IndexProviderType == type.ToString());
return _database.Single<IndexerSetting>("WHERE IndexProviderType = @0", type.ToString());
}
public virtual void InitializeIndexers(IList<IndexerBase> indexers)

5
NzbDrone.Core/Repository/IndexerSetting.cs
Unescape View File

@ -1,11 +1,12 @@
using System;
using SubSonic.SqlGeneration.Schema;
using PetaPoco;
namespace NzbDrone.Core.Repository
{
[TableName("IndexerSettings")]
[PrimaryKey("Id", autoIncrement = true)]
public class IndexerSetting
{
[SubSonicPrimaryKey(true)]
public int Id { get; set; }
public Boolean Enable { get; set; }

Write Preview
Loading…
Cancel
Save