Fix build

This commit is contained in:
Bond_009 2021-02-24 02:34:50 +01:00
parent 914e891689
commit 1c74e2f40e
5 changed files with 25 additions and 15 deletions

View File

@ -107,7 +107,7 @@ namespace Emby.Server.Implementations.Collections
var name = _localizationManager.GetLocalizedString("Collections");
await _libraryManager.AddVirtualFolder(name, CollectionType.BoxSets, libraryOptions, true).ConfigureAwait(false);
await _libraryManager.AddVirtualFolder(name, CollectionTypeOptions.BoxSets, libraryOptions, true).ConfigureAwait(false);
return FindFolders(path).First();
}

View File

@ -1240,11 +1240,20 @@ namespace Emby.Server.Implementations.Library
return info;
}
private string GetCollectionType(string path)
private CollectionTypeOptions GetCollectionType(string path)
{
return _fileSystem.GetFilePaths(path, new[] { ".collection" }, true, false)
.Select(Path.GetFileNameWithoutExtension)
.FirstOrDefault(i => !string.IsNullOrEmpty(i));
var files = _fileSystem.GetFilePaths(path, new[] { ".collection" }, true, false);
foreach (var file in files)
{
// TODO: @bond use a ReadOnlySpan<char> here when Enum.TryParse supports it
// https://github.com/dotnet/runtime/issues/20008
if (Enum.TryParse<CollectionTypeOptions>(Path.GetExtension(file), true, out var res))
{
return res;
}
}
throw new FileNotFoundException("Coudn't find an appropriate collection type file.");
}
/// <summary>

View File

@ -2604,7 +2604,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
Locations = new string[] { customPath },
Name = "Recorded Movies",
CollectionType = CollectionType.Movies
CollectionType = CollectionTypeOptions.Movies
};
}
@ -2615,7 +2615,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
Locations = new string[] { customPath },
Name = "Recorded Shows",
CollectionType = CollectionType.TvShows
CollectionType = CollectionTypeOptions.TvShows
};
}
}

View File

@ -4,12 +4,13 @@ namespace MediaBrowser.Model.Entities
{
public enum CollectionTypeOptions
{
Movies,
Music,
TvShows,
Books,
HomeVideos,
MusicVideos,
Mixed
Movies = 0,
TvShows = 1,
Music = 2,
MusicVideos = 3,
HomeVideos = 4,
BoxSets = 5,
Books = 6,
Mixed = 7
}
}

View File

@ -35,7 +35,7 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the type of the collection.
/// </summary>
/// <value>The type of the collection.</value>
public string CollectionType { get; set; }
public CollectionTypeOptions CollectionType { get; set; }
public LibraryOptions LibraryOptions { get; set; }