updated nuget + live tv

2013-12-14 10:49:11 -05:00 · 2013-12-14 10:49:11 -05:00 · 0eea77b837
commit 0eea77b837
parent e65726e6f9
9 changed files with 49 additions and 13 deletions
--- a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
@ -72,12 +72,20 @@ namespace MediaBrowser.Controller.LiveTv
        Task<ImageResponseInfo> GetChannelImageAsync(string channelId, CancellationToken cancellationToken);

        /// <summary>
-        /// Gets the program image asynchronous.
+        /// Gets the recording image asynchronous.
        /// </summary>
-        /// <param name="programId">The program identifier.</param>
+        /// <param name="channelId">The channel identifier.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>Task{ImageResponseInfo}.</returns>
-        Task<ImageResponseInfo> GetProgramImageAsync(string programId, CancellationToken cancellationToken);
+        Task<ImageResponseInfo> GetRecordingImageAsync(string channelId, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the program image asynchronous.
+        /// </summary>
+        /// <param name="channelId">The channel identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{ImageResponseInfo}.</returns>
+        Task<ImageResponseInfo> GetProgramImageAsync(string channelId, CancellationToken cancellationToken);
        
        /// <summary>
        /// Gets the recordings asynchronous.
--- a/MediaBrowser.Controller/LiveTv/ImageResponseInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/ImageResponseInfo.cs
@ -15,5 +15,11 @@ namespace MediaBrowser.Controller.LiveTv
        /// </summary>
        /// <value>The type of the MIME.</value>
        public string MimeType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the image path.
+        /// </summary>
+        /// <value>The image path.</value>
+        public string ImagePath { get; set; }
    }
 }
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@ -109,6 +109,11 @@ namespace MediaBrowser.Model.LiveTv

    public enum ProgramAudio
    {
-        Stereo
+        Unspecified,
+        Mono,
+        Stereo,
+        Dolby,
+        DolbyDigital,
+        Thx
    }
 }
--- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs
@ -3,12 +3,15 @@ namespace MediaBrowser.Model.LiveTv
 {
    public enum RecordingStatus
    {
-        Pending,
+        New,
+        Scheduled,
        InProgress,
        Completed,
-        CompletedWithError,
-        Conflicted,
-        Deleted
+        Abored,
+        Cancelled,
+        ConflictedOk,
+        ConflictedNotOk,
+        Error
    }

    public enum RecurrenceType
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@ -481,6 +481,8 @@ namespace MediaBrowser.WebDashboard.Api
                                      "livetvrecording.js",
                                      "livetvrecordings.js",
                                      "livetvtimer.js",
+                                      "livetvseriestimer.js",
+                                      "livetvseriestimers.js",
                                      "livetvtimers.js",
                                      "loginpage.js",
                                      "logpage.js",
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@ -97,6 +97,9 @@
    <Content Include="dashboard-ui\livetvrecording.html">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="dashboard-ui\livetvseriestimer.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="dashboard-ui\livetvtimers.html">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
@ -361,6 +364,9 @@
    <Content Include="dashboard-ui\scripts\livetvrecording.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="dashboard-ui\scripts\livetvseriestimer.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="dashboard-ui\scripts\livetvtimer.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
@ -385,6 +391,9 @@
    <Content Include="dashboard-ui\scripts\episodes.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="dashboard-ui\scripts\livetvseriestimers.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="dashboard-ui\scripts\tvupcoming.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
@ -397,6 +406,9 @@
    <Content Include="dashboard-ui\scripts\wizardsettings.js">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="dashboard-ui\livetvseriestimers.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="dashboard-ui\tvupcoming.html">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
    <metadata>
        <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.268</version>
+        <version>3.0.269</version>
        <title>MediaBrowser.Common.Internal</title>
        <authors>Luke</authors>
        <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
        <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
        <copyright>Copyright © Media Browser 2013</copyright>
        <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.268" />
+            <dependency id="MediaBrowser.Common" version="3.0.269" />
            <dependency id="NLog" version="2.1.0" />
            <dependency id="SimpleInjector" version="2.4.0" />
            <dependency id="sharpcompress" version="0.10.2" />
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
    <metadata>
        <id>MediaBrowser.Common</id>
-        <version>3.0.268</version>
+        <version>3.0.269</version>
        <title>MediaBrowser.Common</title>
        <authors>Media Browser Team</authors>
        <owners>ebr,Luke,scottisafool</owners>
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>MediaBrowser.Server.Core</id>
-        <version>3.0.268</version>
+        <version>3.0.269</version>
        <title>Media Browser.Server.Core</title>
        <authors>Media Browser Team</authors>
        <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
        <description>Contains core components required to build plugins for Media Browser Server.</description>
        <copyright>Copyright © Media Browser 2013</copyright>
        <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.268" />
+            <dependency id="MediaBrowser.Common" version="3.0.269" />
        </dependencies>
    </metadata>
    <files>