diff options
| author | Max Git <rotvel@gmail.com> | 2020-06-11 14:50:29 +0200 |
|---|---|---|
| committer | Max Git <rotvel@gmail.com> | 2020-06-11 14:50:29 +0200 |
| commit | 620a1a106d6ecb824c1b52703013cd87413b0297 (patch) | |
| tree | 64e6e5616fe045aa837a8b3c6c1c3d5c33035e7e /MediaBrowser.Controller/Library | |
| parent | 268e87bbf27a724edd9ea665619563729998aba9 (diff) | |
| parent | 55610f83597e668854e6022cd9d3a60d14cb0623 (diff) | |
Merge branch 'master' into feature/ffmpeg-version-check
Diffstat (limited to 'MediaBrowser.Controller/Library')
| -rw-r--r-- | MediaBrowser.Controller/Library/ILibraryManager.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs index 916e4fda7..5afe356f4 100644 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ b/MediaBrowser.Controller/Library/ILibraryManager.cs @@ -27,14 +27,18 @@ namespace MediaBrowser.Controller.Library /// </summary> /// <param name="fileInfo">The file information.</param> /// <param name="parent">The parent.</param> + /// <param name="allowIgnorePath">Allow the path to be ignored.</param> /// <returns>BaseItem.</returns> - BaseItem ResolvePath(FileSystemMetadata fileInfo, - Folder parent = null); + BaseItem ResolvePath( + FileSystemMetadata fileInfo, + Folder parent = null, + bool allowIgnorePath = true); /// <summary> /// Resolves a set of files into a list of BaseItem /// </summary> - IEnumerable<BaseItem> ResolvePaths(IEnumerable<FileSystemMetadata> files, + IEnumerable<BaseItem> ResolvePaths( + IEnumerable<FileSystemMetadata> files, IDirectoryService directoryService, Folder parent, LibraryOptions libraryOptions, |