Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-05 21:33:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-23 18:09:00 -04:00
parent 6315f9b863 a325b479a6
commit d9c4775015
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.Api/Reports/Common/ReportBuilderBase.cs
View file

@ -133,10 +133,10 @@ namespace MediaBrowser.Api.Reports
/// <summary> Gets runtime date time. </summary>
/// <param name="runtime"> The runtime. </param>
/// <returns> The runtime date time. </returns>
protected DateTime? GetRuntimeDateTime(long? runtime)
protected double? GetRuntimeDateTime(long? runtime)
{
if (runtime.HasValue)
return new DateTime(runtime.Value);
return Math.Ceiling(new TimeSpan(runtime.Value).TotalMinutes);
return null;
}

3
MediaBrowser.Api/Reports/Common/ReportFieldType.cs
View file

@ -13,6 +13,7 @@ namespace MediaBrowser.Api.Reports
DateTime,
Int,
Image,
Object
Object,
Minutes
}
}

2
MediaBrowser.Api/Reports/Common/ReportHelper.cs
View file

@ -87,6 +87,8 @@ namespace MediaBrowser.Api.Reports
return string.Format("{0:t}", value);
case ReportFieldType.DateTime:
return string.Format("{0:d}", value);
case ReportFieldType.Minutes:
return string.Format("{0}mn", value);
case ReportFieldType.Int:
return string.Format("", value);
default:

2
MediaBrowser.Api/Reports/Data/ReportBuilder.cs
View file

@ -403,7 +403,7 @@ namespace MediaBrowser.Api.Reports
case HeaderMetadata.Runtime:
column = (i, r) => this.GetRuntimeDateTime(i.RunTimeTicks);
reportHeader.HeaderFieldType = ReportFieldType.Time;
reportHeader.HeaderFieldType = ReportFieldType.Minutes;
reportHeader.SortField = "Runtime,SortName";
break;