diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-01-09 00:48:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 00:48:32 -0500 |
| commit | dbceef97fd070fb0d6096187e7ba60ad3fd924b5 (patch) | |
| tree | d0244b29fc7c94d5a1e80ce34e2f64e92c01f8fc /MediaBrowser.Model | |
| parent | c986340c02cb0b7fe06569d25a1b5d1c8375f7f6 (diff) | |
| parent | 932fcb0a9cd48696263abedcbfeb4b83cd0d928c (diff) | |
Merge pull request #524 from jellyfin/dev
Master 10.0.1
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Net/MimeTypes.cs | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index fe1068842..e223f2cc8 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -1,6 +1,11 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> + <Authors>Jellyfin Contributors</Authors> + <PackageId>Jellyfin.Model</PackageId> + </PropertyGroup> + + <PropertyGroup> <TargetFramework>netstandard2.0</TargetFramework> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> </PropertyGroup> diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs index d66d62fea..c22e77beb 100644 --- a/MediaBrowser.Model/Net/MimeTypes.cs +++ b/MediaBrowser.Model/Net/MimeTypes.cs @@ -183,6 +183,10 @@ namespace MediaBrowser.Model.Net { return "text/plain"; } + if (StringHelper.EqualsIgnoreCase(ext, ".log")) + { + return "text/plain"; + } if (StringHelper.EqualsIgnoreCase(ext, ".xml")) { return "application/xml"; @@ -228,10 +232,10 @@ namespace MediaBrowser.Model.Net if (StringHelper.EqualsIgnoreCase(ext, ".oga")) { return "audio/ogg"; - } - if (StringHelper.EqualsIgnoreCase(ext, ".opus")) - { - return "audio/ogg"; + } + if (StringHelper.EqualsIgnoreCase(ext, ".opus")) + { + return "audio/ogg"; } if (StringHelper.EqualsIgnoreCase(ext, ".ac3")) { |