Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

update menus

Luke Pulverenti 10 years ago
parent
8bb10cb12f
commit
95ac98d5d4
4 changed files with 9 additions and 40 deletions
Unified View Show Diff Stats
  1. 5 0
      MediaBrowser.Providers/Manager/ProviderManager.cs
  2. 1 1
      MediaBrowser.Server.Startup.Common/EntryPoints/KeepServerAwake.cs
  3. 0 38
      MediaBrowser.ServerApplication/EntryPoints/ResourceEntryPoint.cs
  4. 3 1
      MediaBrowser.WebDashboard/Api/PackageCreator.cs

+ 5 - 0
MediaBrowser.Providers/Manager/ProviderManager.cs
View File 

@@ -150,6 +150,11 @@ namespace MediaBrowser.Providers.Manager
 
 
 
         public Task SaveImage(IHasImages item, string source, string mimeType, ImageType type, int? imageIndex, string internalCacheKey, CancellationToken cancellationToken)
 
         public Task SaveImage(IHasImages item, string source, string mimeType, ImageType type, int? imageIndex, string internalCacheKey, CancellationToken cancellationToken)
 
         {
 
         {
 
+            if (string.IsNullOrWhiteSpace(source))
 
+            {
 
+                throw new ArgumentNullException("source");
 
+            }
 
+
 
             var fileStream = _fileSystem.GetFileStream(source, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true);
 
             var fileStream = _fileSystem.GetFileStream(source, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true);
 
 
 
             return new ImageSaver(ConfigurationManager, _libraryMonitor, _fileSystem, _logger).SaveImage(item, fileStream, mimeType, type, imageIndex, internalCacheKey, cancellationToken);
 
             return new ImageSaver(ConfigurationManager, _libraryMonitor, _fileSystem, _logger).SaveImage(item, fileStream, mimeType, type, imageIndex, internalCacheKey, cancellationToken);

+ 1 - 1
MediaBrowser.Server.Startup.Common/EntryPoints/KeepServerAwake.cs
View File 

@@ -27,7 +27,7 @@ namespace MediaBrowser.Server.Startup.Common.EntryPoints
 
             _timer = new Timer(obj =>
 
             _timer = new Timer(obj =>
 
             {
 
             {
 
                 var now = DateTime.UtcNow;
 
                 var now = DateTime.UtcNow;
 
-                if (_sessionManager.Sessions.Any(i => (now - i.LastActivityDate).TotalMinutes < 5))
 
+                if (_sessionManager.Sessions.Any(i => (now - i.LastActivityDate).TotalMinutes < 15))
 
                 {
 
                 {
 
                     KeepAlive();
 
                     KeepAlive();
 
                 }
 
                 }

+ 0 - 38
MediaBrowser.ServerApplication/EntryPoints/ResourceEntryPoint.cs
View File 

@@ -1,38 +0,0 @@
 
-using MediaBrowser.Controller.Plugins;
 
-using System;
 
-using System.Threading;
 
-
 
-namespace MediaBrowser.ServerApplication.EntryPoints
 
-{
 
-    public class ResourceEntryPoint : IServerEntryPoint
 
-    {
 
-        private Timer _timer;
 
-
 
-        public void Run()
 
-        {
 
-            _timer = new Timer(TimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
 
-        }
 
-
 
-        private void TimerCallback(object state)
 
-        {
 
-            try
 
-            {
 
-                // Bad practice, i know. But we keep a lot in memory, unfortunately.
 
-                GC.Collect(2, GCCollectionMode.Forced, true);
 
-                GC.Collect(2, GCCollectionMode.Forced, true);
 
-            }
 
-            catch
 
-            {
 
-            }
 
-        }
 
-
 
-        public void Dispose()
 
-        {
 
-            if (_timer != null)
 
-            {
 
-                _timer.Dispose();
 
-                _timer = null;
 
-            }
 
-        }
 
-    }
 
-}

+ 3 - 1
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File 

@@ -260,7 +260,9 @@ namespace MediaBrowser.WebDashboard.Api
 
 
 
                         html = _localization.LocalizeDocument(html, localizationCulture, GetLocalizationToken);
 
                         html = _localization.LocalizeDocument(html, localizationCulture, GetLocalizationToken);
 
 
 
-                        html = html.Replace("<html>", "<html lang=\"" + lang + "\">").Replace("<body>", "<body><div class=\"pageContainer\">").Replace("</body>", "</div></body>");
 
+                        html = html.Replace("<html>", "<html lang=\"" + lang + "\">")
 
+                            .Replace("<body>", "<body><paper-drawer-panel class=\"mainDrawerPanel mainDrawerPanelPreInit\" forceNarrow><div class=\"mainDrawer\" drawer></div><div main><div class=\"pageContainer\">")
 
+                            .Replace("</body>", "</div></div></body>");
 
                     }
 
                     }
 
 
 
                     if (enableMinification)
 
                     if (enableMinification)