From 58eb50095676ec8bb4f7d4e1d0fc766dd3280305 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 6 Sep 2014 00:21:23 -0400
Subject: fixes #914 - Add option to save metadata hidden

---
 .../Connect/ConnectManager.cs                      |  6 +--
 .../HttpServer/Security/AuthService.cs             |  2 +-
 .../Library/LibraryManager.cs                      | 22 +---------
 .../Localization/Server/server.json                | 48 ++++++++++++----------
 4 files changed, 32 insertions(+), 46 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
index dc03f14cb..c406e48b9 100644
--- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
+++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
@@ -1,5 +1,4 @@
-using System.Net;
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
@@ -12,6 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Net;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -77,7 +77,7 @@ namespace MediaBrowser.Server.Implementations.Connect
         {
             WanIpAddress = address;
 
-            UpdateConnectInfo();
+            //UpdateConnectInfo();
         }
 
         private async void UpdateConnectInfo()
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
index 855b26034..1294368f1 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -59,7 +59,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
             var auth = AuthorizationContext.GetAuthorizationInfo(req);
 
             if (!string.IsNullOrWhiteSpace(auth.Token)
-                || _config.Configuration.SecureApps.Contains(auth.Client ?? string.Empty, StringComparer.OrdinalIgnoreCase))
+                || _config.Configuration.SecureApps1.Contains(auth.Client ?? string.Empty, StringComparer.OrdinalIgnoreCase))
             {
                 if (!allowLocal || !req.IsLocal)
                 {
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index a3e86c667..076da4352 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -861,13 +861,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (!fileInfo.Exists)
             {
-                Directory.CreateDirectory(path);
-                fileInfo = new DirectoryInfo(path);
-
-                if (!fileInfo.Exists)
-                {
-                    throw new IOException("Path not created: " + path);
-                }
+                fileInfo = Directory.CreateDirectory(path);
 
                 isNew = true;
             }
@@ -1470,20 +1464,6 @@ namespace MediaBrowser.Server.Implementations.Library
             return collectionTypes.Count == 1 ? collectionTypes[0] : null;
         }
 
-
-        public IEnumerable<string> GetAllArtists()
-        {
-            return GetAllArtists(RootFolder.RecursiveChildren);
-        }
-
-        public IEnumerable<string> GetAllArtists(IEnumerable<BaseItem> items)
-        {
-            return items
-                .OfType<Audio>()
-                .SelectMany(i => i.AllArtists)
-                .Distinct(StringComparer.OrdinalIgnoreCase);
-        }
-
         public Task<UserView> GetNamedView(string name, string type, string sortName, CancellationToken cancellationToken)
         {
             return GetNamedView(name, null, type, sortName, cancellationToken);
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 2192f5f08..db810c947 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -842,26 +842,27 @@
     "ViewTypeChannels": "Channels",
     "ViewTypeLiveTV": "Live TV",
     "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames":  "Latest Games",
-    "ViewTypeRecentlyPlayedGames":  "Recently Played",
-    "ViewTypeGameFavorites":  "Favorites",
-    "ViewTypeGameSystems":  "Game Systems",
-    "ViewTypeGameGenres":  "Genres",
-    "ViewTypeTvResume":  "Resume",
-    "ViewTypeTvNextUp":  "Next Up",
-    "ViewTypeTvLatest":  "Latest",
-    "ViewTypeTvSeries":  "Series",
-    "ViewTypeTvGenres":  "Genres",
-    "ViewTypeTvFavorites":  "Favorites",
-    "ViewTypeMovieResume":  "Resume",
-    "ViewTypeMovieLatest":  "Latest",
-    "ViewTypeMovieMovies":  "Movies",
-    "ViewTypeMovieCollections":  "Collections",
-    "ViewTypeMovieFavorites":  "Favorites",
-    "ViewTypeMovieGenres":  "Genres",
-    "ViewTypeMusicLatest":  "Latest",
-    "ViewTypeMusicAlbums":  "Albums",
-    "ViewTypeMusicAlbumArtists":  "Album Artists",
+    "ViewTypeLatestGames": "Latest Games",
+    "ViewTypeRecentlyPlayedGames": "Recently Played",
+    "ViewTypeGameFavorites": "Favorites",
+    "ViewTypeGameSystems": "Game Systems",
+    "ViewTypeGameGenres": "Genres",
+    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvNextUp": "Next Up",
+    "ViewTypeTvLatest": "Latest",
+    "ViewTypeTvShowSeries": "Series",
+    "ViewTypeTvGenres": "Genres",
+    "ViewTypeTvFavoriteSeries": "Favorite Series",
+    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+    "ViewTypeMovieResume": "Resume",
+    "ViewTypeMovieLatest": "Latest",
+    "ViewTypeMovieMovies": "Movies",
+    "ViewTypeMovieCollections": "Collections",
+    "ViewTypeMovieFavorites": "Favorites",
+    "ViewTypeMovieGenres": "Genres",
+    "ViewTypeMusicLatest": "Latest",
+    "ViewTypeMusicAlbums": "Albums",
+    "ViewTypeMusicAlbumArtists": "Album Artists",
     "HeaderOtherDisplaySettings": "Display Settings",
     "HeaderMyViews": "My Views",
     "LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:",
@@ -1143,5 +1144,10 @@
     "HeaderDeveloperInfo": "Developer Info",
     "HeaderRevisionHistory": "Revision History",
     "ButtonViewWebsite": "View website",
-    "LabelRecurringDonationCanBeCancelledHelp":  "Recurring donations can be cancelled at any time from within your PayPal account."
+    "LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.",
+    "HeaderXmlSettings": "Xml Settings",
+    "HeaderXmlDocumentAttributes": "Xml Document Attributes",
+    "HeaderXmlDocumentAttribute": "Xml Document Attribute",
+    "XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every xml response.",
+    "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files"
 }
-- 
cgit v1.2.3