mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-24 06:30:56 +02:00
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
This commit is contained in:
commit
d9c4775015
|
@ -133,10 +133,10 @@ namespace MediaBrowser.Api.Reports
|
||||||
/// <summary> Gets runtime date time. </summary>
|
/// <summary> Gets runtime date time. </summary>
|
||||||
/// <param name="runtime"> The runtime. </param>
|
/// <param name="runtime"> The runtime. </param>
|
||||||
/// <returns> The runtime date time. </returns>
|
/// <returns> The runtime date time. </returns>
|
||||||
protected DateTime? GetRuntimeDateTime(long? runtime)
|
protected double? GetRuntimeDateTime(long? runtime)
|
||||||
{
|
{
|
||||||
if (runtime.HasValue)
|
if (runtime.HasValue)
|
||||||
return new DateTime(runtime.Value);
|
return Math.Ceiling(new TimeSpan(runtime.Value).TotalMinutes);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ namespace MediaBrowser.Api.Reports
|
||||||
DateTime,
|
DateTime,
|
||||||
Int,
|
Int,
|
||||||
Image,
|
Image,
|
||||||
Object
|
Object,
|
||||||
|
Minutes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,6 +87,8 @@ namespace MediaBrowser.Api.Reports
|
||||||
return string.Format("{0:t}", value);
|
return string.Format("{0:t}", value);
|
||||||
case ReportFieldType.DateTime:
|
case ReportFieldType.DateTime:
|
||||||
return string.Format("{0:d}", value);
|
return string.Format("{0:d}", value);
|
||||||
|
case ReportFieldType.Minutes:
|
||||||
|
return string.Format("{0}mn", value);
|
||||||
case ReportFieldType.Int:
|
case ReportFieldType.Int:
|
||||||
return string.Format("", value);
|
return string.Format("", value);
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -403,7 +403,7 @@ namespace MediaBrowser.Api.Reports
|
||||||
|
|
||||||
case HeaderMetadata.Runtime:
|
case HeaderMetadata.Runtime:
|
||||||
column = (i, r) => this.GetRuntimeDateTime(i.RunTimeTicks);
|
column = (i, r) => this.GetRuntimeDateTime(i.RunTimeTicks);
|
||||||
reportHeader.HeaderFieldType = ReportFieldType.Time;
|
reportHeader.HeaderFieldType = ReportFieldType.Minutes;
|
||||||
reportHeader.SortField = "Runtime,SortName";
|
reportHeader.SortField = "Runtime,SortName";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue