diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 26aae285de..438c5cf233 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -686,7 +686,7 @@ namespace MediaBrowser.Controller.Entities
get
{
var id = DisplayParentId;
- if (!id.HasValue)
+ if (!id.HasValue || id.Value == Guid.Empty)
{
return null;
}
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 2df2227bcd..db669ca37d 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -785,7 +785,7 @@ namespace MediaBrowser.Controller.Entities
return false;
}
- if (query.IncludeItemTypes.Contains("Movie", StringComparer.OrdinalIgnoreCase))
+ if (query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains("Movie", StringComparer.OrdinalIgnoreCase))
{
param = true;
}
diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index e308acef06..f3d5454921 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -24,6 +24,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
+using MediaBrowser.Common.Extensions;
namespace MediaBrowser.Server.Implementations.Connect
{
@@ -555,9 +556,22 @@ namespace MediaBrowser.Server.Implementations.Connect
}
catch (HttpException ex)
{
- if (!ex.StatusCode.HasValue ||
- ex.StatusCode.Value != HttpStatusCode.NotFound ||
- !Validator.EmailIsValid(connectUsername))
+ if (!ex.StatusCode.HasValue)
+ {
+ throw;
+ }
+
+ // If they entered a username, then whatever the error is just throw it, for example, user not found
+ if (!Validator.EmailIsValid(connectUsername))
+ {
+ if (ex.StatusCode.Value == HttpStatusCode.NotFound)
+ {
+ throw new ResourceNotFoundException();
+ }
+ throw;
+ }
+
+ if (ex.StatusCode.Value != HttpStatusCode.NotFound)
{
throw;
}
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index 9e68ce4efa..c7a5e3b184 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -335,12 +335,17 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
private bool FilterItem(BaseItem item)
{
- if (!item.IsFolder && item.LocationType == LocationType.Virtual)
+ if (item.IsFolder)
{
return false;
}
- if (item is IItemByName && !(item is MusicArtist))
+ if (item.LocationType == LocationType.Virtual)
+ {
+ return false;
+ }
+
+ if (item is IItemByName)
{
return false;
}
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index 5f528926bb..ac1b7ca996 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -217,6 +217,7 @@ namespace MediaBrowser.ServerApplication
{
var fileSystem = new WindowsFileSystem(new PatternsLogger(logManager.GetLogger("FileSystem")));
fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
+ //fileSystem.AddShortcutHandler(new LnkShortcutHandler(fileSystem));
var nativeApp = new WindowsApp(fileSystem, _logger)
{
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index f1a2915fe9..26a9cd8b34 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -110,6 +110,7 @@
MainForm.cs
+
diff --git a/MediaBrowser.ServerApplication/Native/LnkShortcutHandler.cs b/MediaBrowser.ServerApplication/Native/LnkShortcutHandler.cs
new file mode 100644
index 0000000000..67d2e83f0e
--- /dev/null
+++ b/MediaBrowser.ServerApplication/Native/LnkShortcutHandler.cs
@@ -0,0 +1,402 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+using System.Threading.Tasks;
+using CommonIO;
+
+namespace MediaBrowser.ServerApplication.Native
+{
+ public class LnkShortcutHandler : IShortcutHandler
+ {
+ public string Extension
+ {
+ get { return ".lnk"; }
+ }
+
+ public string Resolve(string shortcutPath)
+ {
+ var link = new ShellLink();
+ ((IPersistFile)link).Load(shortcutPath, NativeMethods.STGM_READ);
+ // ((IShellLinkW)link).Resolve(hwnd, 0)
+ var sb = new StringBuilder(NativeMethods.MAX_PATH);
+ WIN32_FIND_DATA data;
+ ((IShellLinkW)link).GetPath(sb, sb.Capacity, out data, 0);
+ return sb.ToString();
+ }
+
+ public void Create(string shortcutPath, string targetPath)
+ {
+ throw new NotImplementedException();
+ }
+ }
+
+ ///
+ /// Class NativeMethods
+ ///
+ [SuppressUnmanagedCodeSecurity]
+ public static class NativeMethods
+ {
+ ///
+ /// The MA x_ PATH
+ ///
+ public const int MAX_PATH = 260;
+ ///
+ /// The MA x_ ALTERNATE
+ ///
+ public const int MAX_ALTERNATE = 14;
+ ///
+ /// The INVALI d_ HANDL e_ VALUE
+ ///
+ public static IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
+ ///
+ /// The STG m_ READ
+ ///
+ public const uint STGM_READ = 0;
+ }
+
+ ///
+ /// Struct FILETIME
+ ///
+ [StructLayout(LayoutKind.Sequential)]
+ public struct FILETIME
+ {
+ ///
+ /// The dw low date time
+ ///
+ public uint dwLowDateTime;
+ ///
+ /// The dw high date time
+ ///
+ public uint dwHighDateTime;
+ }
+
+ ///
+ /// Struct WIN32_FIND_DATA
+ ///
+ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+ public struct WIN32_FIND_DATA
+ {
+ ///
+ /// The dw file attributes
+ ///
+ public FileAttributes dwFileAttributes;
+ ///
+ /// The ft creation time
+ ///
+ public FILETIME ftCreationTime;
+ ///
+ /// The ft last access time
+ ///
+ public FILETIME ftLastAccessTime;
+ ///
+ /// The ft last write time
+ ///
+ public FILETIME ftLastWriteTime;
+ ///
+ /// The n file size high
+ ///
+ public int nFileSizeHigh;
+ ///
+ /// The n file size low
+ ///
+ public int nFileSizeLow;
+ ///
+ /// The dw reserved0
+ ///
+ public int dwReserved0;
+ ///
+ /// The dw reserved1
+ ///
+ public int dwReserved1;
+
+ ///
+ /// The c file name
+ ///
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NativeMethods.MAX_PATH)]
+ public string cFileName;
+
+ ///
+ /// This will always be null when FINDEX_INFO_LEVELS = basic
+ ///
+ [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NativeMethods.MAX_ALTERNATE)]
+ public string cAlternate;
+
+ ///
+ /// Gets or sets the path.
+ ///
+ /// The path.
+ public string Path { get; set; }
+
+ ///
+ /// Returns a that represents this instance.
+ ///
+ /// A that represents this instance.
+ public override string ToString()
+ {
+ return Path ?? string.Empty;
+ }
+ }
+
+ ///
+ /// Enum SLGP_FLAGS
+ ///
+ [Flags]
+ public enum SLGP_FLAGS
+ {
+ ///
+ /// Retrieves the standard short (8.3 format) file name
+ ///
+ SLGP_SHORTPATH = 0x1,
+ ///
+ /// Retrieves the Universal Naming Convention (UNC) path name of the file
+ ///
+ SLGP_UNCPRIORITY = 0x2,
+ ///
+ /// Retrieves the raw path name. A raw path is something that might not exist and may include environment variables that need to be expanded
+ ///
+ SLGP_RAWPATH = 0x4
+ }
+ ///
+ /// Enum SLR_FLAGS
+ ///
+ [Flags]
+ public enum SLR_FLAGS
+ {
+ ///
+ /// Do not display a dialog box if the link cannot be resolved. When SLR_NO_UI is set,
+ /// the high-order word of fFlags can be set to a time-out value that specifies the
+ /// maximum amount of time to be spent resolving the link. The function returns if the
+ /// link cannot be resolved within the time-out duration. If the high-order word is set
+ /// to zero, the time-out duration will be set to the default value of 3,000 milliseconds
+ /// (3 seconds). To specify a value, set the high word of fFlags to the desired time-out
+ /// duration, in milliseconds.
+ ///
+ SLR_NO_UI = 0x1,
+ ///
+ /// Obsolete and no longer used
+ ///
+ SLR_ANY_MATCH = 0x2,
+ ///
+ /// If the link object has changed, update its path and list of identifiers.
+ /// If SLR_UPDATE is set, you do not need to call IPersistFile::IsDirty to determine
+ /// whether or not the link object has changed.
+ ///
+ SLR_UPDATE = 0x4,
+ ///
+ /// Do not update the link information
+ ///
+ SLR_NOUPDATE = 0x8,
+ ///
+ /// Do not execute the search heuristics
+ ///
+ SLR_NOSEARCH = 0x10,
+ ///
+ /// Do not use distributed link tracking
+ ///
+ SLR_NOTRACK = 0x20,
+ ///
+ /// Disable distributed link tracking. By default, distributed link tracking tracks
+ /// removable media across multiple devices based on the volume name. It also uses the
+ /// Universal Naming Convention (UNC) path to track remote file systems whose drive letter
+ /// has changed. Setting SLR_NOLINKINFO disables both types of tracking.
+ ///
+ SLR_NOLINKINFO = 0x40,
+ ///
+ /// Call the Microsoft Windows Installer
+ ///
+ SLR_INVOKE_MSI = 0x80
+ }
+
+ ///
+ /// The IShellLink interface allows Shell links to be created, modified, and resolved
+ ///
+ [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("000214F9-0000-0000-C000-000000000046")]
+ public interface IShellLinkW
+ {
+ ///
+ /// Retrieves the path and file name of a Shell link object
+ ///
+ /// The PSZ file.
+ /// The CCH max path.
+ /// The PFD.
+ /// The f flags.
+ void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, out WIN32_FIND_DATA pfd, SLGP_FLAGS fFlags);
+ ///
+ /// Retrieves the list of item identifiers for a Shell link object
+ ///
+ /// The ppidl.
+ void GetIDList(out IntPtr ppidl);
+ ///
+ /// Sets the pointer to an item identifier list (PIDL) for a Shell link object.
+ ///
+ /// The pidl.
+ void SetIDList(IntPtr pidl);
+ ///
+ /// Retrieves the description string for a Shell link object
+ ///
+ /// Name of the PSZ.
+ /// Name of the CCH max.
+ void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, int cchMaxName);
+ ///
+ /// Sets the description for a Shell link object. The description can be any application-defined string
+ ///
+ /// Name of the PSZ.
+ void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+ ///
+ /// Retrieves the name of the working directory for a Shell link object
+ ///
+ /// The PSZ dir.
+ /// The CCH max path.
+ void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath);
+ ///
+ /// Sets the name of the working directory for a Shell link object
+ ///
+ /// The PSZ dir.
+ void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
+ ///
+ /// Retrieves the command-line arguments associated with a Shell link object
+ ///
+ /// The PSZ args.
+ /// The CCH max path.
+ void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath);
+ ///
+ /// Sets the command-line arguments for a Shell link object
+ ///
+ /// The PSZ args.
+ void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
+ ///
+ /// Retrieves the hot key for a Shell link object
+ ///
+ /// The pw hotkey.
+ void GetHotkey(out short pwHotkey);
+ ///
+ /// Sets a hot key for a Shell link object
+ ///
+ /// The w hotkey.
+ void SetHotkey(short wHotkey);
+ ///
+ /// Retrieves the show command for a Shell link object
+ ///
+ /// The pi show CMD.
+ void GetShowCmd(out int piShowCmd);
+ ///
+ /// Sets the show command for a Shell link object. The show command sets the initial show state of the window.
+ ///
+ /// The i show CMD.
+ void SetShowCmd(int iShowCmd);
+ ///
+ /// Retrieves the location (path and index) of the icon for a Shell link object
+ ///
+ /// The PSZ icon path.
+ /// The CCH icon path.
+ /// The pi icon.
+ void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath,
+ int cchIconPath, out int piIcon);
+ ///
+ /// Sets the location (path and index) of the icon for a Shell link object
+ ///
+ /// The PSZ icon path.
+ /// The i icon.
+ void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
+ ///
+ /// Sets the relative path to the Shell link object
+ ///
+ /// The PSZ path rel.
+ /// The dw reserved.
+ void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved);
+ ///
+ /// Attempts to find the target of a Shell link, even if it has been moved or renamed
+ ///
+ /// The HWND.
+ /// The f flags.
+ void Resolve(IntPtr hwnd, SLR_FLAGS fFlags);
+ ///
+ /// Sets the path and file name of a Shell link object
+ ///
+ /// The PSZ file.
+ void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
+
+ }
+
+ ///
+ /// Interface IPersist
+ ///
+ [ComImport, Guid("0000010c-0000-0000-c000-000000000046"),
+ InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ public interface IPersist
+ {
+ ///
+ /// Gets the class ID.
+ ///
+ /// The p class ID.
+ [PreserveSig]
+ void GetClassID(out Guid pClassID);
+ }
+
+ ///
+ /// Interface IPersistFile
+ ///
+ [ComImport, Guid("0000010b-0000-0000-C000-000000000046"),
+ InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+ public interface IPersistFile : IPersist
+ {
+ ///
+ /// Gets the class ID.
+ ///
+ /// The p class ID.
+ new void GetClassID(out Guid pClassID);
+ ///
+ /// Determines whether this instance is dirty.
+ ///
+ [PreserveSig]
+ int IsDirty();
+
+ ///
+ /// Loads the specified PSZ file name.
+ ///
+ /// Name of the PSZ file.
+ /// The dw mode.
+ [PreserveSig]
+ void Load([In, MarshalAs(UnmanagedType.LPWStr)]
+ string pszFileName, uint dwMode);
+
+ ///
+ /// Saves the specified PSZ file name.
+ ///
+ /// Name of the PSZ file.
+ /// if set to true [remember].
+ [PreserveSig]
+ void Save([In, MarshalAs(UnmanagedType.LPWStr)] string pszFileName,
+ [In, MarshalAs(UnmanagedType.Bool)] bool remember);
+
+ ///
+ /// Saves the completed.
+ ///
+ /// Name of the PSZ file.
+ [PreserveSig]
+ void SaveCompleted([In, MarshalAs(UnmanagedType.LPWStr)] string pszFileName);
+
+ ///
+ /// Gets the cur file.
+ ///
+ /// Name of the PPSZ file.
+ [PreserveSig]
+ void GetCurFile([In, MarshalAs(UnmanagedType.LPWStr)] string ppszFileName);
+ }
+
+ // CLSID_ShellLink from ShlGuid.h
+ ///
+ /// Class ShellLink
+ ///
+ [
+ ComImport,
+ Guid("00021401-0000-0000-C000-000000000046")
+ ]
+ public class ShellLink
+ {
+ }
+}
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 122176facc..70b19f971b 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1688,9 +1688,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest