Merge pull request #1514 from MediaBrowser/beta

Beta

14 files changed, 71 insertions, 115 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 3cb543e5d..5527c1646 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -182,8 +182,6 @@ namespace MediaBrowser.Model.Configuration
         public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
         public bool FindInternetTrailers { get; set; }
 
-        public string[] InsecureApps9 { get; set; }
-
         public bool SaveMetadataHidden { get; set; }
 
         public NameValuePair[] ContentTypes { get; set; }
@@ -206,6 +204,8 @@ namespace MediaBrowser.Model.Configuration
 
         public int MigrationVersion { get; set; }
 
+        public bool DownloadImagesInAdvance { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -256,11 +256,6 @@ namespace MediaBrowser.Model.Configuration
 
             PeopleMetadataOptions = new PeopleMetadataOptions();
 
-            InsecureApps9 = new[]
-            {
-                "Windows Phone"
-            };
-
             MetadataOptions = new[]
             {
                 new MetadataOptions(1, 1280) {ItemType = "Book"},
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index d59974a2e..a024eeab4 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -48,11 +48,19 @@ namespace MediaBrowser.Model.Configuration
         public bool HidePlayedInLatest { get; set; }
         public bool DisplayChannelsInline { get; set; }
 
+        public bool RememberAudioSelections { get; set; }
+        public bool RememberSubtitleSelections { get; set; }
+        public bool EnableNextEpisodeAutoPlay { get; set; }
+    
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
         public UserConfiguration()
         {
+            EnableNextEpisodeAutoPlay = true;
+            RememberAudioSelections = true;
+            RememberSubtitleSelections = true;
+            
             HidePlayedInLatest = true;
             PlayDefaultAudioTrack = true;
 
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index c2713a6e7..d4ca379c0 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -425,6 +425,7 @@ namespace MediaBrowser.Model.Dlna
                 playlistItem.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
                 playlistItem.AudioCodec = transcodingProfile.AudioCodec.Split(',')[0];
                 playlistItem.VideoCodec = transcodingProfile.VideoCodec;
+                playlistItem.CopyTimestamps = transcodingProfile.CopyTimestamps;
                 playlistItem.SubProtocol = transcodingProfile.Protocol;
                 playlistItem.AudioStreamIndex = audioStreamIndex;
 
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index f5c54e160..79ee1b5c5 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -32,6 +32,7 @@ namespace MediaBrowser.Model.Dlna
         public string VideoProfile { get; set; }
 
         public bool? Cabac { get; set; }
+        public bool CopyTimestamps { get; set; }
         public string AudioCodec { get; set; }
 
         public int? AudioStreamIndex { get; set; }
@@ -231,6 +232,8 @@ namespace MediaBrowser.Model.Dlna
             {
                 list.Add(new NameValuePair("ItemId", item.ItemId));
             }
+
+            list.Add(new NameValuePair("CopyTimestamps", (item.CopyTimestamps).ToString().ToLower()));
             
             return list;
         }
@@ -269,7 +272,7 @@ namespace MediaBrowser.Model.Dlna
             // HLS will preserve timestamps so we can just grab the full subtitle stream
             long startPositionTicks = StringHelper.EqualsIgnoreCase(SubProtocol, "hls")
                 ? 0
-				: (this.PlayMethod == PlayMethod.Transcode ? StartPositionTicks : 0);
+				: (PlayMethod == PlayMethod.Transcode && !CopyTimestamps ? StartPositionTicks : 0);
 
             // First add the selected track
             if (SubtitleStreamIndex.HasValue)
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index d9963eb75..e59ee6d63 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -29,6 +29,9 @@ namespace MediaBrowser.Model.Dlna
         [XmlAttribute("transcodeSeekInfo")]
         public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
 
+        [XmlAttribute("copyTimestamps")]
+        public bool CopyTimestamps { get; set; }
+
         [XmlAttribute("context")]
         public EncodingContext Context { get; set; }
 
diff --git a/MediaBrowser.Model/Entities/PersonType.cs b/MediaBrowser.Model/Entities/PersonType.cs
index bdf846095..bc274972d 100644
--- a/MediaBrowser.Model/Entities/PersonType.cs
+++ b/MediaBrowser.Model/Entities/PersonType.cs
@@ -34,5 +34,9 @@ namespace MediaBrowser.Model.Entities
         /// The conductor
         /// </summary>
         public const string Conductor = "Conductor";
+        /// <summary>
+        /// The lyricist
+        /// </summary>
+        public const string Lyricist = "Lyricist";
     }
 }
diff --git a/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs b/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs
index 0b12ebc51..b20e43e54 100644
--- a/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs
+++ b/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs
@@ -1,4 +1,6 @@
-namespace MediaBrowser.Model.FileOrganization
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.FileOrganization
 {
     public class EpisodeFileOrganizationRequest
     {
@@ -13,5 +15,12 @@
         public int? EndingEpisodeNumber { get; set; }
 
         public bool RememberCorrection { get; set; }
+        public string NewSeriesName { get; set; }
+
+        public string NewSeriesYear { get; set; }
+
+        public string TargetFolder { get; set; }
+
+        public Dictionary<string, string> NewSeriesProviderIds { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Fody.targets b/MediaBrowser.Model/Fody.targets
deleted file mode 100644
index a668a51fc..000000000
--- a/MediaBrowser.Model/Fody.targets
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Choose>
-    <When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
-      <PropertyGroup>
-        <FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
-      <PropertyGroup>
-        <FodySolutionDir>$(SolutionDir)</FodySolutionDir>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
-      <PropertyGroup>
-        <FodySolutionDir>$(MSBuildProjectDirectory)\..\</FodySolutionDir>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
-      <PropertyGroup>
-        <FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
-      <PropertyGroup>
-        <FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath>
-      </PropertyGroup>
-    </When>
-    <Otherwise >
-      <PropertyGroup>
-        <FodyKeyFilePath></FodyKeyFilePath>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <PropertyGroup>
-    <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
-    <FodyMessageImportance Condition="$(FodyMessageImportance) == '' Or $(FodyMessageImportance) == '*Undefined*'">Low</FodyMessageImportance>
-    <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
-    <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)</FodyPath>
-  </PropertyGroup>
-  <UsingTask
-      TaskName="Fody.WeavingTask"
-      AssemblyFile="$(FodyPath)\Fody.dll" />
-  <Target
-      AfterTargets="AfterCompile"
-      Name="WinFodyTarget"
-      Condition=" '$(OS)' == 'Windows_NT'">
-
-    <Fody.WeavingTask
-          AssemblyPath="@(IntermediateAssembly)"
-          IntermediateDir="$(IntermediateDir)"
-          KeyFilePath="$(FodyKeyFilePath)"
-          MessageImportance="$(FodyMessageImportance)"
-          ProjectDirectory="$(ProjectDir)"
-          SolutionDir="$(FodySolutionDir)"
-          References="@(ReferencePath)"
-          SignAssembly="$(FodySignAssembly)"
-          ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
-          DefineConstants="$(DefineConstants)"
-      />
-  </Target>
-
-  <Target
-      AfterTargets="AfterBuild"
-      Name="NonWinFodyTarget"
-      Condition=" '$(OS)' != 'Windows_NT'">
-    <Fody.WeavingTask
-          AssemblyPath="$(TargetPath)"
-          IntermediateDir="$(IntermediateDir)"
-          KeyFilePath="$(FodyKeyFilePath)"
-          MessageImportance="$(FodyMessageImportance)"
-          ProjectDirectory="$(ProjectDir)"
-          SolutionDir="$(FodySolutionDir)"
-          References="@(ReferencePath)"
-          SignAssembly="$(FodySignAssembly)"
-          ReferenceCopyLocalPaths="$(ReferenceCopyLocalPaths)"
-          DefineConstants="$(DefineConstants)"
-      />
-  </Target>
-
-
-  <!--Support for ncrunch-->
-  <ItemGroup>
-    <None Include="$(FodyPath)\*.*" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/MediaBrowser.Model/FodyWeavers.xml b/MediaBrowser.Model/FodyWeavers.xml
index bb0f322ee..736992810 100644
--- a/MediaBrowser.Model/FodyWeavers.xml
+++ b/MediaBrowser.Model/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Weavers>
   <PropertyChanged />
 </Weavers>
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 838325d68..e705102db 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.LiveTv
 
         public int PrePaddingSeconds { get; set; }
         public int PostPaddingSeconds { get; set; }
-        
+
         public LiveTvOptions()
         {
             EnableMovieProviders = true;
@@ -32,6 +32,8 @@ namespace MediaBrowser.Model.LiveTv
         public bool ImportFavoritesOnly { get; set; }
         public bool IsEnabled { get; set; }
 
+        public int DataVersion { get; set; }
+
         public TunerHostInfo()
         {
             IsEnabled = true;
@@ -47,5 +49,15 @@ namespace MediaBrowser.Model.LiveTv
         public string ListingsId { get; set; }
         public string ZipCode { get; set; }
         public string Country { get; set; }
+        public string Path { get; set; }
+
+        public string[] EnabledTuners { get; set; }
+        public bool EnableAllTuners { get; set; }
+
+        public ListingsProviderInfo()
+        {
+            EnabledTuners = new string[] { };
+            EnableAllTuners = true;
+        }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs
index fcb19427b..9af96df43 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs
@@ -64,6 +64,12 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The clients.</value>
         public List<string> Clients { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance can reset.
+        /// </summary>
+        /// <value><c>true</c> if this instance can reset; otherwise, <c>false</c>.</value>
+        public bool CanReset { get; set; }
+        
         public LiveTvTunerInfoDto()
         {
             Clients = new List<string>();
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index a5191192c..fda240249 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -11,7 +11,6 @@
     <AssemblyName>MediaBrowser.Model</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <FodyPath>..\packages\Fody.1.19.1.0</FodyPath>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>
     </ReleaseVersion>
@@ -442,30 +441,30 @@
     <Compile Include="Users\UserAction.cs" />
     <Compile Include="Users\UserActionType.cs" />
     <Compile Include="Users\UserPolicy.cs" />
-    <None Include="Fody.targets" />
     <None Include="FodyWeavers.xml" />
     <None Include="MediaBrowser.Model.snk" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="PropertyChanged">
-      <HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\NET35\PropertyChanged.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent />
   </PropertyGroup>
-  <Import Project="Fody.targets" />
   <PropertyGroup>
     <PostBuildEvent />
   </PropertyGroup>
+  <Import Project="..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.Model/MediaInfo/MediaInfo.cs b/MediaBrowser.Model/MediaInfo/MediaInfo.cs
index 21f258693..de082635d 100644
--- a/MediaBrowser.Model/MediaInfo/MediaInfo.cs
+++ b/MediaBrowser.Model/MediaInfo/MediaInfo.cs
@@ -10,11 +10,6 @@ namespace MediaBrowser.Model.MediaInfo
         public List<ChapterInfo> Chapters { get; set; }
 
         /// <summary>
-        /// Gets or sets the title.
-        /// </summary>
-        /// <value>The title.</value>
-        public string Title { get; set; }
-        /// <summary>
         /// Gets or sets the album.
         /// </summary>
         /// <value>The album.</value>
@@ -47,10 +42,20 @@ namespace MediaBrowser.Model.MediaInfo
         /// <value>The official rating.</value>
         public string OfficialRating { get; set; }
         /// <summary>
+        /// Gets or sets the official rating description.
+        /// </summary>
+        /// <value>The official rating description.</value>
+        public string OfficialRatingDescription { get; set; }
+        /// <summary>
         /// Gets or sets the overview.
         /// </summary>
         /// <value>The overview.</value>
         public string Overview { get; set; }
+        /// <summary>
+        /// Gets or sets the short overview.
+        /// </summary>
+        /// <value>The short overview.</value>
+        public string ShortOverview { get; set; }
 
         public MediaInfo()
         {
diff --git a/MediaBrowser.Model/packages.config b/MediaBrowser.Model/packages.config
index 3d7793afb..df2ddcf0f 100644
--- a/MediaBrowser.Model/packages.config
+++ b/MediaBrowser.Model/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.19.1.0" targetFramework="net45" developmentDependency="true" />
-  <package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="net45" />
+  <package id="Fody" version="1.29.2" targetFramework="net45" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.50.4" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file