lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update tv db cleanup

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-24 23:54:32 -04:00
parent e62270df35
commit bbaf88ae1f
7 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Persistence/IItemRepository.cs
View File

@ -107,7 +107,7 @@ namespace MediaBrowser.Controller.Persistence
/// </summary>
/// <param name="type">The type.</param>
/// <returns>IEnumerable{Guid}.</returns>
IEnumerable<string> GetItemsOfType(Type type);
IEnumerable<Guid> GetItemsOfType(Type type);
/// <summary>
/// Saves the children.

5
MediaBrowser.Dlna/PlayTo/PlayToController.cs
View File

@ -134,11 +134,6 @@ namespace MediaBrowser.Dlna.PlayTo
}
}
private string GetServerAddress()
{
return _serverAddress;
}
async void _device_MediaChanged(object sender, MediaChangedEventArgs e)
{
try

16
MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
View File

@ -25,14 +25,14 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
{
var authorization = _authContext.GetAuthorizationInfo(requestContext);
if (!string.IsNullOrWhiteSpace(authorization.Token))
{
var auth = GetTokenInfo(requestContext);
if (auth != null)
{
return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
}
}
//if (!string.IsNullOrWhiteSpace(authorization.Token))
//{
// var auth = GetTokenInfo(requestContext);
// if (auth != null)
// {
// return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
// }
//}
var session = _sessionManager.GetSession(authorization.DeviceId, authorization.Client, authorization.Version);
return Task.FromResult(session);

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -1115,7 +1115,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{
cancellationToken.ThrowIfCancellationRequested();
if (!currentIdList.Contains(new Guid(programId)))
if (!currentIdList.Contains(programId))
{
var program = _libraryManager.GetItemById(programId);

6
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -521,8 +521,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
}
}
}
public IEnumerable<string> GetItemsOfType(Type type)
public IEnumerable<Guid> GetItemsOfType(Type type)
{
if (type == null)
{
@ -541,7 +541,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
while (reader.Read())
{
yield return reader.GetString(0);
yield return reader.GetGuid(0);
}
}
}

2
MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
View File

@ -125,7 +125,7 @@ namespace MediaBrowser.Server.Implementations.Photos
protected abstract Task<List<BaseItem>> GetItemsWithImages(IHasImages item);
private const string Version = "3";
private const string Version = "4";
protected string GetConfigurationCacheKey(List<BaseItem> items, string itemName)
{
var parts = Version + "_" + (itemName ?? string.Empty) + "_" +

10
MediaBrowser.Server.Implementations/Session/WebSocketController.cs
View File

@ -41,17 +41,25 @@ namespace MediaBrowser.Server.Implementations.Session
}
private bool _isActive;
private DateTime _lastActivityDate;
public bool IsSessionActive
{
get
{
return HasOpenSockets;
if (HasOpenSockets)
{
return true;
}
//return false;
return _isActive && (DateTime.UtcNow - _lastActivityDate).TotalMinutes <= 10;
}
}
public void OnActivity()
{
_isActive = true;
_lastActivityDate = DateTime.UtcNow;
}
private IEnumerable<IWebSocketConnection> GetActiveSockets()