diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-02-08 13:27:08 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-02-08 13:27:08 -0500 |
| commit | 063fd568323ed94dd220610b5bd8b0b6ac4d9835 (patch) | |
| tree | e8fbbc43a25af2f982034fe279bc22ddf8e6d8c6 /MediaBrowser.Model | |
| parent | 00ff642f1955b082649ef7a31f925ccae4661fa8 (diff) | |
| parent | e94467d34b6b753cdb5420e33904bffa41da8053 (diff) | |
Merge pull request #1436 from MediaBrowser/dev
Merge from dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs | 16 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs index ae701ea68..830d55bf5 100644 --- a/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs +++ b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs @@ -9,9 +9,16 @@ namespace MediaBrowser.Model.FileOrganization /// <value>The tv options.</value> public TvFileOrganizationOptions TvOptions { get; set; } + /// <summary> + /// Gets or sets a list of smart match entries. + /// </summary> + /// <value>The smart match entries.</value> + public SmartMatchInfo[] SmartMatchInfos { get; set; } + public AutoOrganizeOptions() { TvOptions = new TvFileOrganizationOptions(); + SmartMatchInfos = new SmartMatchInfo[]{}; } } } diff --git a/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs new file mode 100644 index 000000000..a6bc66e49 --- /dev/null +++ b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs @@ -0,0 +1,16 @@ + +namespace MediaBrowser.Model.FileOrganization +{ + public class SmartMatchInfo + { + public string Id { get; set; } + public string Name { get; set; } + public FileOrganizerType OrganizerType { get; set; } + public string[] MatchStrings { get; set; } + + public SmartMatchInfo() + { + MatchStrings = new string[] { }; + } + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index db278baa1..a5191192c 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -137,6 +137,7 @@ <Compile Include="Dto\MetadataEditorInfo.cs" /> <Compile Include="Dto\NameIdPair.cs" /> <Compile Include="Dto\NameValuePair.cs" /> + <Compile Include="FileOrganization\SmartMatchInfo.cs" /> <Compile Include="MediaInfo\LiveStreamRequest.cs" /> <Compile Include="MediaInfo\LiveStreamResponse.cs" /> <Compile Include="MediaInfo\PlaybackInfoRequest.cs" /> |