alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix case sensitive file names

Browse Source
This commit is contained in:
Luke Pulverenti
2014-10-09 18:22:04 -04:00
parent ad6f47329f
commit 74a8ca9c38
30 changed files with 155 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
View File

@@ -14,9 +14,12 @@ namespace MediaBrowser.Model.Configuration
public bool EnableIntrosFromUpcomingDvdMovies { get; set; }
public bool EnableIntrosFromUpcomingStreamingMovies { get; set; }
public int TrailerLimit { get; set; }
public CinemaModeConfiguration()
{
EnableIntrosParentalControl = true;
TrailerLimit = 2;
}
}
}

8
MediaBrowser.Model/Configuration/MetadataConfiguration.cs Normal file
View File

@@ -0,0 +1,8 @@

namespace MediaBrowser.Model.Configuration
{
public class MetadataConfiguration
{
public bool UseFileCreationTimeForDateAdded { get; set; }
}
}

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

@@ -1,6 +1,4 @@
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.FileOrganization;
using MediaBrowser.Model.LiveTv;
namespace MediaBrowser.Model.Configuration
{
@@ -15,6 +13,12 @@ namespace MediaBrowser.Model.Configuration
/// <value><c>true</c> if [enable u pn p]; otherwise, <c>false</c>.</value>
public bool EnableUPnP { get; set; }
/// <summary>
/// Gets or sets the public mapped port.
/// </summary>
/// <value>The public mapped port.</value>
public int PublicPort { get; set; }
/// <summary>
/// Gets or sets the HTTP server port number.
/// </summary>
@@ -167,20 +171,15 @@ namespace MediaBrowser.Model.Configuration
public string UICulture { get; set; }
public DlnaOptions DlnaOptions { get; set; }
public double DownMixAudioBoost { get; set; }
public bool DefaultMetadataSettingsApplied { get; set; }
public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
public bool FindInternetTrailers { get; set; }
public string[] InsecureApps { get; set; }
public bool SaveMetadataHidden { get; set; }
public bool FindInternetTrailers { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
/// </summary>
@@ -189,6 +188,7 @@ namespace MediaBrowser.Model.Configuration
{
MediaEncodingQuality = EncodingQuality.Auto;
ImageSavingConvention = ImageSavingConvention.Compatible;
PublicPort = 8096;
HttpServerPortNumber = 8096;
EnableDashboardResponseCaching = true;

6
MediaBrowser.Model/Dlna/ConditionProcessor.cs
View File

@@ -145,8 +145,10 @@ namespace MediaBrowser.Model.Dlna
switch (condition.Condition)
{
case ProfileConditionType.SubstringOf:
return StringHelper.IndexOfIgnoreCase(currentValue, expected) != -1;
case ProfileConditionType.EqualsAny:
{
return ListHelper.ContainsIgnoreCase(expected.Split('|'), currentValue);
}
case ProfileConditionType.Equals:
return StringHelper.EqualsIgnoreCase(currentValue, expected);
case ProfileConditionType.NotEquals:

2
MediaBrowser.Model/Dlna/ProfileConditionType.cs
View File

@@ -6,6 +6,6 @@
NotEquals = 1,
LessThanEqual = 2,
GreaterThanEqual = 3,
SubstringOf = 4
EqualsAny = 4
}
}

6
MediaBrowser.Model/Dlna/Profiles/AndroidProfile.cs
View File

@@ -32,7 +32,7 @@ namespace MediaBrowser.Model.Dlna.Profiles
VideoCodec = "h264",
AudioCodec = "aac",
Type = DlnaProfileType.Video,
VideoProfile = "Baseline",
VideoProfile = "baseline",
Context = EncodingContext.Streaming
});
}
@@ -42,7 +42,7 @@ namespace MediaBrowser.Model.Dlna.Profiles
VideoCodec = "h264",
AudioCodec = "aac",
Type = DlnaProfileType.Video,
VideoProfile = "Baseline",
VideoProfile = "baseline",
Context = EncodingContext.Static
});
@@ -102,7 +102,7 @@ namespace MediaBrowser.Model.Dlna.Profiles
Conditions = new []
{
new ProfileCondition(ProfileConditionType.SubstringOf, ProfileConditionValue.VideoProfile, "baseline"),
new ProfileCondition(ProfileConditionType.EqualsAny, ProfileConditionValue.VideoProfile, "baseline|constrained baseline"),
new ProfileCondition(ProfileConditionType.LessThanEqual, ProfileConditionValue.Width, "1920"),
new ProfileCondition(ProfileConditionType.LessThanEqual, ProfileConditionValue.Height, "1080"),
new ProfileCondition(ProfileConditionType.LessThanEqual, ProfileConditionValue.VideoBitDepth, "8"),

1
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -291,6 +291,7 @@ namespace MediaBrowser.Model.Dlna
playlistItem.VideoCodec = transcodingProfile.VideoCodec;
playlistItem.Protocol = transcodingProfile.Protocol;
playlistItem.AudioStreamIndex = audioStreamIndex;
playlistItem.VideoProfile = transcodingProfile.VideoProfile;
List<ProfileCondition> videoTranscodingConditions = new List<ProfileCondition>();
foreach (CodecProfile i in options.Profile.CodecProfiles)

1
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@@ -142,6 +142,7 @@ namespace MediaBrowser.Model.Dlna
list.Add(item.IsDirectStream ? string.Empty : DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture));
list.Add(item.MaxRefFrames.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxRefFrames.Value) : string.Empty);
list.Add(item.MaxVideoBitDepth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxVideoBitDepth.Value) : string.Empty);
list.Add(item.VideoProfile ?? string.Empty);
return string.Format("Params={0}", string.Join(";", list.ToArray()));
}

1
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@@ -90,6 +90,7 @@
<Compile Include="Configuration\ChannelOptions.cs" />
<Compile Include="Configuration\ChapterOptions.cs" />
<Compile Include="Configuration\CinemaModeConfiguration.cs" />
<Compile Include="Configuration\MetadataConfiguration.cs" />
<Compile Include="Configuration\PeopleMetadataOptions.cs" />
<Compile Include="Configuration\XbmcMetadataOptions.cs" />
<Compile Include="Configuration\SubtitlePlaybackMode.cs" />