Move Lua setup code into its own file

joto · joto · commit 698e87a365cc · 2023-02-23T16:00:24.000+01:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -58,6 +58,7 @@ if (WITH_LUA)
         flex-lua-table.cpp
         flex-write.cpp
         geom-transform.cpp
+        lua-setup.cpp
         lua-utils.cpp
         output-flex.cpp
         tagtransform-lua.cpp
diff --git a/src/lua-setup.cpp b/src/lua-setup.cpp
@@ -0,0 +1,39 @@
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "lua-setup.hpp"
+#include "lua-utils.hpp"
+#include "version.hpp"
+
+#include <lua.hpp>
+
+#include <boost/filesystem.hpp>
+
+void setup_lua_environment(lua_State *lua_state, std::string const &filename,
+                           bool append_mode)
+{
+    // Set up global lua libs
+    luaL_openlibs(lua_state);
+
+    // Set up global "osm2pgsql" object
+    lua_newtable(lua_state);
+    lua_pushvalue(lua_state, -1);
+    lua_setglobal(lua_state, "osm2pgsql");
+
+    luaX_add_table_str(lua_state, "version", get_osm2pgsql_short_version());
+
+    std::string dir_path =
+        boost::filesystem::path{filename}.parent_path().string();
+    if (!dir_path.empty()) {
+        dir_path += boost::filesystem::path::preferred_separator;
+    }
+    luaX_add_table_str(lua_state, "config_dir", dir_path.c_str());
+
+    luaX_add_table_str(lua_state, "mode", append_mode ? "append" : "create");
+}
diff --git a/src/lua-setup.hpp b/src/lua-setup.hpp
@@ -0,0 +1,20 @@
+#ifndef OSM2PGSQL_LUA_CONFIG_HPP
+#define OSM2PGSQL_LUA_CONFIG_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include <string>
+
+struct lua_State;
+
+void setup_lua_environment(lua_State *lua_state, std::string const &filename,
+                           bool append_mode);
+
+#endif // OSM2PGSQL_LUA_CONFIG_HPP
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -23,6 +23,7 @@
 #include "geom-transform.hpp"
 #include "logging.hpp"
 #include "lua-init.hpp"
+#include "lua-setup.hpp"
 #include "lua-utils.hpp"
 #include "middle.hpp"
 #include "options.hpp"
@@ -44,8 +45,6 @@ extern "C"
 #include <lualib.h>
 }
 
-#include <boost/filesystem.hpp>
-
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
@@ -1439,32 +1438,16 @@ void output_flex_t::init_lua(std::string const &filename)
     m_lua_state.reset(luaL_newstate(),
                       [](lua_State *state) { lua_close(state); });
 
-    // Set up global lua libs
-    luaL_openlibs(lua_state());
-
-    // Set up global "osm2pgsql" object
-    lua_newtable(lua_state());
+    setup_lua_environment(lua_state(), filename, get_options()->append);
 
-    luaX_add_table_str(lua_state(), "version", get_osm2pgsql_short_version());
-    luaX_add_table_str(lua_state(), "mode",
-                       get_options()->append ? "append" : "create");
     luaX_add_table_int(lua_state(), "stage", 1);
 
-    std::string dir_path =
-        boost::filesystem::path{filename}.parent_path().string();
-    if (!dir_path.empty()) {
-        dir_path += boost::filesystem::path::preferred_separator;
-    }
-    luaX_add_table_str(lua_state(), "config_dir", dir_path.c_str());
-
     luaX_add_table_func(lua_state(), "define_table",
                         lua_trampoline_app_define_table);
 
     luaX_add_table_func(lua_state(), "define_expire_output",
                         lua_trampoline_app_define_expire_output);
 
-    lua_setglobal(lua_state(), "osm2pgsql");
-
     init_table_class(lua_state());
     init_expire_output_class(lua_state());
 
