Metafile: handle instance

gerbera · Apr 1, 2024 · f447bef · f447bef
1 parent 237ec77
commit f447bef
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/src/content/import_service.cc b/src/content/import_service.cc
@@ -171,7 +171,7 @@ void ImportService::initLayout(LayoutType layoutType)
         playlistParserScript = std::make_unique<PlaylistParserScript>(content, rootPath.string());
     }
     if (!metafileParserScript) {
-        metafileParserScript = std::make_unique<MetafileParserScript>(content);
+        metafileParserScript = std::make_unique<MetafileParserScript>(content, rootPath.string());
     }
 #endif
 }

diff --git a/src/content/scripting/metafile_parser_script.cc b/src/content/scripting/metafile_parser_script.cc
@@ -41,21 +41,23 @@
 #include "scripting_runtime.h"
 #include "util/string_converter.h"
 
-MetafileParserScript::MetafileParserScript(const std::shared_ptr<ContentManager>& content)
-    : ParserScript(content, "", "metafile", "obj")
+MetafileParserScript::MetafileParserScript(const std::shared_ptr<ContentManager>& content, const std::string& parent)
+    : ParserScript(content, parent, "metafile", "obj")
 {
     std::string scriptPath = config->getOption(CFG_IMPORT_SCRIPTING_METAFILE_SCRIPT);
     defineFunction("updateCdsObject", jsUpdateCdsObject, 1);
     if (!scriptPath.empty()) {
         load(scriptPath);
         scriptMode = true;
+    } else {
+        metafileFunction = config->getOption(CFG_IMPORT_SCRIPTING_IMPORT_FUNCTION_METAFILE);
     }
 }
 
 void MetafileParserScript::processObject(const std::shared_ptr<CdsObject>& obj, const fs::path& path)
 {
-    if ((currentObjectID != INVALID_OBJECT_ID) || currentHandle || currentLine) {
-        throw_std_runtime_error("Recursion in playlists not allowed");
+    if (currentObjectID != INVALID_OBJECT_ID || currentHandle || currentLine) {
+        throw_std_runtime_error("Recursion in metafiles is not allowed");
     }
 
     if (!obj->isPureItem()) {
@@ -81,7 +83,6 @@ void MetafileParserScript::processObject(const std::shared_ptr<CdsObject>& obj,
         if (scriptMode) {
             execute(obj, path);
         } else {
-            auto metafileFunction = config->getOption(CFG_IMPORT_SCRIPTING_IMPORT_FUNCTION_METAFILE);
             call(obj, nullptr, metafileFunction, path, "");
         }
     } catch (const std::runtime_error&) {

diff --git a/src/content/scripting/metafile_parser_script.h b/src/content/scripting/metafile_parser_script.h
@@ -38,13 +38,15 @@
 
 class MetafileParserScript : public ParserScript {
 public:
-    MetafileParserScript(const std::shared_ptr<ContentManager>& content);
+    MetafileParserScript(const std::shared_ptr<ContentManager>& content, const std::string& parent);
     void processObject(const std::shared_ptr<CdsObject>& obj, const fs::path& path);
 
     std::pair<std::shared_ptr<CdsObject>, int> createObject2cdsObject(const std::shared_ptr<CdsObject>& origObject, const std::string& rootPath) override;
     bool setRefId(const std::shared_ptr<CdsObject>& cdsObj, const std::shared_ptr<CdsObject>& origObject, int pcdId) override;
 
 protected:
+    std::string metafileFunction;
+
     std::shared_ptr<CdsObject> createObject(const std::shared_ptr<CdsObject>& pcd) override;
     void handleObject2cdsItem(duk_context* ctx, const std::shared_ptr<CdsObject>& pcd, const std::shared_ptr<CdsItem>& item) override;
 };

diff --git a/src/content/scripting/playlist_parser_script.cc b/src/content/scripting/playlist_parser_script.cc
@@ -51,6 +51,8 @@ PlaylistParserScript::PlaylistParserScript(const std::shared_ptr<ContentManager>
     if (!scriptPath.empty()) {
         load(scriptPath);
         scriptMode = true;
+    } else {
+        playlistFunction = config->getOption(CFG_IMPORT_SCRIPTING_IMPORT_FUNCTION_PLAYLIST);
     }
 }
 
@@ -155,7 +157,7 @@ void PlaylistParserScript::handleObject2cdsItem(duk_context* ctx, const std::sha
 
 void PlaylistParserScript::processPlaylistObject(const std::shared_ptr<CdsObject>& obj, std::shared_ptr<GenericTask> task, const std::string& rootPath)
 {
-    if ((currentObjectID != INVALID_OBJECT_ID) || currentHandle || currentLine) {
+    if (currentObjectID != INVALID_OBJECT_ID || currentHandle || currentLine) {
         throw_std_runtime_error("Recursion in playlists not allowed");
     }
 
@@ -186,7 +188,6 @@ void PlaylistParserScript::processPlaylistObject(const std::shared_ptr<CdsObject
         if (scriptMode) {
             execute(obj, rootPath);
         } else {
-            auto playlistFunction = config->getOption(CFG_IMPORT_SCRIPTING_IMPORT_FUNCTION_PLAYLIST);
             call(obj, nullptr, playlistFunction, rootPath, "");
         }
     } catch (const std::runtime_error&) {

diff --git a/src/content/scripting/playlist_parser_script.h b/src/content/scripting/playlist_parser_script.h
@@ -45,6 +45,8 @@ class PlaylistParserScript : public ParserScript {
     bool setRefId(const std::shared_ptr<CdsObject>& cdsObj, const std::shared_ptr<CdsObject>& origObject, int pcdId) override;
 
 protected:
+    std::string playlistFunction;
+
     void handleObject2cdsItem(duk_context* ctx, const std::shared_ptr<CdsObject>& pcd, const std::shared_ptr<CdsItem>& item) override;
     void handleObject2cdsContainer(duk_context* ctx, const std::shared_ptr<CdsObject>& pcd, const std::shared_ptr<CdsContainer>& cont) override;
 };

diff --git a/src/content/scripting/script.cc b/src/content/scripting/script.cc
@@ -424,6 +424,7 @@ void Script::load(const fs::path& scriptPath)
 {
     ScriptingRuntime::AutoLock lock(runtime->getMutex());
     duk_push_thread_stash(ctx, ctx);
+    log_debug("Loading file {}", scriptPath.c_str());
     _load(scriptPath);
     duk_put_prop_string(ctx, -2, "script");
     duk_pop(ctx);
@@ -582,9 +583,9 @@ void Script::call(const std::shared_ptr<CdsObject>& obj, const std::shared_ptr<C
         // Note: The invoked function will be blamed for execution errors, not the actual offending line of code
         // https://github.com/svaarala/duktape/blob/master/doc/error-objects.rst
 #if DUK_VERSION > 20399
-        log_error("javascript runtime error: {}() - {}\n", functionName, duk_safe_to_stacktrace(ctx, -1));
+        log_error("javascript {} runtime error: {}() - {}\n", contextName, functionName, duk_safe_to_stacktrace(ctx, -1));
 #else
-        log_error("javascript runtime error: {}() - {}\n", functionName, duk_safe_to_string(ctx, -1));
+        log_error("javascript {} runtime error: {}() - {}\n", contextName, functionName, duk_safe_to_string(ctx, -1));
 #endif
         duk_pop(ctx);
         throw_std_runtime_error("javascript runtime error");