Update to 3.5.2 and .net core 2.1

1 files changed, 24 insertions, 117 deletions

diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index 5fd94e0d7..619d0660f 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -11,6 +11,7 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Extensions;
+using MediaBrowser.Controller;
 
 namespace MediaBrowser.WebDashboard.Api
 {
@@ -19,16 +20,16 @@ namespace MediaBrowser.WebDashboard.Api
         private readonly IFileSystem _fileSystem;
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
-        private readonly IMemoryStreamFactory _memoryStreamFactory;
         private readonly string _basePath;
+        private IResourceFileManager _resourceFileManager;
 
-        public PackageCreator(string basePath, IFileSystem fileSystem, ILogger logger, IServerConfigurationManager config, IMemoryStreamFactory memoryStreamFactory)
+        public PackageCreator(string basePath, IFileSystem fileSystem, ILogger logger, IServerConfigurationManager config, IResourceFileManager resourceFileManager)
         {
             _fileSystem = fileSystem;
             _logger = logger;
             _config = config;
-            _memoryStreamFactory = memoryStreamFactory;
             _basePath = basePath;
+            _resourceFileManager = resourceFileManager;
         }
 
         public async Task<Stream> GetResource(string virtualPath,
@@ -63,32 +64,6 @@ namespace MediaBrowser.WebDashboard.Api
             return Path.GetExtension(path).EndsWith(format, StringComparison.OrdinalIgnoreCase);
         }
 
-        /// <summary>
-        /// Gets the dashboard resource path.
-        /// </summary>
-        /// <returns>System.String.</returns>
-        public string GetResourcePath(string virtualPath)
-        {
-            var fullPath = Path.Combine(_basePath, virtualPath.Replace('/', _fileSystem.DirectorySeparatorChar));
-
-            try
-            {
-                fullPath = _fileSystem.GetFullPath(fullPath);
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error in Path.GetFullPath", ex);
-            }
-
-            // Don't allow file system access outside of the source folder
-            if (!_fileSystem.ContainsSubPath(_basePath, fullPath))
-            {
-                throw new SecurityException("Access denied");
-            }
-
-            return fullPath;
-        }
-
         public bool IsCoreHtml(string path)
         {
             if (path.IndexOf(".template.html", StringComparison.OrdinalIgnoreCase) != -1)
@@ -96,11 +71,7 @@ namespace MediaBrowser.WebDashboard.Api
                 return false;
             }
 
-            path = GetResourcePath(path);
-            var parent = _fileSystem.GetDirectoryName(path);
-            
-            return string.Equals(_basePath, parent, StringComparison.OrdinalIgnoreCase) ||
-                   string.Equals(Path.Combine(_basePath, "offline"), parent, StringComparison.OrdinalIgnoreCase);
+            return IsFormat(path, "html");
         }
 
         /// <summary>
@@ -109,11 +80,13 @@ namespace MediaBrowser.WebDashboard.Api
         /// <returns>Task{Stream}.</returns>
         public async Task<Stream> ModifyHtml(string path, Stream sourceStream, string mode, string appVersion, string localizationCulture)
         {
+            var isMainIndexPage = string.Equals(path, "index.html", StringComparison.OrdinalIgnoreCase);
+
             using (sourceStream)
             {
                 string html;
 
-                using (var memoryStream = _memoryStreamFactory.CreateNew())
+                using (var memoryStream = new MemoryStream())
                 {
                     await sourceStream.CopyToAsync(memoryStream).ConfigureAwait(false);
 
@@ -121,38 +94,21 @@ namespace MediaBrowser.WebDashboard.Api
 
                     html = Encoding.UTF8.GetString(originalBytes, 0, originalBytes.Length);
 
-                    if (!string.IsNullOrWhiteSpace(mode))
-                    {
-                    }
-                    else if (!string.IsNullOrWhiteSpace(path) && !string.Equals(path, "index.html", StringComparison.OrdinalIgnoreCase))
+                    if (isMainIndexPage)
                     {
-                        var index = html.IndexOf("<body", StringComparison.OrdinalIgnoreCase);
-                        if (index != -1)
+                        if (!string.IsNullOrWhiteSpace(localizationCulture))
                         {
-                            html = html.Substring(index);
+                            var lang = localizationCulture.Split('-').FirstOrDefault();
 
-                            html = html.Substring(html.IndexOf('>') + 1);
-
-                            index = html.IndexOf("</body>", StringComparison.OrdinalIgnoreCase);
-                            if (index != -1)
-                            {
-                                html = html.Substring(0, index);
-                            }
+                            html = html.Replace("<html", "<html data-culture=\"" + localizationCulture + "\" lang=\"" + lang + "\"");
                         }
-                        var mainFile = _fileSystem.ReadAllText(GetResourcePath("index.html"));
-
-                        html = ReplaceFirst(mainFile, "<div class=\"mainAnimatedPages skinBody\"></div>", "<div class=\"mainAnimatedPages skinBody hide\">" + html + "</div>");
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(localizationCulture))
-                    {
-                        var lang = localizationCulture.Split('-').FirstOrDefault();
-
-                        html = html.Replace("<html", "<html data-culture=\"" + localizationCulture + "\" lang=\"" + lang + "\"");
                     }
                 }
 
-                html = html.Replace("<head>", "<head>" + GetMetaTags(mode));
+                if (isMainIndexPage)
+                {
+                    html = html.Replace("<head>", "<head>" + GetMetaTags(mode));
+                }
 
                 // Disable embedded scripts from plugins. We'll run them later once resources have loaded
                 if (html.IndexOf("<script", StringComparison.OrdinalIgnoreCase) != -1)
@@ -161,29 +117,22 @@ namespace MediaBrowser.WebDashboard.Api
                     html = html.Replace("</script>", "</script>-->");
                 }
 
-                html = html.Replace("</body>", GetCommonJavascript(mode, appVersion) + "</body>");
+                if (isMainIndexPage)
+                {
+                    html = html.Replace("</body>", GetCommonJavascript(mode, appVersion) + "</body>");
+                }
 
                 var bytes = Encoding.UTF8.GetBytes(html);
 
-                return _memoryStreamFactory.CreateNew(bytes);
+                return new MemoryStream(bytes);
             }
         }
 
-        public string ReplaceFirst(string text, string search, string replace)
-        {
-            int pos = text.IndexOf(search, StringComparison.OrdinalIgnoreCase);
-            if (pos < 0)
-            {
-                return text;
-            }
-            return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
-        }
-
         /// <summary>
         /// Gets the meta tags.
         /// </summary>
         /// <returns>System.String.</returns>
-        private static string GetMetaTags(string mode)
+        private string GetMetaTags(string mode)
         {
             var sb = new StringBuilder();
 
@@ -192,48 +141,6 @@ namespace MediaBrowser.WebDashboard.Api
             {
                 sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: file: filesystem: ws: wss:;\">");
             }
-            else
-            {
-                sb.Append("<meta http-equiv=\"X-UA-Compatibility\" content=\"IE=Edge\">");
-            }
-
-            sb.Append("<link rel=\"manifest\" href=\"manifest.json\">");
-            sb.Append("<meta name=\"format-detection\" content=\"telephone=no\">");
-            sb.Append("<meta name=\"msapplication-tap-highlight\" content=\"no\">");
-
-            if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
-            {
-                sb.Append("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no\">");
-            }
-            else
-            {
-                sb.Append("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, minimum-scale=1\">");
-            }
-
-            sb.Append("<meta name=\"apple-mobile-web-app-capable\" content=\"yes\">");
-            sb.Append("<meta name=\"mobile-web-app-capable\" content=\"yes\">");
-            sb.Append("<meta name=\"application-name\" content=\"Emby\">");
-            //sb.Append("<meta name=\"apple-mobile-web-app-status-bar-style\" content=\"black-translucent\">");
-
-            sb.Append("<meta name=\"robots\" content=\"noindex, nofollow, noarchive\">");
-
-            // Open graph tags
-            sb.Append("<meta property=\"og:title\" content=\"Emby\">");
-            sb.Append("<meta property=\"og:site_name\" content=\"Emby\">");
-            sb.Append("<meta property=\"og:url\" content=\"http://emby.media\">");
-            sb.Append("<meta property=\"og:description\" content=\"Energize your media.\">");
-            sb.Append("<meta property=\"og:type\" content=\"article\">");
-            sb.Append("<meta property=\"fb:app_id\" content=\"1618309211750238\">");
-
-            // http://developer.apple.com/library/ios/#DOCUMENTATION/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html
-            sb.Append("<link rel=\"apple-touch-icon\" href=\"touchicon.png\">");
-            sb.Append("<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\"touchicon72.png\">");
-            sb.Append("<link rel=\"apple-touch-icon\" sizes=\"114x114\" href=\"touchicon114.png\">");
-            sb.Append("<link rel=\"apple-touch-startup-image\" href=\"css/images/iossplash.png\">");
-            sb.Append("<link rel=\"shortcut icon\" href=\"css/images/favicon.ico\">");
-            sb.Append("<meta name=\"msapplication-TileImage\" content=\"touchicon144.png\">");
-            sb.Append("<meta name=\"msapplication-TileColor\" content=\"#333333\">");
-            sb.Append("<meta name=\"theme-color\" content=\"#43A047\">");
 
             return sb.ToString();
         }
@@ -272,7 +179,7 @@ namespace MediaBrowser.WebDashboard.Api
                 files.Insert(0, "cordova.js");
             }
 
-            var tags = files.Select(s => string.Format("<script src=\"{0}\" defer></script>", s)).ToArray(files.Count);
+            var tags = files.Select(s => string.Format("<script src=\"{0}\" defer></script>", s)).ToArray();
 
             builder.Append(string.Join(string.Empty, tags));
 
@@ -284,7 +191,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// </summary>
         private Stream GetRawResourceStream(string virtualPath)
         {
-            return _fileSystem.GetFileStream(GetResourcePath(virtualPath), FileOpenMode.Open, FileAccessMode.Read, FileShareMode.ReadWrite, true);
+            return _resourceFileManager.GetResourceFileStream(_basePath, virtualPath);
         }
 
     }