Pārlūkot izejas kodu

update card layouts

Luke Pulverenti 8 gadi atpakaļ
vecāks
revīzija
071f455d58

+ 11 - 9
MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -58,7 +58,7 @@ namespace MediaBrowser.WebDashboard.Api
     {
     {
     }
     }
 
 
-    [Route("/web/cachefiles", "GET")]
+    [Route("/web/staticfiles", "GET")]
     public class GetCacheFiles
     public class GetCacheFiles
     {
     {
     }
     }
@@ -146,19 +146,24 @@ namespace MediaBrowser.WebDashboard.Api
         }
         }
 
 
         public object Get(GetCacheFiles request)
         public object Get(GetCacheFiles request)
+        {
+            var allFiles = GetCacheFileList();
+
+            return ResultFactory.GetOptimizedResult(Request, _jsonSerializer.SerializeToString(allFiles));
+        }
+
+        private List<string> GetCacheFileList()
         {
         {
             var creator = GetPackageCreator();
             var creator = GetPackageCreator();
             var directory = creator.DashboardUIPath;
             var directory = creator.DashboardUIPath;
 
 
             var skipExtensions = GetUndeployedExtensions();
             var skipExtensions = GetUndeployedExtensions();
 
 
-            var allFiles =
+            return
                 Directory.GetFiles(directory, "*", SearchOption.AllDirectories)
                 Directory.GetFiles(directory, "*", SearchOption.AllDirectories)
                 .Where(i => !skipExtensions.Contains(Path.GetExtension(i) ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 .Where(i => !skipExtensions.Contains(Path.GetExtension(i) ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 .Select(i => i.Replace(directory, string.Empty, StringComparison.OrdinalIgnoreCase).Replace("\\", "/").TrimStart('/') + "?v=" + _appHost.ApplicationVersion.ToString())
                 .Select(i => i.Replace(directory, string.Empty, StringComparison.OrdinalIgnoreCase).Replace("\\", "/").TrimStart('/') + "?v=" + _appHost.ApplicationVersion.ToString())
                 .ToList();
                 .ToList();
-
-            return ResultFactory.GetOptimizedResult(Request, _jsonSerializer.SerializeToString(allFiles));
         }
         }
 
 
         /// <summary>
         /// <summary>
@@ -332,12 +337,9 @@ namespace MediaBrowser.WebDashboard.Api
 
 
             var appVersion = _appHost.ApplicationVersion.ToString();
             var appVersion = _appHost.ApplicationVersion.ToString();
 
 
-            var mode = request.Mode;
+            File.WriteAllText(Path.Combine(path, "staticfiles"), _jsonSerializer.SerializeToString(GetCacheFileList()));
 
 
-            if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
-            {
-                _fileSystem.DeleteFile(Path.Combine(path, "scripts", "registrationservices.js"));
-            }
+            var mode = request.Mode;
 
 
             // Try to trim the output size a bit
             // Try to trim the output size a bit
             var bowerPath = Path.Combine(path, "bower_components");
             var bowerPath = Path.Combine(path, "bower_components");

+ 1 - 1
MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -431,7 +431,7 @@ namespace MediaBrowser.WebDashboard.Api
 
 
             var files = new List<string>();
             var files = new List<string>();
 
 
-            files.Add("bower_components/requirejs/require.js");
+            files.Add("bower_components/requirejs/require.js" + versionString);
 
 
             files.Add("scripts/site.js" + versionString);
             files.Add("scripts/site.js" + versionString);