got basic relationships working
added support for embedded documents.
This commit is contained in:
parent
b6fc731db8
commit
fc641baab3
|
@ -124,19 +124,15 @@ _TeamCity*
|
||||||
config.xml
|
config.xml
|
||||||
nzbdrone.log*txt
|
nzbdrone.log*txt
|
||||||
UpdateLogs/
|
UpdateLogs/
|
||||||
*/Bootstrap/*.css
|
|
||||||
*//Bootstrap/*.css
|
|
||||||
*.eq
|
|
||||||
*/.idea/workspace.xml
|
*/.idea/workspace.xml
|
||||||
*workspace.xml
|
*workspace.xml
|
||||||
*.test-cache
|
*.test-cache
|
||||||
*.sqo
|
|
||||||
*.userprefs
|
*.userprefs
|
||||||
*/test-results/*
|
*/test-results/*
|
||||||
.idea/*
|
.idea/*
|
||||||
NzbDrone.Web/*
|
NzbDrone.Web/*
|
||||||
*log.txt
|
*log.txt
|
||||||
siaqodb.lic
|
|
||||||
node_modules/
|
node_modules/
|
||||||
|
UpgradeLog*.htm
|
||||||
NzbDrone.Backbone/templates.js
|
NzbDrone.Backbone/templates.js
|
||||||
NzbDrone.Backbone/Content/bootstrap.css
|
NzbDrone.Backbone/Content/bootstrap.css
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -60,9 +60,9 @@
|
||||||
<Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
|
<Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
|
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
<Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
<HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Moq">
|
<Reference Include="Moq">
|
||||||
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
|
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Autofac" version="3.0.1" targetFramework="net40" />
|
<package id="Autofac" version="3.0.1" targetFramework="net40" />
|
||||||
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
|
<package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
|
||||||
<package id="Moq" version="4.0.10827" />
|
<package id="Moq" version="4.0.10827" />
|
||||||
<package id="NBuilder" version="3.0.1.1" />
|
<package id="NBuilder" version="3.0.1.1" />
|
||||||
<package id="NLog" version="2.0.0.2000" />
|
<package id="NLog" version="2.0.0.2000" />
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
<component name="DependencyValidationManager">
|
||||||
|
<state>
|
||||||
|
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
|
||||||
|
</state>
|
||||||
|
</component>
|
|
@ -61,9 +61,9 @@
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
|
<HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
<Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
<HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Moq">
|
<Reference Include="Moq">
|
||||||
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
|
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Autofac" version="3.0.1" targetFramework="net40" />
|
<package id="Autofac" version="3.0.1" targetFramework="net40" />
|
||||||
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
|
<package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
|
||||||
<package id="Moq" version="4.0.10827" />
|
<package id="Moq" version="4.0.10827" />
|
||||||
<package id="NLog" version="2.0.0.2000" />
|
<package id="NLog" version="2.0.0.2000" />
|
||||||
<package id="NUnit" version="2.6.2" targetFramework="net40" />
|
<package id="NUnit" version="2.6.2" targetFramework="net40" />
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\x86\*.*" "$(TargetDir)"</PostBuildEvent>
|
<PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*" "$(TargetDir)"</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|
|
@ -0,0 +1,97 @@
|
||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using FizzWare.NBuilder;
|
||||||
|
using FluentAssertions;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using NzbDrone.Core.Datastore;
|
||||||
|
using NzbDrone.Core.Test.Framework;
|
||||||
|
using NzbDrone.Core.Tv;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Test.Datastore
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class DatabaseJoinFixture : DbTest<BasicRepository<Series>, Series>
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
[Explicit]
|
||||||
|
public void benchmark()
|
||||||
|
{
|
||||||
|
var series = Builder<Series>.CreateNew()
|
||||||
|
.With(c => c.Id = 0)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
Marr.Data.MapRepository.Instance.EnableTraceLogging = false;
|
||||||
|
|
||||||
|
Subject.Insert(series);
|
||||||
|
|
||||||
|
var covers = Builder<MediaCover.MediaCover>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(c => c.SeriesId = series.Id)
|
||||||
|
.With(c => c.Id = 0)
|
||||||
|
.Build()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
Db.InsertMany(covers);
|
||||||
|
|
||||||
|
var loadedSeries = Subject.SingleOrDefault();
|
||||||
|
|
||||||
|
var sw = Stopwatch.StartNew();
|
||||||
|
for (int i = 0; i < 10000; i++)
|
||||||
|
{
|
||||||
|
loadedSeries = Subject.SingleOrDefault();
|
||||||
|
var list = loadedSeries.Covers.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
sw.Stop();
|
||||||
|
|
||||||
|
Console.WriteLine(sw.Elapsed);
|
||||||
|
|
||||||
|
loadedSeries.Covers.Value.Should().HaveSameCount(covers);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void one_to_many()
|
||||||
|
{
|
||||||
|
var series = Builder<Series>.CreateNew()
|
||||||
|
.With(c => c.Id = 0)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
Subject.Insert(series);
|
||||||
|
|
||||||
|
var covers = Builder<MediaCover.MediaCover>.CreateListOfSize(5)
|
||||||
|
.All()
|
||||||
|
.With(c => c.SeriesId = series.Id)
|
||||||
|
.With(c => c.Id = 0)
|
||||||
|
.Build()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
Db.InsertMany(covers);
|
||||||
|
|
||||||
|
var loadedSeries = Subject.SingleOrDefault();
|
||||||
|
loadedSeries = Subject.SingleOrDefault();
|
||||||
|
|
||||||
|
loadedSeries.Covers.Value.Should().HaveSameCount(covers);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void embeded_document_as_json()
|
||||||
|
{
|
||||||
|
var episode = Builder<Episode>.CreateNew()
|
||||||
|
.With(c => c.Id = 0)
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
Db.Insert(episode);
|
||||||
|
|
||||||
|
|
||||||
|
var history = Builder<History.History>.CreateNew()
|
||||||
|
.With(c => c.Id = 0)
|
||||||
|
.With(c => c.EpisodeId = episode.Id)
|
||||||
|
.With(c => c.Quality = new QualityModel())
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
Db.Insert(history);
|
||||||
|
Db.Single<History.History>().Episode.Value.Should().NotBeNull();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -124,6 +124,7 @@ namespace NzbDrone.Core.Test.Framework
|
||||||
void InsertMany<T>(IEnumerable<T> items) where T : ModelBase, new();
|
void InsertMany<T>(IEnumerable<T> items) where T : ModelBase, new();
|
||||||
void Insert<T>(T item) where T : ModelBase, new();
|
void Insert<T>(T item) where T : ModelBase, new();
|
||||||
IEnumerable<T> All<T>() where T : ModelBase, new();
|
IEnumerable<T> All<T>() where T : ModelBase, new();
|
||||||
|
T Single<T>() where T : ModelBase, new();
|
||||||
void Update<T>(T childModel) where T : ModelBase, new();
|
void Update<T>(T childModel) where T : ModelBase, new();
|
||||||
void Delete<T>(T childModel) where T : ModelBase, new();
|
void Delete<T>(T childModel) where T : ModelBase, new();
|
||||||
}
|
}
|
||||||
|
@ -152,6 +153,11 @@ namespace NzbDrone.Core.Test.Framework
|
||||||
return new BasicRepository<T>(_dbConnection).All();
|
return new BasicRepository<T>(_dbConnection).All();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public T Single<T>() where T : ModelBase, new()
|
||||||
|
{
|
||||||
|
return All<T>().SingleOrDefault();
|
||||||
|
}
|
||||||
|
|
||||||
public void Update<T>(T childModel) where T : ModelBase, new()
|
public void Update<T>(T childModel) where T : ModelBase, new()
|
||||||
{
|
{
|
||||||
new BasicRepository<T>(_dbConnection).Update(childModel);
|
new BasicRepository<T>(_dbConnection).Update(childModel);
|
||||||
|
|
|
@ -73,12 +73,13 @@
|
||||||
<Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
|
<Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
|
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
<Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
<HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Marr.Data">
|
<Reference Include="Marr.Data">
|
||||||
<HintPath>..\packages\MarrDataMapper.3.17.4747.34302\lib\Marr.Data.dll</HintPath>
|
<HintPath>..\packages\MarrDataMapper.3.17.4747.34302\lib\Marr.Data.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="FluentMigrator">
|
<Reference Include="FluentMigrator">
|
||||||
<HintPath>..\packages\FluentMigrator.1.0.6.0\lib\40\FluentMigrator.dll</HintPath>
|
<HintPath>..\packages\FluentMigrator.1.0.6.0\lib\40\FluentMigrator.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
@ -128,6 +129,13 @@
|
||||||
<Reference Include="System.Configuration" />
|
<Reference Include="System.Configuration" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
<Reference Include="System.Data.Entity" />
|
<Reference Include="System.Data.Entity" />
|
||||||
|
<Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Data.SQLite.Linq">
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.ServiceModel" />
|
<Reference Include="System.ServiceModel" />
|
||||||
<Reference Include="System.Transactions" />
|
<Reference Include="System.Transactions" />
|
||||||
|
@ -136,6 +144,7 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Datastore\BasicRepositoryFixture.cs" />
|
<Compile Include="Datastore\BasicRepositoryFixture.cs" />
|
||||||
|
<Compile Include="Datastore\DatabaseJoinFixture.cs" />
|
||||||
<Compile Include="Datastore\ObjectDatabaseFixture.cs" />
|
<Compile Include="Datastore\ObjectDatabaseFixture.cs" />
|
||||||
<Compile Include="Framework\CoreTest.cs" />
|
<Compile Include="Framework\CoreTest.cs" />
|
||||||
<Compile Include="Framework\DbTest.cs" />
|
<Compile Include="Framework\DbTest.cs" />
|
||||||
|
@ -404,7 +413,7 @@
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\x86\*.*" "$(TargetDir)"</PostBuildEvent>
|
<PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*" "$(TargetDir)"</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|
|
@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.ProviderTests.TvRageMappingProviderTests
|
||||||
.Setup(s => s.GetEpisode(_series.Id, 1, 1))
|
.Setup(s => s.GetEpisode(_series.Id, 1, 1))
|
||||||
.Returns(_episode);
|
.Returns(_episode);
|
||||||
|
|
||||||
Mocker.GetMock<SceneMappingService>()
|
Mocker.GetMock<ISceneMappingService>()
|
||||||
.Setup(s => s.GetCleanName(_series.Id))
|
.Setup(s => s.GetCleanName(_series.Id))
|
||||||
.Returns("");
|
.Returns("");
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<package id="Autofac" version="3.0.1" targetFramework="net40" />
|
<package id="Autofac" version="3.0.1" targetFramework="net40" />
|
||||||
<package id="AutoMoq" version="1.6.1" targetFramework="net40" />
|
<package id="AutoMoq" version="1.6.1" targetFramework="net40" />
|
||||||
<package id="CommonServiceLocator" version="1.0" targetFramework="net40" />
|
<package id="CommonServiceLocator" version="1.0" targetFramework="net40" />
|
||||||
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
|
<package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
|
||||||
<package id="FluentMigrator" version="1.0.6.0" targetFramework="net40" />
|
<package id="FluentMigrator" version="1.0.6.0" targetFramework="net40" />
|
||||||
<package id="Moq" version="4.0.10827" />
|
<package id="Moq" version="4.0.10827" />
|
||||||
<package id="NBuilder" version="3.0.1.1" />
|
<package id="NBuilder" version="3.0.1.1" />
|
||||||
|
@ -13,5 +13,6 @@
|
||||||
<package id="NUnit" version="2.6.2" targetFramework="net40" />
|
<package id="NUnit" version="2.6.2" targetFramework="net40" />
|
||||||
<package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
|
<package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
|
||||||
<package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
|
<package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
|
||||||
|
<package id="System.Data.SQLite" version="1.0.84.0" targetFramework="net40" />
|
||||||
<package id="Unity" version="2.1.505.2" targetFramework="net40" />
|
<package id="Unity" version="2.1.505.2" targetFramework="net40" />
|
||||||
</packages>
|
</packages>
|
|
@ -0,0 +1,48 @@
|
||||||
|
using System;
|
||||||
|
using Marr.Data.Converters;
|
||||||
|
using Marr.Data.Mapping;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore.Converters
|
||||||
|
{
|
||||||
|
public class EmbeddedDocumentConverter : IConverter
|
||||||
|
{
|
||||||
|
public object FromDB(ColumnMap map, object dbValue)
|
||||||
|
{
|
||||||
|
if (dbValue == DBNull.Value)
|
||||||
|
{
|
||||||
|
return DBNull.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
var stringValue = (string)dbValue;
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(stringValue))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return JsonConvert.DeserializeObject(stringValue, map.FieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ToDB(object clrValue)
|
||||||
|
{
|
||||||
|
if (clrValue == null) return null;
|
||||||
|
|
||||||
|
if (clrValue as IEmbeddedDocument == null)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Attempted to embedded an object not marked with IEmbeddedDocument");
|
||||||
|
}
|
||||||
|
|
||||||
|
var json = JsonConvert.SerializeObject(clrValue);
|
||||||
|
return json;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Type DbType
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return typeof(string);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Data;
|
||||||
|
using System.Data.SQLite;
|
||||||
using Marr.Data;
|
using Marr.Data;
|
||||||
using Mono.Data.Sqlite;
|
|
||||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
|
|
||||||
|
@ -26,7 +27,7 @@ namespace NzbDrone.Core.Datastore
|
||||||
var connectionString = GetConnectionString(dbPath);
|
var connectionString = GetConnectionString(dbPath);
|
||||||
|
|
||||||
_migrationController.MigrateToLatest(connectionString, migrationType);
|
_migrationController.MigrateToLatest(connectionString, migrationType);
|
||||||
var dataMapper = new DataMapper(SqliteFactory.Instance, connectionString)
|
var dataMapper = new DataMapper(SQLiteFactory.Instance, connectionString)
|
||||||
{
|
{
|
||||||
SqlMode = SqlModes.Text,
|
SqlMode = SqlModes.Text,
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
using System;
|
||||||
|
using Marr.Data.Converters;
|
||||||
|
using Marr.Data.Mapping;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore
|
||||||
|
{
|
||||||
|
public class EnumIntConverter : IConverter
|
||||||
|
{
|
||||||
|
public Type DbType
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return typeof(int);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public object FromDB(ColumnMap map, object dbValue)
|
||||||
|
{
|
||||||
|
if (dbValue != null && dbValue != DBNull.Value)
|
||||||
|
{
|
||||||
|
return Enum.ToObject(map.FieldType, (Int64)dbValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ToDB(object clrValue)
|
||||||
|
{
|
||||||
|
if (clrValue != null)
|
||||||
|
{
|
||||||
|
return (int)clrValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
return DBNull.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
namespace NzbDrone.Core.Datastore
|
||||||
|
{
|
||||||
|
public interface IEmbeddedDocument
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Marr.Data;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore
|
||||||
|
{
|
||||||
|
public class LazyList<T> : LazyLoaded<List<T>>
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using FluentMigrator.Runner;
|
using FluentMigrator.Runner;
|
||||||
using FluentMigrator.Runner.Initialization;
|
using FluentMigrator.Runner.Initialization;
|
||||||
using NzbDrone.Core.Datastore.Migration.Sqlite;
|
using FluentMigrator.Runner.Processors.Sqlite;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Datastore.Migration.Framework
|
namespace NzbDrone.Core.Datastore.Migration.Framework
|
||||||
{
|
{
|
||||||
|
@ -30,7 +30,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
||||||
};
|
};
|
||||||
|
|
||||||
var options = new MigrationOptions { PreviewOnly = false, Timeout = 60 };
|
var options = new MigrationOptions { PreviewOnly = false, Timeout = 60 };
|
||||||
var factory = new MonoSqliteProcessorFactory();
|
var factory = new SqliteProcessorFactory();
|
||||||
var processor = factory.Create(connectionString, _announcer, options);
|
var processor = factory.Create(connectionString, _announcer, options);
|
||||||
var runner = new MigrationRunner(assembly, migrationContext, processor);
|
var runner = new MigrationRunner(assembly, migrationContext, processor);
|
||||||
runner.MigrateUp(true);
|
runner.MigrateUp(true);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
using FluentMigrator;
|
using FluentMigrator;
|
||||||
using NzbDrone.Core.Datastore.Migration.Framework;
|
using NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Datastore.Migration
|
namespace NzbDrone.Core.Datastore.Migration
|
||||||
{
|
{
|
||||||
|
@ -28,7 +28,7 @@ namespace NzbDrone.Core.Datastore.Migration
|
||||||
|
|
||||||
Create.Table("Episodes")
|
Create.Table("Episodes")
|
||||||
.WithColumn("Id").AsInt32().PrimaryKey().Identity()
|
.WithColumn("Id").AsInt32().PrimaryKey().Identity()
|
||||||
.WithColumn("TvdbId").AsInt32().Nullable()
|
.WithColumn("TvDbEpisodeId").AsInt32().Nullable()
|
||||||
.WithColumn("SeriesId").AsInt32().NotNullable()
|
.WithColumn("SeriesId").AsInt32().NotNullable()
|
||||||
.WithColumn("SeasonNumber").AsInt32().NotNullable()
|
.WithColumn("SeasonNumber").AsInt32().NotNullable()
|
||||||
.WithColumn("EpisodeNumber").AsInt32().NotNullable()
|
.WithColumn("EpisodeNumber").AsInt32().NotNullable()
|
||||||
|
@ -56,8 +56,7 @@ namespace NzbDrone.Core.Datastore.Migration
|
||||||
.WithColumn("SeriesId").AsInt32().NotNullable()
|
.WithColumn("SeriesId").AsInt32().NotNullable()
|
||||||
.WithColumn("NzbTitle").AsString().NotNullable()
|
.WithColumn("NzbTitle").AsString().NotNullable()
|
||||||
.WithColumn("Date").AsDateTime().NotNullable()
|
.WithColumn("Date").AsDateTime().NotNullable()
|
||||||
.WithColumn("Quality").AsInt32().NotNullable()
|
.WithColumn("Quality").AsString().NotNullable()
|
||||||
.WithColumn("Proper").AsBoolean().NotNullable()
|
|
||||||
.WithColumn("Indexer").AsString().NotNullable()
|
.WithColumn("Indexer").AsString().NotNullable()
|
||||||
.WithColumn("NzbInfoUrl").AsString().Nullable()
|
.WithColumn("NzbInfoUrl").AsString().Nullable()
|
||||||
.WithColumn("ReleaseGroup").AsString().Nullable();
|
.WithColumn("ReleaseGroup").AsString().Nullable();
|
||||||
|
@ -131,7 +130,6 @@ namespace NzbDrone.Core.Datastore.Migration
|
||||||
.WithColumn("LastInfoSync").AsDateTime().Nullable()
|
.WithColumn("LastInfoSync").AsDateTime().Nullable()
|
||||||
.WithColumn("LastDiskSync").AsDateTime().Nullable()
|
.WithColumn("LastDiskSync").AsDateTime().Nullable()
|
||||||
.WithColumn("Runtime").AsInt32().NotNullable()
|
.WithColumn("Runtime").AsInt32().NotNullable()
|
||||||
.WithColumn("BannerUrl").AsString().NotNullable()
|
|
||||||
.WithColumn("SeriesType").AsInt32().NotNullable()
|
.WithColumn("SeriesType").AsInt32().NotNullable()
|
||||||
.WithColumn("BacklogSetting").AsInt32().NotNullable()
|
.WithColumn("BacklogSetting").AsInt32().NotNullable()
|
||||||
.WithColumn("Network").AsString().NotNullable()
|
.WithColumn("Network").AsString().NotNullable()
|
||||||
|
@ -140,7 +138,14 @@ namespace NzbDrone.Core.Datastore.Migration
|
||||||
.WithColumn("TvRageId").AsInt32().Nullable()
|
.WithColumn("TvRageId").AsInt32().Nullable()
|
||||||
.WithColumn("TvRageTitle").AsString().NotNullable()
|
.WithColumn("TvRageTitle").AsString().NotNullable()
|
||||||
.WithColumn("UtcOffSet").AsInt32().NotNullable()
|
.WithColumn("UtcOffSet").AsInt32().NotNullable()
|
||||||
.WithColumn("FirstAired").AsDateTime().Nullable();
|
.WithColumn("FirstAired").AsDateTime().Nullable()
|
||||||
|
.WithColumn("NextAiring").AsDateTime().Nullable();
|
||||||
|
|
||||||
|
Create.Table("MediaCovers")
|
||||||
|
.WithColumn("Id").AsInt32().PrimaryKey().Identity()
|
||||||
|
.WithColumn("SeriesId").AsInt32().NotNullable()
|
||||||
|
.WithColumn("Url").AsString().NotNullable()
|
||||||
|
.WithColumn("CoverType").AsInt32().NotNullable();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void LogDbUpgrade()
|
protected override void LogDbUpgrade()
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using FluentMigrator.Runner.Processors;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Datastore.Migration.Sqlite
|
|
||||||
{
|
|
||||||
public class MonoSqliteDbFactory : ReflectionBasedDbFactory
|
|
||||||
{
|
|
||||||
public MonoSqliteDbFactory()
|
|
||||||
: base("Mono.Data.Sqlite", "Mono.Data.Sqlite.SqliteFactory")
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,18 +0,0 @@
|
||||||
using FluentMigrator;
|
|
||||||
using FluentMigrator.Runner;
|
|
||||||
using FluentMigrator.Runner.Generators.SQLite;
|
|
||||||
using FluentMigrator.Runner.Processors;
|
|
||||||
using FluentMigrator.Runner.Processors.Sqlite;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Datastore.Migration.Sqlite
|
|
||||||
{
|
|
||||||
public class MonoSqliteProcessorFactory : MigrationProcessorFactory
|
|
||||||
{
|
|
||||||
public override IMigrationProcessor Create(string connectionString, IAnnouncer announcer, IMigrationProcessorOptions options)
|
|
||||||
{
|
|
||||||
var factory = new MonoSqliteDbFactory();
|
|
||||||
var connection = factory.CreateConnection(connectionString);
|
|
||||||
return new SqliteProcessor(connection, new SqliteGenerator(), announcer, options, factory);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,4 +1,5 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Reflection;
|
||||||
using Marr.Data;
|
using Marr.Data;
|
||||||
using Marr.Data.Mapping;
|
using Marr.Data.Mapping;
|
||||||
using NzbDrone.Core.Configuration;
|
using NzbDrone.Core.Configuration;
|
||||||
|
@ -13,6 +14,7 @@ using NzbDrone.Core.ReferenceData;
|
||||||
using NzbDrone.Core.RootFolders;
|
using NzbDrone.Core.RootFolders;
|
||||||
using NzbDrone.Core.Tv;
|
using NzbDrone.Core.Tv;
|
||||||
using BooleanIntConverter = NzbDrone.Core.Datastore.Converters.BooleanIntConverter;
|
using BooleanIntConverter = NzbDrone.Core.Datastore.Converters.BooleanIntConverter;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Datastore
|
namespace NzbDrone.Core.Datastore
|
||||||
{
|
{
|
||||||
|
@ -35,12 +37,21 @@ namespace NzbDrone.Core.Datastore
|
||||||
|
|
||||||
Mapper.Entity<SceneMapping>().RegisterModel("SceneMappings");
|
Mapper.Entity<SceneMapping>().RegisterModel("SceneMappings");
|
||||||
|
|
||||||
Mapper.Entity<History.History>().RegisterModel("History");
|
Mapper.Entity<History.History>().RegisterModel("History")
|
||||||
|
.Relationships.AutoMapComplexTypeProperties<ILazyLoaded>()
|
||||||
|
.For(c => c.Episode)
|
||||||
|
.LazyLoad((db, history) => db.Query<Episode>().Where(ep => ep.Id == history.Id).ToList());
|
||||||
|
|
||||||
|
Mapper.Entity<Series>().RegisterModel("Series")
|
||||||
|
.Relationships.AutoMapComplexTypeProperties<ILazyLoaded>()
|
||||||
|
.For(c => c.Covers)
|
||||||
|
.LazyLoad((db, series) => db.Query<MediaCover.MediaCover>().Where(cover => cover.SeriesId == series.Id).ToList());
|
||||||
|
|
||||||
|
|
||||||
Mapper.Entity<Series>().RegisterModel("Series");
|
|
||||||
Mapper.Entity<Season>().RegisterModel("Seasons");
|
Mapper.Entity<Season>().RegisterModel("Seasons");
|
||||||
Mapper.Entity<Episode>().RegisterModel("Episodes");
|
Mapper.Entity<Episode>().RegisterModel("Episodes");
|
||||||
Mapper.Entity<EpisodeFile>().RegisterModel("EpisodeFiles");
|
Mapper.Entity<EpisodeFile>().RegisterModel("EpisodeFiles");
|
||||||
|
Mapper.Entity<MediaCover.MediaCover>().RegisterModel("MediaCovers");
|
||||||
|
|
||||||
Mapper.Entity<QualityProfile>().RegisterModel("QualityProfiles");
|
Mapper.Entity<QualityProfile>().RegisterModel("QualityProfiles");
|
||||||
Mapper.Entity<QualitySize>().RegisterModel("QualitySizes");
|
Mapper.Entity<QualitySize>().RegisterModel("QualitySizes");
|
||||||
|
@ -53,19 +64,48 @@ namespace NzbDrone.Core.Datastore
|
||||||
{
|
{
|
||||||
MapRepository.Instance.RegisterTypeConverter(typeof(Int32), new Int32Converter());
|
MapRepository.Instance.RegisterTypeConverter(typeof(Int32), new Int32Converter());
|
||||||
MapRepository.Instance.RegisterTypeConverter(typeof(Boolean), new BooleanIntConverter());
|
MapRepository.Instance.RegisterTypeConverter(typeof(Boolean), new BooleanIntConverter());
|
||||||
|
MapRepository.Instance.RegisterTypeConverter(typeof(Enum), new EnumIntConverter());
|
||||||
|
MapRepository.Instance.RegisterTypeConverter(typeof(QualityModel), new EmbeddedDocumentConverter());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void RegisterModel<T>(this FluentMappings.MappingsFluentEntity<T> mapBuilder, string tableName) where T : ModelBase
|
private static ColumnMapBuilder<T> RegisterModel<T>(this FluentMappings.MappingsFluentEntity<T> mapBuilder, string tableName) where T : ModelBase
|
||||||
{
|
{
|
||||||
mapBuilder.Table.MapTable(tableName)
|
return mapBuilder.Table.MapTable(tableName)
|
||||||
.Columns
|
.Columns
|
||||||
.AutoMapSimpleTypeProperties()
|
.AutoMapPropertiesWhere(IsMappableProperty)
|
||||||
.For(c => c.Id)
|
.For(c => c.Id)
|
||||||
.SetPrimaryKey()
|
.SetPrimaryKey()
|
||||||
.SetReturnValue()
|
.SetReturnValue()
|
||||||
.SetAutoIncrement();
|
.SetAutoIncrement();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool IsMappableProperty(MemberInfo memberInfo)
|
||||||
|
{
|
||||||
|
var propertyInfo = memberInfo as PropertyInfo;
|
||||||
|
|
||||||
|
if (propertyInfo == null) return false;
|
||||||
|
|
||||||
|
if (propertyInfo.PropertyType.GetInterfaces().Any(i => i == typeof(IEmbeddedDocument)))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return propertyInfo.CanRead && propertyInfo.CanWrite && IsSimpleType(propertyInfo.PropertyType);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsSimpleType(Type type)
|
||||||
|
{
|
||||||
|
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
|
||||||
|
{
|
||||||
|
type = type.GetGenericArguments()[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
return type.IsPrimitive
|
||||||
|
|| type.IsEnum
|
||||||
|
|| type == typeof(string)
|
||||||
|
|| type == typeof(DateTime)
|
||||||
|
|| type == typeof(Decimal);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,14 +1,10 @@
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Common;
|
using NzbDrone.Common;
|
||||||
using NzbDrone.Core.Configuration;
|
using NzbDrone.Core.Configuration;
|
||||||
using NzbDrone.Core.DecisionEngine.Specifications;
|
using NzbDrone.Core.DecisionEngine.Specifications;
|
||||||
using NzbDrone.Core.History;
|
|
||||||
using NzbDrone.Core.MediaFiles;
|
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.DecisionEngine;
|
|
||||||
using NzbDrone.Core.Organizer;
|
using NzbDrone.Core.Organizer;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Download.Clients
|
namespace NzbDrone.Core.Download.Clients
|
||||||
|
|
|
@ -17,21 +17,15 @@ namespace NzbDrone.Core.Download.Clients
|
||||||
private readonly IConfigService _configService;
|
private readonly IConfigService _configService;
|
||||||
private readonly HttpProvider _httpProvider;
|
private readonly HttpProvider _httpProvider;
|
||||||
private readonly DiskProvider _diskProvider;
|
private readonly DiskProvider _diskProvider;
|
||||||
private readonly UpgradeHistorySpecification _upgradeHistorySpecification;
|
|
||||||
|
|
||||||
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
public PneumaticProvider(IConfigService configService, HttpProvider httpProvider,
|
public PneumaticProvider(IConfigService configService, HttpProvider httpProvider,
|
||||||
DiskProvider diskProvider, UpgradeHistorySpecification upgradeHistorySpecification)
|
DiskProvider diskProvider)
|
||||||
{
|
{
|
||||||
_configService = configService;
|
_configService = configService;
|
||||||
_httpProvider = httpProvider;
|
_httpProvider = httpProvider;
|
||||||
_diskProvider = diskProvider;
|
_diskProvider = diskProvider;
|
||||||
_upgradeHistorySpecification = upgradeHistorySpecification;
|
|
||||||
}
|
|
||||||
|
|
||||||
public PneumaticProvider()
|
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual bool DownloadNzb(string url, string title, bool recentlyAired)
|
public virtual bool DownloadNzb(string url, string title, bool recentlyAired)
|
||||||
|
@ -76,7 +70,7 @@ namespace NzbDrone.Core.Download.Clients
|
||||||
|
|
||||||
public virtual bool IsInQueue(EpisodeParseResult newParseResult)
|
public virtual bool IsInQueue(EpisodeParseResult newParseResult)
|
||||||
{
|
{
|
||||||
return !_upgradeHistorySpecification.IsSatisfiedBy(newParseResult);
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
using System.Linq;
|
using System;
|
||||||
using System;
|
using Marr.Data;
|
||||||
using NzbDrone.Core.Datastore;
|
using NzbDrone.Core.Datastore;
|
||||||
using NzbDrone.Core.Tv;
|
using NzbDrone.Core.Tv;
|
||||||
|
|
||||||
|
@ -8,6 +8,7 @@ namespace NzbDrone.Core.History
|
||||||
public class History : ModelBase
|
public class History : ModelBase
|
||||||
{
|
{
|
||||||
public int EpisodeId { get; set; }
|
public int EpisodeId { get; set; }
|
||||||
|
public int SeriesId { get; set; }
|
||||||
public string NzbTitle { get; set; }
|
public string NzbTitle { get; set; }
|
||||||
public QualityModel Quality { get; set; }
|
public QualityModel Quality { get; set; }
|
||||||
public DateTime Date { get; set; }
|
public DateTime Date { get; set; }
|
||||||
|
@ -15,5 +16,6 @@ namespace NzbDrone.Core.History
|
||||||
public string NzbInfoUrl { get; set; }
|
public string NzbInfoUrl { get; set; }
|
||||||
public string ReleaseGroup { get; set; }
|
public string ReleaseGroup { get; set; }
|
||||||
|
|
||||||
|
public LazyLoaded<Episode> Episode { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using NzbDrone.Core.Datastore;
|
||||||
|
|
||||||
namespace NzbDrone.Core.MediaCover
|
namespace NzbDrone.Core.MediaCover
|
||||||
{
|
{
|
||||||
|
@ -10,9 +11,10 @@ namespace NzbDrone.Core.MediaCover
|
||||||
Fanart = 2
|
Fanart = 2
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MediaCover
|
public class MediaCover : ModelBase
|
||||||
{
|
{
|
||||||
public MediaCoverTypes CoverType { get; set; }
|
public MediaCoverTypes CoverType { get; set; }
|
||||||
public string Url { get; set; }
|
public string Url { get; set; }
|
||||||
|
public int SeriesId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -37,7 +37,7 @@ namespace NzbDrone.Core.MediaCover
|
||||||
|
|
||||||
private void EnsureCovers(Series series)
|
private void EnsureCovers(Series series)
|
||||||
{
|
{
|
||||||
foreach (var cover in series.Covers)
|
foreach (var cover in series.Covers.Value)
|
||||||
{
|
{
|
||||||
var fileName = GetCoverPath(series.Id, cover.CoverType);
|
var fileName = GetCoverPath(series.Id, cover.CoverType);
|
||||||
if (!_diskProvider.FileExists(fileName))
|
if (!_diskProvider.FileExists(fileName))
|
||||||
|
|
|
@ -3,6 +3,7 @@ using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using NLog;
|
using NLog;
|
||||||
|
using NzbDrone.Core.Datastore;
|
||||||
using NzbDrone.Core.MediaCover;
|
using NzbDrone.Core.MediaCover;
|
||||||
using NzbDrone.Core.Tv;
|
using NzbDrone.Core.Tv;
|
||||||
using NzbDrone.Common;
|
using NzbDrone.Common;
|
||||||
|
@ -55,7 +56,7 @@ namespace NzbDrone.Core.MetadataSource
|
||||||
series.Title = tvDbSeries.SeriesName;
|
series.Title = tvDbSeries.SeriesName;
|
||||||
series.AirTime = CleanAirsTime(tvDbSeries.Airs_Time);
|
series.AirTime = CleanAirsTime(tvDbSeries.Airs_Time);
|
||||||
series.Overview = tvDbSeries.Overview;
|
series.Overview = tvDbSeries.Overview;
|
||||||
series.Status = tvDbSeries.Status == "Continuing" ? SeriesStatusType.Continuing : SeriesStatusType.Ended ;
|
series.Status = tvDbSeries.Status == "Continuing" ? SeriesStatusType.Continuing : SeriesStatusType.Ended;
|
||||||
series.Language = tvDbSeries.Language ?? string.Empty;
|
series.Language = tvDbSeries.Language ?? string.Empty;
|
||||||
series.CleanTitle = Parser.NormalizeTitle(tvDbSeries.SeriesName);
|
series.CleanTitle = Parser.NormalizeTitle(tvDbSeries.SeriesName);
|
||||||
series.LastInfoSync = DateTime.Now;
|
series.LastInfoSync = DateTime.Now;
|
||||||
|
@ -65,21 +66,20 @@ namespace NzbDrone.Core.MetadataSource
|
||||||
series.Runtime = Convert.ToInt32(tvDbSeries.Runtime);
|
series.Runtime = Convert.ToInt32(tvDbSeries.Runtime);
|
||||||
}
|
}
|
||||||
|
|
||||||
series.Covers = new List<MediaCover.MediaCover>();
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(tvDbSeries.banner))
|
if (!string.IsNullOrWhiteSpace(tvDbSeries.banner))
|
||||||
{
|
{
|
||||||
series.Covers.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = tvDbSeries.banner });
|
series.Covers.Value.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = tvDbSeries.banner, SeriesId = series.Id });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(tvDbSeries.fanart))
|
if (!string.IsNullOrWhiteSpace(tvDbSeries.fanart))
|
||||||
{
|
{
|
||||||
series.Covers.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = tvDbSeries.fanart });
|
series.Covers.Value.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = tvDbSeries.fanart, SeriesId = series.Id });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(tvDbSeries.poster))
|
if (!string.IsNullOrWhiteSpace(tvDbSeries.poster))
|
||||||
{
|
{
|
||||||
series.Covers.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = tvDbSeries.poster });
|
series.Covers.Value.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = tvDbSeries.poster, SeriesId = series.Id });
|
||||||
}
|
}
|
||||||
|
|
||||||
series.Network = tvDbSeries.Network;
|
series.Network = tvDbSeries.Network;
|
||||||
|
|
|
@ -152,10 +152,6 @@
|
||||||
<HintPath>..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll</HintPath>
|
<HintPath>..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
<Reference Include="Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
|
|
||||||
<SpecificVersion>False</SpecificVersion>
|
|
||||||
<HintPath>..\Libraries\Sqlite\Mono.Data.Sqlite.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
|
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
|
||||||
|
@ -179,6 +175,14 @@
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
<Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System.Data.SQLite.Linq, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="System.Drawing" />
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.ServiceModel" />
|
<Reference Include="System.ServiceModel" />
|
||||||
<Reference Include="System.Web" />
|
<Reference Include="System.Web" />
|
||||||
|
@ -200,16 +204,18 @@
|
||||||
<Compile Include="ContainerExtensions.cs" />
|
<Compile Include="ContainerExtensions.cs" />
|
||||||
<Compile Include="Datastore\Converters\BooleanIntConverter.cs" />
|
<Compile Include="Datastore\Converters\BooleanIntConverter.cs" />
|
||||||
<Compile Include="Datastore\Converters\Int32Converter.cs" />
|
<Compile Include="Datastore\Converters\Int32Converter.cs" />
|
||||||
|
<Compile Include="Datastore\Converters\EmbeddedDocumentConverter.cs" />
|
||||||
<Compile Include="Datastore\Database.cs" />
|
<Compile Include="Datastore\Database.cs" />
|
||||||
<Compile Include="Datastore\DbFactory.cs" />
|
<Compile Include="Datastore\DbFactory.cs" />
|
||||||
|
<Compile Include="Datastore\EnumIntConverter.cs" />
|
||||||
|
<Compile Include="Datastore\IEmbeddedDocument.cs" />
|
||||||
|
<Compile Include="Datastore\LazyList.cs" />
|
||||||
<Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
|
<Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
|
||||||
<Compile Include="Datastore\Migration\Framework\MigrationOptions.cs" />
|
<Compile Include="Datastore\Migration\Framework\MigrationOptions.cs" />
|
||||||
<Compile Include="Datastore\Migration\Framework\NlogAnnouncer.cs" />
|
<Compile Include="Datastore\Migration\Framework\NlogAnnouncer.cs" />
|
||||||
<Compile Include="Datastore\Migration\Migration20130324.cs" />
|
<Compile Include="Datastore\Migration\Migration20130324.cs" />
|
||||||
<Compile Include="Datastore\Migration\Framework\NzbDroneMigrationBase.cs" />
|
<Compile Include="Datastore\Migration\Framework\NzbDroneMigrationBase.cs" />
|
||||||
<Compile Include="Datastore\MigrationType.cs" />
|
<Compile Include="Datastore\MigrationType.cs" />
|
||||||
<Compile Include="Datastore\Migration\Sqlite\MonoSqliteDbFactory.cs" />
|
|
||||||
<Compile Include="Datastore\Migration\Sqlite\MonoSqliteProcessorFactory.cs" />
|
|
||||||
<Compile Include="Datastore\ModelBase.cs" />
|
<Compile Include="Datastore\ModelBase.cs" />
|
||||||
<Compile Include="Datastore\BasicRepository.cs" />
|
<Compile Include="Datastore\BasicRepository.cs" />
|
||||||
<Compile Include="Datastore\TableMapping.cs" />
|
<Compile Include="Datastore\TableMapping.cs" />
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System;
|
using System;
|
||||||
|
using NzbDrone.Core.Datastore;
|
||||||
using NzbDrone.Core.Qualities;
|
using NzbDrone.Core.Qualities;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Tv
|
namespace NzbDrone.Core.Tv
|
||||||
{
|
{
|
||||||
public class QualityModel : IComparable<QualityModel>
|
public class QualityModel : IComparable<QualityModel>, IEmbeddedDocument
|
||||||
{
|
{
|
||||||
public Quality Quality { get; set; }
|
public Quality Quality { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
using System.Collections.Generic;
|
using System;
|
||||||
using System;
|
|
||||||
using NzbDrone.Core.Datastore;
|
using NzbDrone.Core.Datastore;
|
||||||
using NzbDrone.Core.Model;
|
using NzbDrone.Core.Model;
|
||||||
using NzbDrone.Core.Qualities;
|
using NzbDrone.Core.Qualities;
|
||||||
|
@ -16,6 +15,11 @@ namespace NzbDrone.Core.Tv
|
||||||
|
|
||||||
public class Series : ModelBase
|
public class Series : ModelBase
|
||||||
{
|
{
|
||||||
|
public Series()
|
||||||
|
{
|
||||||
|
Covers = new LazyList<MediaCover.MediaCover>();
|
||||||
|
}
|
||||||
|
|
||||||
public int TvDbId { get; set; }
|
public int TvDbId { get; set; }
|
||||||
public string Title { get; set; }
|
public string Title { get; set; }
|
||||||
public string CleanTitle { get; set; }
|
public string CleanTitle { get; set; }
|
||||||
|
@ -30,7 +34,7 @@ namespace NzbDrone.Core.Tv
|
||||||
public DateTime? LastInfoSync { get; set; }
|
public DateTime? LastInfoSync { get; set; }
|
||||||
public DateTime? LastDiskSync { get; set; }
|
public DateTime? LastDiskSync { get; set; }
|
||||||
public int Runtime { get; set; }
|
public int Runtime { get; set; }
|
||||||
public List<MediaCover.MediaCover> Covers { get; set; }
|
public LazyList<MediaCover.MediaCover> Covers { get; set; }
|
||||||
public SeriesTypes SeriesType { get; set; }
|
public SeriesTypes SeriesType { get; set; }
|
||||||
public BacklogSettingType BacklogSetting { get; set; }
|
public BacklogSettingType BacklogSetting { get; set; }
|
||||||
public string Network { get; set; }
|
public string Network { get; set; }
|
||||||
|
@ -44,9 +48,6 @@ namespace NzbDrone.Core.Tv
|
||||||
|
|
||||||
public DateTime? FirstAired { get; set; }
|
public DateTime? FirstAired { get; set; }
|
||||||
public QualityProfile QualityProfile { get; set; }
|
public QualityProfile QualityProfile { get; set; }
|
||||||
public int EpisodeCount { get; set; }
|
|
||||||
public int EpisodeFileCount { get; set; }
|
|
||||||
public int SeasonCount { get; set; }
|
|
||||||
public DateTime? NextAiring { get; set; }
|
public DateTime? NextAiring { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -13,6 +13,6 @@
|
||||||
<package id="RestSharp" version="104.1" targetFramework="net40" />
|
<package id="RestSharp" version="104.1" targetFramework="net40" />
|
||||||
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net40" />
|
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net40" />
|
||||||
<package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
|
<package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
|
||||||
<package id="System.Data.SQLite.x86" version="1.0.84.0" targetFramework="net40" />
|
<package id="System.Data.SQLite" version="1.0.84.0" targetFramework="net40" />
|
||||||
<package id="twitterizer" version="2.4.0.26532" />
|
<package id="twitterizer" version="2.4.0.26532" />
|
||||||
</packages>
|
</packages>
|
|
@ -43,9 +43,9 @@
|
||||||
<Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
|
<Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
|
<HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
<Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
<HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Moq">
|
<Reference Include="Moq">
|
||||||
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
|
<HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
|
<package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
|
||||||
<package id="Moq" version="4.0.10827" />
|
<package id="Moq" version="4.0.10827" />
|
||||||
<package id="NBuilder" version="3.0.1.1" />
|
<package id="NBuilder" version="3.0.1.1" />
|
||||||
<package id="NUnit" version="2.6.2" targetFramework="net40" />
|
<package id="NUnit" version="2.6.2" targetFramework="net40" />
|
||||||
|
|
20
NzbDrone.sln
20
NzbDrone.sln
|
@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Backbone", "NzbDro
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Console", "NzbDrone.Console\NzbDrone.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Console", "NzbDrone.Console\NzbDrone.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marr.Data", "..\..\..\Users\Keivan\Desktop\Marr.Data\Marr.Data.csproj", "{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
@ -349,6 +351,24 @@ Global
|
||||||
{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x64.ActiveCfg = Release|x86
|
{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x64.ActiveCfg = Release|x86
|
||||||
{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x86.ActiveCfg = Release|x86
|
{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x86.ActiveCfg = Release|x86
|
||||||
{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x86.Build.0 = Release|x86
|
{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x86.Build.0 = Release|x86
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Mixed Platforms.Build.0 = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|x86.ActiveCfg = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
@ -89,14 +89,6 @@
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
|
|
||||||
<SpecificVersion>False</SpecificVersion>
|
|
||||||
<HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.Data.SQLite.Linq, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
|
|
||||||
<SpecificVersion>False</SpecificVersion>
|
|
||||||
<HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="System.ServiceProcess" />
|
<Reference Include="System.ServiceProcess" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -168,7 +160,7 @@
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\x86\*.*" "$(TargetDir)"</PostBuildEvent>
|
<PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*" "$(TargetDir)"</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|
|
@ -9,5 +9,4 @@
|
||||||
<package id="NLog" version="2.0.0.2000" />
|
<package id="NLog" version="2.0.0.2000" />
|
||||||
<package id="NLog.Config" version="2.0.0.2000" targetFramework="net40" />
|
<package id="NLog.Config" version="2.0.0.2000" targetFramework="net40" />
|
||||||
<package id="NLog.Schema" version="2.0.0.2000" targetFramework="net40" />
|
<package id="NLog.Schema" version="2.0.0.2000" targetFramework="net40" />
|
||||||
<package id="System.Data.SQLite.x86" version="1.0.84.0" targetFramework="net40" />
|
|
||||||
</packages>
|
</packages>
|
Binary file not shown.
Binary file not shown.
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
|
||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
|
||||||
<noInheritable></noInheritable>
|
|
||||||
<assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
|
|
||||||
<file name="msvcr90.dll" hashalg="SHA1" hash="98e8006e0a4542e69f1a3555b927758bd76ca07d"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>+CXED+6HzJlSphyMNOn27ujadC0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="3aec3be680024a46813dee891a753bd58b3f3b12"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>MyKED+9DyS+1XcMeaC0Zlw2vFZ0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="0195dd0896d74b62531e4f3c771904a3d996450e"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>EeyDE7og6WoPd2oBhYbMEnpFHhY=</dsig:DigestValue></asmv2:hash></file>
|
|
||||||
</assembly>
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue