pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #524 from jellyfin/dev 

Master 10.0.1
This commit is contained in:
Joshua M. Boniface 2019-01-09 00:48:32 -05:00 committed by GitHub
parent c986340c02 932fcb0a9c
commit dbceef97fd
17 changed files with 66 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS.md
View File

@ -10,7 +10,7 @@
- [Bond_009](https://github.com/Bond-009)
- [AnthonyLavado](https://github.com/anthonylavado)
- [sparky8251](https://github.com/sparky8251)
- [LeoVerto](https://github.com/LeoVerto]
- [LeoVerto](https://github.com/LeoVerto)
# Emby Contributors

31
Emby.Drawing/Common/ImageHeader.cs
View File

@ -121,7 +121,7 @@ namespace Emby.Drawing.Common
/// </summary>
/// <param name="binaryReader">The binary reader.</param>
/// <returns>System.Int16.</returns>
private static short ReadLittleEndianInt16(BinaryReader binaryReader)
private static short ReadLittleEndianInt16(this BinaryReader binaryReader)
{
var bytes = new byte[sizeof(short)];
@ -137,7 +137,7 @@ namespace Emby.Drawing.Common
/// </summary>
/// <param name="binaryReader">The binary reader.</param>
/// <returns>System.Int32.</returns>
private static int ReadLittleEndianInt32(BinaryReader binaryReader)
private static int ReadLittleEndianInt32(this BinaryReader binaryReader)
{
var bytes = new byte[sizeof(int)];
for (int i = 0; i < sizeof(int); i += 1)
@ -205,25 +205,30 @@ namespace Emby.Drawing.Common
/// <exception cref="System.ArgumentException"></exception>
private static ImageSize DecodeJfif(BinaryReader binaryReader)
{
// A JPEG image consists of a sequence of segments,
// each beginning with a marker, each of which begins with a 0xFF byte
// followed by a byte indicating what kind of marker it is.
// Source: https://en.wikipedia.org/wiki/JPEG#Syntax_and_structure
while (binaryReader.ReadByte() == 0xff)
{
byte marker = binaryReader.ReadByte();
short chunkLength = ReadLittleEndianInt16(binaryReader);
if (marker == 0xc0)
short chunkLength = binaryReader.ReadLittleEndianInt16();
// SOF0: Indicates that this is a baseline DCT-based JPEG,
// and specifies the width, height, number of components, and component subsampling
// SOF2: Indicates that this is a progressive DCT-based JPEG,
// and specifies the width, height, number of components, and component subsampling
if (marker == 0xc0 || marker == 0xc2)
{
binaryReader.ReadByte();
int height = ReadLittleEndianInt16(binaryReader);
int width = ReadLittleEndianInt16(binaryReader);
return new ImageSize
{
Width = width,
Height = height
};
// https://help.accusoft.com/ImageGear/v18.2/Windows/ActiveX/IGAX-10-12.html
binaryReader.ReadByte(); // We don't care about the first byte
int height = binaryReader.ReadLittleEndianInt16();
int width = binaryReader.ReadLittleEndianInt16();
return new ImageSize(width, height);
}
if (chunkLength < 0)
{
var uchunkLength = (ushort)chunkLength;
ushort uchunkLength = (ushort)chunkLength;
binaryReader.ReadBytes(uchunkLength - 2);
}
else

1
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -45,7 +45,6 @@
<EmbeddedResource Include="TextEncoding\NLangDetect\Profiles\*" />
<EmbeddedResource Include="TextEncoding\NLangDetect\Utils\messages.properties" />
<EmbeddedResource Include="Localization\Ratings\*.txt" />
<EmbeddedResource Include="values.txt" />
</ItemGroup>
</Project>

6
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1056,7 +1056,7 @@ namespace Emby.Server.Implementations.LiveTv
var numComplete = 0;
double progressPerService = _services.Length == 0
? 0
: 1 / _services.Length;
: 1.0 / _services.Length;
var newChannelIdList = new List<Guid>();
var newProgramIdList = new List<Guid>();
@ -1262,7 +1262,7 @@ namespace Emby.Server.Implementations.LiveTv
}
numComplete++;
double percent = numComplete / allChannelsList.Count;
double percent = numComplete / (double) allChannelsList.Count;
progress.Report(85 * percent + 15);
}
@ -1307,7 +1307,7 @@ namespace Emby.Server.Implementations.LiveTv
}
numComplete++;
double percent = numComplete / list.Count;
double percent = numComplete / (double) list.Count;
progress.Report(100 * percent);
}

2
Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs
View File

@ -65,7 +65,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
foreach (var file in filesToDelete)
{
double percent = index / filesToDelete.Count;
double percent = index / (double) filesToDelete.Count;
progress.Report(100 * percent);

0
Emby.Server.Implementations/values.txt
View File

5
MediaBrowser.Common/MediaBrowser.Common.csproj
View File

@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Authors>Jellyfin Contributors</Authors>
<PackageId>Jellyfin.Common</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
</ItemGroup>

2
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View File

@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Entities.Movies
}
public override double GetDefaultPrimaryImageAspectRatio()
=> 2 / 3;
=> 2.0 / 3;
public override UnratedItem GetBlockUnratedType()
{

2
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@ -51,7 +51,7 @@ namespace MediaBrowser.Controller.Entities.Movies
return 0;
}
return 2 / 3;
return 2.0 / 3;
}
protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, List<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)

2
MediaBrowser.Controller/Entities/TV/Episode.cs
View File

@ -111,7 +111,7 @@ namespace MediaBrowser.Controller.Entities.TV
return 0;
}
return 16 / 9;
return 16.0 / 9;
}
public override List<string> GetUserDataKeys()

2
MediaBrowser.Controller/Entities/Trailer.cs
View File

@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Entities
public TrailerType[] TrailerTypes { get; set; }
public override double GetDefaultPrimaryImageAspectRatio()
=> 2 / 3;
=> 2.0 / 3;
public override UnratedItem GetBlockUnratedType()
{

4
MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
View File

@ -54,11 +54,11 @@ namespace MediaBrowser.Controller.LiveTv
if (string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || string.Equals(serviceName, "Next Pvr", StringComparison.OrdinalIgnoreCase))
{
return 2 / 3;
return 2.0 / 3;
}
else
{
return 16 / 9;
return 16.0 / 9;
}
}

5
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Authors>Jellyfin Contributors</Authors>
<PackageId>Jellyfin.Controller</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />

5
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@ -1,5 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Authors>Jellyfin Contributors</Authors>
<PackageId>Jellyfin.Model</PackageId>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

12
MediaBrowser.Model/Net/MimeTypes.cs
View File

@ -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"))
{

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("10.0.0")]
[assembly: AssemblyVersion("10.0.1")]

13
debian/changelog vendored
View File

@ -1,3 +1,16 @@
jellyfin (10.0.1-1) unstable; urgency=medium
* Hotfix release, corrects several small bugs from 10.0.0
* #512: Fix CONTRIBUTORS.md formatting
* #501: Fix regression in integer divisions in latest movies category
* #498: Change contributing link in settings to readthedocs.io
* #493: Remove unused values.txt resource
* #491: Fix userprofile.js crash
* #519: Fix the DecodeJfif function to get proper image sizes
* #486: Add NuGet package info to plugin projects
-- Joshua Boniface <joshua@boniface.me> Tue, 08 Jan 2019 20:06:01 -0500
jellyfin (10.0.0-1) unstable; urgency=medium
* The first Jellyfin release under our new versioning scheme