aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-08-13 02:33:31 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-08-13 02:33:31 -0400
commitc18b8ec608b44e04d17a1ef02a615b985ca00e7b (patch)
treefaab259f0f72ef9e4fe0baf99ed9c8abf1a6d619
parent5989065517d081ef11d9efdd8a20dc4ad671a0b1 (diff)
add options to library setup
-rw-r--r--MediaBrowser.Controller/Entities/CollectionFolder.cs8
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj6
2 files changed, 10 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index 68ba22356..289cb7a2e 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -44,16 +44,16 @@ namespace MediaBrowser.Controller.Entities
public string CollectionType { get; set; }
- private readonly Dictionary<string, LibraryOptions> _libraryOptions = new Dictionary<string, LibraryOptions>();
+ private static readonly Dictionary<string, LibraryOptions> LibraryOptions = new Dictionary<string, LibraryOptions>();
public LibraryOptions GetLibraryOptions()
{
- lock (_libraryOptions)
+ lock (LibraryOptions)
{
LibraryOptions options;
- if (!_libraryOptions.TryGetValue(Path, out options))
+ if (!LibraryOptions.TryGetValue(Path, out options))
{
options = LoadLibraryOptions();
- _libraryOptions[Path] = options;
+ LibraryOptions[Path] = options;
}
return options;
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 2917ec2ce..f1b234b90 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -143,6 +143,12 @@
<Content Include="dashboard-ui\components\guestinviter\guestinviter.template.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.template.html">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\components\navdrawer\navdrawer.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>