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

sync updates

Browse Source
This commit is contained in:
Luke Pulverenti 2015-02-14 14:36:40 -05:00
parent cfa2e5ed1d
commit 10cfb3c43c
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/UserService.cs
View File

@ -365,9 +365,7 @@ namespace MediaBrowser.Api
throw new ResourceNotFoundException("User not found");
}
var auth = AuthorizationContext.GetAuthorizationInfo(Request);
var result = _userManager.GetOfflineUserDto(user, auth.DeviceId);
var result = _userManager.GetOfflineUserDto(user);
return ToOptimizedResult(result);
}

29
MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
View File

@ -169,24 +169,27 @@ namespace MediaBrowser.Common.Implementations.Networking
IPAddress address;
if (resolveHost && !IPAddress.TryParse(endpoint, out address))
{
var host = new Uri(endpoint).DnsSafeHost;
Logger.Debug("Resolving host {0}", host);
try
Uri uri;
if (Uri.TryCreate(endpoint, UriKind.RelativeOrAbsolute, out uri))
{
address = GetIpAddresses(host).FirstOrDefault();
var host = uri.DnsSafeHost;
Logger.Debug("Resolving host {0}", host);
if (address != null)
try
{
Logger.Debug("{0} resolved to {1}", host, address);
address = GetIpAddresses(host).FirstOrDefault();
return IsInLocalNetworkInternal(address.ToString(), false);
if (address != null)
{
Logger.Debug("{0} resolved to {1}", host, address);
return IsInLocalNetworkInternal(address.ToString(), false);
}
}
catch (Exception ex)
{
Logger.ErrorException("Error resovling hostname {0}", ex, host);
}
}
catch (Exception ex)
{
Logger.ErrorException("Error resovling hostname {0}", ex, host);
}
}

3
MediaBrowser.Controller/Library/IUserManager.cs
View File

@ -121,9 +121,8 @@ namespace MediaBrowser.Controller.Library
/// Gets the offline user dto.
/// </summary>
/// <param name="user">The user.</param>
/// <param name="deviceId">The device identifier.</param>
/// <returns>UserDto.</returns>
UserDto GetOfflineUserDto(User user, string deviceId);
UserDto GetOfflineUserDto(User user);
/// <summary>
/// Resets the easy password.

6
MediaBrowser.Model/Dto/UserDto.cs
View File

@ -61,6 +61,12 @@ namespace MediaBrowser.Model.Dto
/// </summary>
/// <value>The offline password.</value>
public string OfflinePassword { get; set; }
/// <summary>
/// Gets or sets the offline password salt.
/// </summary>
/// <value>The offline password salt.</value>
public string OfflinePasswordSalt { get; set; }
/// <summary>
/// Gets or sets the primary image tag.

6
MediaBrowser.Server.Implementations/Library/UserManager.cs
View File

@ -402,15 +402,17 @@ namespace MediaBrowser.Server.Implementations.Library
return dto;
}
public UserDto GetOfflineUserDto(User user, string deviceId)
public UserDto GetOfflineUserDto(User user)
{
var dto = GetUserDto(user);
var offlinePasswordHash = GetLocalPasswordHash(user);
dto.HasPassword = !IsPasswordEmpty(offlinePasswordHash);
dto.OfflinePasswordSalt = Guid.NewGuid().ToString("N");
// Hash the pin with the device Id to create a unique result for this device
dto.OfflinePassword = GetSha1String((offlinePasswordHash + deviceId).ToLower());
dto.OfflinePassword = GetSha1String((offlinePasswordHash + dto.OfflinePasswordSalt).ToLower());
dto.ServerName = _appHost.FriendlyName;

3
MediaBrowser.Server.Implementations/Library/UserViewManager.cs
View File

@ -86,7 +86,8 @@ namespace MediaBrowser.Server.Implementations.Library
list.Add(await GetUserView(CollectionType.Movies, string.Empty, cancellationToken).ConfigureAwait(false));
}
if (foldersWithViewTypes.Any(i => string.Equals(i.CollectionType, CollectionType.Games, StringComparison.OrdinalIgnoreCase)))
if (foldersWithViewTypes.Any(i => string.Equals(i.CollectionType, CollectionType.Games, StringComparison.OrdinalIgnoreCase))
|| _config.Configuration.EnableLegacyCollections)
{
list.Add(await GetUserView(CollectionType.Games, string.Empty, cancellationToken).ConfigureAwait(false));
}

11
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs
View File

@ -33,16 +33,7 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
case OperatingSystem.Linux:
info.ArchiveType = "7z";
switch (environment.SystemArchitecture)
{
case Architecture.X86_X64:
info.Version = "20150124";
break;
case Architecture.X86:
info.Version = "20150124";
break;
}
info.Version = "20150124";
break;
case OperatingSystem.Osx:

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5518.4")]
[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5518.4")]