added a photo view

MediaBrowser.Api/UserLibrary/UserViewsService.cs

@@ -88,7 +88,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             var views = user.RootFolder
                 .GetChildren(user, true)
-                .OfType<CollectionFolder>()
+                .OfType<ICollectionFolder>()
                 .Where(i => IsEligibleForSpecialView(i))
                 .ToList();
 
@@ -105,9 +105,9 @@ namespace MediaBrowser.Api.UserLibrary
             return ToOptimizedResult(list);
         }
 
-        private bool IsEligibleForSpecialView(CollectionFolder view)
+        private bool IsEligibleForSpecialView(ICollectionFolder view)
         {
-            var types = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Games, CollectionType.Music };
+            var types = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Games, CollectionType.Music, CollectionType.Photos };
 
             return types.Contains(view.CollectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
         }

MediaBrowser.Controller/Entities/UserViewBuilder.cs

@@ -121,7 +121,6 @@ namespace MediaBrowser.Controller.Entities
                     }
 
                 case CollectionType.Books:
-                case CollectionType.Photos:
                 case CollectionType.HomeVideos:
                 case CollectionType.MusicVideos:
                     return GetResult(queryParent.GetChildren(user, true), queryParent, query);
@@ -138,6 +137,9 @@ namespace MediaBrowser.Controller.Entities
                 case CollectionType.BoxSets:
                     return await GetBoxsetView(queryParent, user, query).ConfigureAwait(false);
 
+                case CollectionType.Photos:
+                    return await GetPhotosView(queryParent, user, query).ConfigureAwait(false);
+
                 case CollectionType.TvShows:
                     return await GetTvView(queryParent, user, query).ConfigureAwait(false);
 
@@ -645,6 +647,19 @@ namespace MediaBrowser.Controller.Entities
             }), parent, query);
         }
 
+        private async Task<QueryResult<BaseItem>> GetPhotosView(Folder queryParent, User user, InternalItemsQuery query)
+        {
+            if (query.Recursive)
+            {
+                var mediaTypes = new[] { MediaType.Video, MediaType.Photo };
+                var items = GetRecursiveChildren(queryParent, user, new[] { CollectionType.Photos, string.Empty }, i => (i is PhotoAlbum || mediaTypes.Contains(i.MediaType ?? string.Empty, StringComparer.OrdinalIgnoreCase)) && FilterItem(i, query));
+
+                return PostFilterAndSort(items, queryParent, null, query);
+            }
+
+            return GetResult(queryParent.GetChildren(user, true), queryParent, query);
+        }
+
         private async Task<QueryResult<BaseItem>> GetTvView(Folder parent, User user, InternalItemsQuery query)
         {
             if (query.Recursive)

MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs

@@ -1,5 +1,4 @@
-using System.Linq;
+using MediaBrowser.Controller;
-using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
@@ -139,48 +138,18 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             // On some systems the device discovered event seems to fire repeatedly
             // This check will help ensure we're not trying to port map the same device over and over
 
-            List<Mapping> currentMappings = null;
-
-            try
-            {
-                currentMappings = device.GetAllMappings().ToList();
-            }
-            catch (NotSupportedException)
-            {
-            }
-
             var address = device.LocalAddress.ToString();
 
             if (!_createdRules.Contains(address))
             {
                 _createdRules.Add(address);
 
-                CreatePortMap(device, currentMappings, _appHost.HttpPort, _config.Configuration.PublicPort);
+                CreatePortMap(device, _appHost.HttpPort, _config.Configuration.PublicPort);
-                CreatePortMap(device, currentMappings, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort);
+                CreatePortMap(device, _appHost.HttpsPort, _config.Configuration.PublicHttpsPort);
-            }
-        }
-
-        private void CreatePortMap(INatDevice device, List<Mapping> currentMappings, int privatePort, int publicPort)
-        {
-            var hasMapping = false;
-
-            if (currentMappings != null)
-            {
-                hasMapping = currentMappings.Any(i => i.PublicPort == publicPort && i.PrivatePort == privatePort);
-            }
-            else
-            {
-                try
-                {
-                    var mapping = device.GetSpecificMapping(Protocol.Tcp, publicPort);
-                    hasMapping = mapping != null;
-                }
-                catch (NotSupportedException)
-                {
             }
         }
 
-            if (!hasMapping)
+        private void CreatePortMap(INatDevice device, int privatePort, int publicPort)
         {
             _logger.Debug("Creating port map on port {0}", privatePort);
             device.CreatePortMap(new Mapping(Protocol.Tcp, privatePort, publicPort)
@@ -188,7 +157,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 Description = _appHost.Name
             });
         }
-        }
 
         // As I said before, this method will be never invoked. You can remove it.
         void NatUtility_DeviceLost(object sender, DeviceEventArgs e)

MediaBrowser.Server.Implementations/Localization/Server/server.json

@@ -1433,5 +1433,7 @@
     "ToAccessPreferencesHelp": "To access your preferences later, click your user icon in the top right header and select My Preferences.",
     "HeaderViewStyles": "View Styles",
     "LabelSelectViewStyles": "Enable rich presentations for:",
-    "LabelSelectViewStylesHelp": "If enabled, views will be built with metadata to offer categories such as Suggestions, Latest, Genres, and more. If disabled, they'll be displayed with simple folders."
+    "LabelSelectViewStylesHelp": "If enabled, views will be built with metadata to offer categories such as Suggestions, Latest, Genres, and more. If disabled, they'll be displayed with simple folders.",
+    "TabPhotos": "Photos",
+    "TabVideos": "Videos"
 }

MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -470,6 +470,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "notificationlist.js",
                                 "notificationsetting.js",
                                 "notificationsettings.js",
+                                "photos.js",
                                 "playlists.js",
                                 "playlistedit.js",
 

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -132,6 +132,9 @@
     <Content Include="dashboard-ui\mysyncjob.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\photos.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\dashboardhosting.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -147,6 +150,9 @@
     <Content Include="dashboard-ui\scripts\livetvitems.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\photos.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\selectserver.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>