lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.0.5641.4

Browse Source
This commit is contained in:
Luke Pulverenti 2015-06-15 00:17:12 -04:00
parent 4cf456925f
commit cd759e215e
6 changed files with 10 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -772,6 +772,11 @@ namespace MediaBrowser.Api.Playback
? null
: audioStream.Channels;
if (inputChannels <= 0)
{
inputChannels = null;
}
var codec = outputAudioCodec ?? string.Empty;
if (codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)

1
MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
View File

@ -78,7 +78,6 @@
<Compile Include="Savers\MovieXmlSaver.cs" />
<Compile Include="Savers\PersonXmlSaver.cs" />
<Compile Include="Savers\PlaylistXmlSaver.cs" />
<Compile Include="Savers\SeasonXmlSaver.cs" />
<Compile Include="Savers\SeriesXmlSaver.cs" />
<Compile Include="Savers\XmlSaverHelpers.cs" />
</ItemGroup>

95
MediaBrowser.LocalMetadata/Savers/SeasonXmlSaver.cs
View File

@ -1,95 +0,0 @@
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Security;
using System.Text;
using System.Threading;
namespace MediaBrowser.LocalMetadata.Savers
{
public class SeasonXmlSaver
{
public string Name
{
get
{
return XmlProviderUtils.Name;
}
}
private readonly IServerConfigurationManager _config;
public SeasonXmlSaver(IServerConfigurationManager config)
{
_config = config;
}
/// <summary>
/// Determines whether [is enabled for] [the specified item].
/// </summary>
/// <param name="item">The item.</param>
/// <param name="updateType">Type of the update.</param>
/// <returns><c>true</c> if [is enabled for] [the specified item]; otherwise, <c>false</c>.</returns>
public bool IsEnabledFor(IHasMetadata item, ItemUpdateType updateType)
{
if (!item.SupportsLocalMetadata)
{
return false;
}
if (!(item is Season))
{
return false;
}
return updateType >= ItemUpdateType.MetadataDownload || (updateType >= ItemUpdateType.MetadataImport && File.Exists(GetSavePath(item)));
}
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
/// <summary>
/// Saves the specified item.
/// </summary>
/// <param name="item">The item.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
public void Save(IHasMetadata item, CancellationToken cancellationToken)
{
var builder = new StringBuilder();
builder.Append("<Item>");
var season = (Season)item;
if (season.IndexNumber.HasValue)
{
builder.Append("<SeasonNumber>" + SecurityElement.Escape(season.IndexNumber.Value.ToString(_usCulture)) + "</SeasonNumber>");
}
XmlSaverHelpers.AddCommonNodes((Season)item, builder);
builder.Append("</Item>");
var xmlFilePath = GetSavePath(item);
XmlSaverHelpers.Save(builder, xmlFilePath, new List<string>
{
"SeasonNumber"
}, _config);
}
/// <summary>
/// Gets the save path.
/// </summary>
/// <param name="item">The item.</param>
/// <returns>System.String.</returns>
public string GetSavePath(IHasMetadata item)
{
return Path.Combine(item.Path, "season.xml");
}
}
}

5
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -429,7 +429,10 @@ namespace MediaBrowser.Model.Configuration
}
},
new MetadataOptions(0, 1280) {ItemType = "Season"}
new MetadataOptions(0, 1280)
{
ItemType = "Season"
}
};
}
}

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -318,9 +318,6 @@
<Content Include="dashboard-ui\thirdparty\cordova\android\iap.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\cordova\android\imagestore.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\thirdparty\cordova\android\immersive.js" />
<Content Include="dashboard-ui\thirdparty\cordova\chromecast.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5641.3")]
[assembly: AssemblyVersion("3.0.5641.4")]