fix: expose html cache-path setting

CasparCG · Jan 16, 2024 · ebe69dd · ebe69dd
1 parent c1ab954
commit ebe69dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/modules/html/html.cpp b/src/modules/html/html.cpp
@@ -113,7 +113,8 @@ class renderer_application
     void
     OnContextCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefV8Context> context) override
     {
-        if (!frame->IsMain()) return;
+        if (!frame->IsMain())
+            return;
 
         caspar_log(browser,
                    boost::log::trivial::trace,
@@ -144,7 +145,8 @@ class renderer_application
                            CefRefPtr<CefFrame>     frame,
                            CefRefPtr<CefV8Context> context) override
     {
-        if (!frame->IsMain()) return;
+        if (!frame->IsMain())
+            return;
 
         auto removed =
             boost::remove_if(contexts_, [&](const CefRefPtr<CefV8Context>& c) { return c->IsSame(context); });
@@ -222,6 +224,12 @@ void init(const core::module_dependencies& dependencies)
         settings.no_sandbox                   = true;
         settings.remote_debugging_port        = env::properties().get(L"configuration.html.remote-debugging-port", 0);
         settings.windowless_rendering_enabled = true;
+
+        auto cache_path = env::properties().get(L"configuration.html.cache-path", L"");
+        if (!cache_path.empty()) {
+            CefString(&settings.cache_path).FromWString(cache_path);
+        }
+
         CefInitialize(main_args, settings, CefRefPtr<CefApp>(new renderer_application(enable_gpu)), nullptr);
     });
     g_cef_executor->begin_invoke([&] { CefRunMessageLoop(); });

diff --git a/src/shell/casparcg.config b/src/shell/casparcg.config
@@ -45,6 +45,7 @@
 <flash>
     <enabled>false [true|false]</enabled>
     <buffer-depth>auto [auto|1..]</buffer-depth>
+    <cache-path>(CEF writes some caches next to the executable, which can fail depending on permissions. This changes it to use another path)</cache-path>
 </flash>
 <ffmpeg>
     <producer>