Merge pull request #28 from melowntech/vasek/verbose-glob-error

Verbose glob error

mapproxy/debian/compat

@@ -1 +1 @@
-7
+12

mapproxy/debian/jammy/control

@@ -0,0 +1,19 @@
+m4_dnl ###############################################################
+m4_dnl ## Build dependencies
+m4_dnl ###############################################################
+m4_dnl
+m4_define({{{VAR_BuildDepends}}},{{{debhelper (>= 9.20160115ubuntu3), libboost-all-dev
+    , libopencv-core-dev (>= 4.2)
+    , libopencv-highgui-dev (>= 4.2)
+    , libopencv-photo-dev (>= 4.2)
+    , libopencv-imgproc-dev (>= 4.2)
+    , libeigen3-dev (>= 3.1.0-1)
+    , libgdal-dev (>= 3.0), libproj-dev (>= 6.0)
+    , libopenmesh-dev (>= 8.0)
+    , libgeographic-dev (>= 1.45-2)
+    , libjsoncpp-dev (>= 1.7.2-1)
+    , libprotobuf-dev (>= 2.6.1)
+    , protobuf-compiler
+    , libprocps-dev (>= 3.3.12)
+    , libmagic-dev (>= 5.25)
+    , gawk}}})m4_dnl

mapproxy/src/mapproxy/CMakeLists.txt

@@ -12,7 +12,6 @@ set(mapproxy-core_SOURCES
   support/introspection.hpp support/introspection.cpp
   support/serialization.cpp
   support/aborter.hpp
-  support/glob.hpp support/glob.cpp
   support/tilejson.hpp support/tilejson.cpp
   support/cesiumconf.hpp support/cesiumconf.cpp
   support/wmts.hpp support/wmts.cpp

mapproxy/src/mapproxy/resource.cpp

@@ -28,15 +28,15 @@
 
 #include "dbglog/dbglog.hpp"
 
+#include "utility/glob.hpp"
+
 #include "jsoncpp/json.hpp"
 #include "jsoncpp/as.hpp"
 #include "jsoncpp/io.hpp"
 
 #include "vts-libs/registry/json.hpp"
 #include "vts-libs/vts/tileop.hpp"
 
-#include "support/glob.hpp"
-
 #include "error.hpp"
 #include "resource.hpp"
 #include "generator.hpp"
@@ -254,11 +254,16 @@ void parseResources(Resource::map &resources, const Json::Value &value
     {
         const auto includePath(fs::absolute(value, dir));
 
-        auto paths(globPath(includePath));
-        for (const auto &path : paths) {
-            // ignore directories
-            if (path.filename() == ".") { continue; }
-            includeLoad(path);
+        try {
+            for (const auto &path : utility::globPath(includePath)) {
+                // ignore directories
+                if (path.filename() == ".") { continue; }
+                includeLoad(path);
+            }
+        } catch (const std::exception &e) {
+            LOGTHROW(err3, std::runtime_error)
+                << "Failed to include file(s) from " << path
+                << ": " << e.what() << ".";
         }
     });