diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Connect/IConnectManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/User.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/IUserManager.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs | 13 |
5 files changed, 15 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Connect/IConnectManager.cs b/MediaBrowser.Controller/Connect/IConnectManager.cs index afb61cb23..8bd0332c0 100644 --- a/MediaBrowser.Controller/Connect/IConnectManager.cs +++ b/MediaBrowser.Controller/Connect/IConnectManager.cs @@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Connect /// </summary> /// <param name="userId">The user identifier.</param> /// <returns>Task.</returns> - Task RemoveLink(string userId); + Task RemoveConnect(string userId); /// <summary> /// Invites the user. diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs index e0682c9ee..2275cbad4 100644 --- a/MediaBrowser.Controller/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.Entities public string ConnectUserName { get; set; } public string ConnectUserId { get; set; } - public UserLinkType ConnectLinkType { get; set; } + public UserLinkType? ConnectLinkType { get; set; } public string ConnectAccessKey { get; set; } /// <summary> diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 59649de7f..dc9769d53 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -128,6 +128,7 @@ namespace MediaBrowser.Controller.Entities public bool HasSubtitles { get; set; } public bool IsPlaceHolder { get; set; } + public bool IsShortcut { get; set; } /// <summary> /// Gets or sets the tags. diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index 3efdbea76..39ec2b85d 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -55,16 +55,16 @@ namespace MediaBrowser.Controller.Library /// <param name="id">The identifier.</param> /// <returns>User.</returns> User GetUserById(string id); - + /// <summary> /// Authenticates a User and returns a result indicating whether or not it succeeded /// </summary> /// <param name="username">The username.</param> - /// <param name="password">The password.</param> + /// <param name="passwordSha1">The password sha1.</param> /// <param name="remoteEndPoint">The remote end point.</param> /// <returns>Task{System.Boolean}.</returns> /// <exception cref="System.ArgumentNullException">user</exception> - Task<bool> AuthenticateUser(string username, string password, string remoteEndPoint); + Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint); /// <summary> /// Refreshes metadata for each user diff --git a/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs index 038d8d48b..5725c6482 100644 --- a/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs +++ b/MediaBrowser.Controller/Resolvers/BaseVideoResolver.cs @@ -38,19 +38,24 @@ namespace MediaBrowser.Controller.Resolvers // http://wiki.xbmc.org/index.php?title=Media_stubs var isPlaceHolder = EntityResolutionHelper.IsVideoPlaceHolder(args.Path); - if (EntityResolutionHelper.IsVideoFile(args.Path) || isPlaceHolder) - { - var extension = Path.GetExtension(args.Path); + var extension = Path.GetExtension(args.Path); + + var isShortcut = string.Equals(extension, ".strm", StringComparison.OrdinalIgnoreCase); + if (EntityResolutionHelper.IsVideoFile(args.Path) || isPlaceHolder || isShortcut) + { var type = string.Equals(extension, ".iso", StringComparison.OrdinalIgnoreCase) || string.Equals(extension, ".img", StringComparison.OrdinalIgnoreCase) ? VideoType.Iso : VideoType.VideoFile; + var path = args.Path; + var video = new TVideoType { VideoType = type, Path = args.Path, IsInMixedFolder = true, - IsPlaceHolder = isPlaceHolder + IsPlaceHolder = isPlaceHolder, + IsShortcut = isShortcut }; if (isPlaceHolder) |