mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-21 14:03:29 -07:00
Merge branch 'master' of git://github.com/kayone/NzbDrone
Conflicts: NzbDrone.Core.Test/SeriesProviderTest.cs NzbDrone.Core/Providers/MediaFileProvider.cs NzbDrone.Core/Providers/SeriesProvider.cs
This commit is contained in:
commit
0432109a95
45 changed files with 29397 additions and 183 deletions
|
@ -1,11 +1,14 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using NzbDrone.Core.Model;
|
||||
using PetaPoco;
|
||||
using SubSonic.SqlGeneration.Schema;
|
||||
|
||||
|
||||
namespace NzbDrone.Core.Repository
|
||||
{
|
||||
[TableName("Episodes")]
|
||||
[PrimaryKey("EpisodeId", autoIncrement = true)]
|
||||
public class Episode
|
||||
{
|
||||
[SubSonicPrimaryKey]
|
||||
|
@ -26,6 +29,7 @@ namespace NzbDrone.Core.Repository
|
|||
public virtual Boolean Ignored { get; set; }
|
||||
|
||||
[SubSonicIgnore]
|
||||
[Ignore]
|
||||
public Boolean IsDailyEpisode
|
||||
{
|
||||
get
|
||||
|
@ -44,6 +48,7 @@ namespace NzbDrone.Core.Repository
|
|||
public virtual DateTime? GrabDate { get; set; }
|
||||
|
||||
[SubSonicIgnore]
|
||||
[Ignore]
|
||||
public EpisodeStatusType Status
|
||||
{
|
||||
get
|
||||
|
@ -68,12 +73,15 @@ namespace NzbDrone.Core.Repository
|
|||
}
|
||||
|
||||
[SubSonicToOneRelation(ThisClassContainsJoinKey = true)]
|
||||
[Ignore]
|
||||
public virtual Series Series { get; set; }
|
||||
|
||||
[SubSonicToOneRelation(ThisClassContainsJoinKey = true)]
|
||||
[Ignore]
|
||||
public virtual EpisodeFile EpisodeFile { get; set; }
|
||||
|
||||
[SubSonicToManyRelation]
|
||||
[Ignore]
|
||||
public virtual IList<History> Histories { get; protected set; }
|
||||
|
||||
public override string ToString()
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using NzbDrone.Core.Repository.Quality;
|
||||
using PetaPoco;
|
||||
using SubSonic.SqlGeneration.Schema;
|
||||
|
||||
namespace NzbDrone.Core.Repository
|
||||
|
@ -43,6 +44,7 @@ namespace NzbDrone.Core.Repository
|
|||
/// <value><c>true</c> if hidden; otherwise, <c>false</c>.</value>
|
||||
/// <remarks>This field will be used for shows that are pending delete or
|
||||
/// new series that haven't been successfully imported</remarks>
|
||||
[Ignore]
|
||||
public bool Hidden { get; set; }
|
||||
|
||||
public virtual int QualityProfileId { get; set; }
|
||||
|
@ -54,12 +56,15 @@ namespace NzbDrone.Core.Repository
|
|||
public DateTime? LastDiskSync { get; set; }
|
||||
|
||||
[SubSonicToOneRelation(ThisClassContainsJoinKey = true, JoinKeyName = "QualityProfileId")]
|
||||
[Ignore]
|
||||
public virtual QualityProfile QualityProfile { get; set; }
|
||||
|
||||
[SubSonicToManyRelation]
|
||||
[Ignore]
|
||||
public virtual IList<Episode> Episodes { get; set; }
|
||||
|
||||
[SubSonicToManyRelation]
|
||||
[Ignore]
|
||||
public virtual IList<EpisodeFile> EpisodeFiles { get; protected set; }
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue