aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-11 02:24:36 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-11 02:24:36 -0500
commit00cbadea2c5ea8c717808fb4e8b11004509dc379 (patch)
tree3f59a210f8fd1bcd6cb72806eb11751712a2f777 /MediaBrowser.Controller
parent06afe47ee9716cb210067f3c09cd0c97722bd1c7 (diff)
update core project
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Devices/CameraUploadsFolder.cs67
-rw-r--r--MediaBrowser.Controller/MediaBrowser.Controller.csproj2
-rw-r--r--MediaBrowser.Controller/Playlists/ManualPlaylistsFolder.cs53
3 files changed, 0 insertions, 122 deletions
diff --git a/MediaBrowser.Controller/Devices/CameraUploadsFolder.cs b/MediaBrowser.Controller/Devices/CameraUploadsFolder.cs
deleted file mode 100644
index 979a929ca..000000000
--- a/MediaBrowser.Controller/Devices/CameraUploadsFolder.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Server.Implementations.Devices
-{
- public class CameraUploadsFolder : BasePluginFolder, ISupportsUserSpecificView
- {
- public CameraUploadsFolder()
- {
- Name = "Camera Uploads";
- }
-
- public override bool IsVisible(User user)
- {
- if (!user.Policy.EnableAllFolders && !user.Policy.EnabledFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase))
- {
- return false;
- }
-
- return base.IsVisible(user) && HasChildren();
- }
-
- [IgnoreDataMember]
- public override string CollectionType
- {
- get { return Model.Entities.CollectionType.Photos; }
- }
-
- public override string GetClientTypeName()
- {
- return typeof(CollectionFolder).Name;
- }
-
- private bool? _hasChildren;
- private bool HasChildren()
- {
- if (!_hasChildren.HasValue)
- {
- _hasChildren = LibraryManager.GetItemIds(new InternalItemsQuery { ParentId = Id }).Count > 0;
- }
-
- return _hasChildren.Value;
- }
-
- protected override Task ValidateChildrenInternal(IProgress<double> progress, CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService)
- {
- _hasChildren = null;
- return base.ValidateChildrenInternal(progress, cancellationToken, recursive, refreshChildMetadata, refreshOptions, directoryService);
- }
-
- [IgnoreDataMember]
- public bool EnableUserSpecificView
- {
- get { return true; }
- }
- }
-}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index d867b1512..518daa6d7 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -77,7 +77,6 @@
<Compile Include="Connect\IConnectManager.cs" />
<Compile Include="Connect\UserLinkResult.cs" />
<Compile Include="Devices\CameraImageUploadInfo.cs" />
- <Compile Include="Devices\CameraUploadsFolder.cs" />
<Compile Include="Devices\IDeviceManager.cs" />
<Compile Include="Devices\IDeviceRepository.cs" />
<Compile Include="Dlna\ControlRequest.cs" />
@@ -218,7 +217,6 @@
<Compile Include="Persistence\IFileOrganizationRepository.cs" />
<Compile Include="Persistence\MediaStreamQuery.cs" />
<Compile Include="Playlists\IPlaylistManager.cs" />
- <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
<Compile Include="Playlists\Playlist.cs" />
<Compile Include="Plugins\ILocalizablePlugin.cs" />
<Compile Include="Providers\AlbumInfo.cs" />
diff --git a/MediaBrowser.Controller/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Controller/Playlists/ManualPlaylistsFolder.cs
deleted file mode 100644
index 07773d846..000000000
--- a/MediaBrowser.Controller/Playlists/ManualPlaylistsFolder.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Playlists;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Server.Implementations.Playlists
-{
- public class PlaylistsFolder : BasePluginFolder
- {
- public PlaylistsFolder()
- {
- Name = "Playlists";
- }
-
- public override bool IsVisible(User user)
- {
- return base.IsVisible(user) && GetChildren(user, true).Any();
- }
-
- protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
- {
- return base.GetEligibleChildrenForRecursiveChildren(user).OfType<Playlist>();
- }
-
- [IgnoreDataMember]
- public override bool IsHidden
- {
- get
- {
- return true;
- }
- }
-
- [IgnoreDataMember]
- public override string CollectionType
- {
- get { return MediaBrowser.Model.Entities.CollectionType.Playlists; }
- }
-
- protected override Task<QueryResult<BaseItem>> GetItemsInternal(InternalItemsQuery query)
- {
- query.Recursive = false;
- return base.GetItemsInternal(query);
- }
- }
-}
-