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

switch to device name

Browse source
This commit is contained in:
Luke Pulverenti 2014-05-28 10:30:55 -04:00
parent ad96be8fa7
commit 29ba865ab8
3 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Common.Implementations/Security/UsageReporter.cs
View file

@ -49,7 +49,7 @@ namespace MediaBrowser.Common.Implementations.Security
{
public string AppName { get; set; }
public string AppVersion { get; set; }
public string DeviceVersion { get; set; }
public string DeviceName { get; set; }
public string DeviceId { get; set; }
}
}

6
MediaBrowser.Controller/Session/SessionInfo.cs
View file

@ -86,12 +86,6 @@ namespace MediaBrowser.Controller.Session
/// <value>The name of the device.</value>
public string DeviceName { get; set; }
/// <summary>
/// Gets or sets the device version.
/// </summary>
/// <value>The device version.</value>
public string DeviceVersion { get; set; }
/// <summary>
/// Gets or sets the name of the now viewing item.
/// </summary>

22
MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
View file

@ -46,24 +46,17 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
if (!string.IsNullOrEmpty(session.Client) &&
!string.IsNullOrEmpty(session.DeviceName) &&
!string.IsNullOrEmpty(session.DeviceId))
!string.IsNullOrEmpty(session.DeviceId) &&
!string.IsNullOrEmpty(session.ApplicationVersion))
{
var keys = new List<string>
{
session.Client,
session.DeviceName,
session.DeviceId
session.DeviceId,
session.ApplicationVersion
};
if (!string.IsNullOrEmpty(session.DeviceVersion))
{
keys.Add(session.DeviceVersion);
}
else
{
keys.Add(DefaultDeviceVersion);
}
var key = string.Join("_", keys.ToArray()).GetMD5();
_apps.GetOrAdd(key, guid => GetNewClientInfo(session));
@ -90,15 +83,10 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{
AppName = session.Client,
AppVersion = session.ApplicationVersion,
DeviceVersion = session.DeviceVersion,
DeviceName = session.DeviceName,
DeviceId = session.DeviceId
};
if (string.IsNullOrEmpty(info.DeviceVersion))
{
info.DeviceVersion = DefaultDeviceVersion;
}
// Report usage to remote server, except for web client, since we already have data on that
if (!string.Equals(info.AppName, "Dashboard", StringComparison.OrdinalIgnoreCase))
{