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

show messages the first time folder rips are streamed

Browse Source
This commit is contained in:
Luke Pulverenti 2013-05-24 21:51:17 -04:00
parent 41e3b2fb3a
commit 2765ff58bc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/Library/LibraryHelpers.cs
View File

@ -182,6 +182,8 @@ namespace MediaBrowser.Api.Library
throw new ArgumentException(string.Format("The path cannot be added to the library because {0} already exists.", duplicate)); throw new ArgumentException(string.Format("The path cannot be added to the library because {0} already exists.", duplicate));
} }
// Don't allow duplicate sub-paths within the same user library, or it will result in duplicate items
// See comments in IsNewPathValid
duplicate = Directory.EnumerateFiles(currentViewRootFolderPath, "*.lnk", SearchOption.AllDirectories) duplicate = Directory.EnumerateFiles(currentViewRootFolderPath, "*.lnk", SearchOption.AllDirectories)
.Select(FileSystem.ResolveShortcut) .Select(FileSystem.ResolveShortcut)
.FirstOrDefault(p => !IsNewPathValid(mediaPath, p, true)); .FirstOrDefault(p => !IsNewPathValid(mediaPath, p, true));
@ -221,7 +223,7 @@ namespace MediaBrowser.Api.Library
return true; return true;
} }
// Validate the D:\Movies\Kids scenario // If enforceSubPathRestriction is true, validate the D:\Movies\Kids scenario
if (enforceSubPathRestriction && newPath.StartsWith(existingPath.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase)) if (enforceSubPathRestriction && newPath.StartsWith(existingPath.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase))
{ {
return false; return false;