diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-03 23:04:19 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-03 23:04:19 -0500 |
| commit | 351cfef7a70ef311801be0bc9eb9e3891265d22b (patch) | |
| tree | edb841c6b311a1c13c4c70cbd4ed08e9129fac78 /MediaBrowser.Controller/Entities | |
| parent | 48b9f657a4d163e4be32c1641907fc429481aa85 (diff) | |
use conditional caching on some json responses
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/CollectionFolder.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 5a041860b..650a9bad0 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -253,6 +253,15 @@ namespace MediaBrowser.Controller.Entities } } + [IgnoreDataMember] + public IEnumerable<string> PhysicalLocations + { + get + { + return ResolveArgs.PhysicalLocations; + } + } + /// <summary> /// Resets the resolve args. /// </summary> diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index 0d6bed90b..6220bc4d5 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -84,7 +84,7 @@ namespace MediaBrowser.Controller.Entities try { - locationsDicionary = ResolveArgs.PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); + locationsDicionary = PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); } catch (IOException ex) { @@ -116,7 +116,7 @@ namespace MediaBrowser.Controller.Entities try { - locationsDicionary = ResolveArgs.PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); + locationsDicionary = PhysicalLocations.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); } catch (IOException ex) { diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 94db04864..02da2fe61 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1079,7 +1079,7 @@ namespace MediaBrowser.Controller.Entities if (i.LocationType != LocationType.Remote) { - if (i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase)) + if (i.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase)) { return true; } |