Improve, Taking in consideration coderabbitai

NicolasKeita · NicolasKeita · commit f194c1c65625 · 2025-11-18T17:42:52.000+01:00
diff --git a/.github/workflows/build-mudlet-win.yml b/.github/workflows/build-mudlet-win.yml
@@ -29,12 +29,9 @@ jobs:
     - name: Checkout Mudlet source code
       uses: actions/checkout@v5
       with:
-        submodules: true
+        submodules: recursive
         fetch-depth: 0
 
-    - name: Init all submodules recursively
-      run: git submodule update --init --recursive
-
     - name: (Windows) Setup MSYS2
       if: matrix.buildname == 'windows64'
       uses: msys2/setup-msys2@v2
diff --git a/.github/workflows/build-mudlet.yml b/.github/workflows/build-mudlet.yml
@@ -63,11 +63,9 @@ jobs:
     - name: Checkout Mudlet source code
       uses: actions/checkout@v5
       with:
-        submodules: true
+        submodules: recursive
         fetch-depth: 0
 
-    - name: Init all submodules recursively
-      run: git submodule update --init --recursive
 
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
@@ -204,7 +202,7 @@ jobs:
     - name: Set Sentry environment variables
       run: |
         echo "WITH_SENTRY=yes" >> $GITHUB_ENV
-        if [ -n "$SENTRY_SEND_DEBUG_SECRET" ]; then
+        if [ -n "${SENTRY_SEND_DEBUG_SECRET}" ]; then
           echo "SENTRY_SEND_DEBUG=1" >> $GITHUB_ENV
         else
           echo "SENTRY_SEND_DEBUG=0" >> $GITHUB_ENV
diff --git a/.github/workflows/clangtidy-diff-analysis.yml b/.github/workflows/clangtidy-diff-analysis.yml
@@ -29,16 +29,13 @@ jobs:
     - name: Checkout Mudlet source code
       uses: actions/checkout@v5
       with:
-        submodules: true
+        submodules: recursive
         fetch-depth: 0
         # https://github.com/ZedThree/clang-tidy-review/issues/10
         ref: ${{ github.event.pull_request.head.sha }}
         # https://github.community/t/github-actions-are-severely-limited-on-prs/18179/17?u=vadi2
         repository: ${{github.event.pull_request.head.repo.full_name}}
 
-    - name: Init all submodules recursively
-      run: git submodule update --init --recursive
-
     - name: (Windows) Install Qt
       uses: jurplel/install-qt-action@v4
       if: runner.os == 'Windows'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,10 +44,7 @@ jobs:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
-        submodules: true
-
-    - name: Init all submodules recursively
-      run: git submodule update --init --recursive
+        submodules: recursive
 
     - name: (Windows) Install Qt
       uses: jurplel/install-qt-action@v4
diff --git a/.github/workflows/performance-analysis.yml b/.github/workflows/performance-analysis.yml
@@ -25,10 +25,7 @@ jobs:
       uses: actions/checkout@v5
       with:
         fetch-depth: 0
-        submodules: true
-
-    - name: Init all submodules recursively
-      run: git submodule update --init --recursive        
+        submodules: recursive    
 
     - name: Use CMake 3.30.3
       uses: lukka/get-cmake@v3.30.3
diff --git a/.github/workflows/update-3rdparty.yml b/.github/workflows/update-3rdparty.yml
@@ -101,12 +101,9 @@ jobs:
       - uses: actions/checkout@v5
         with:
           ref: development
-          submodules: true
+          submodules: recursive
           fetch-depth: 0
 
-      - name: Init all submodules recursively
-        run: git submodule update --init --recursive
-
       - name: update submodule to latest
         run: git submodule update --remote 3rdparty/dblsqd/
 
@@ -145,12 +142,9 @@ jobs:
       - uses: actions/checkout@v5
         with:
           ref: development
-          submodules: true
+          submodules: recursive
           fetch-depth: 0
 
-      - name: Init all submodules recursively
-        run: git submodule update --init --recursive
-
       - name: update submodule to latest in branch
         run: |
           cd 3rdparty/lcf/
diff --git a/.github/workflows/update-en-us-plural.yml b/.github/workflows/update-en-us-plural.yml
@@ -16,10 +16,7 @@ jobs:
     - uses: actions/checkout@v5
       with:
         ref: development
-        submodules: true
-
-    - name: Init all submodules recursively
-      run: git submodule update --init --recursive
+        submodules: recursive
 
     - name: update plural american english file
       uses: Mudlet/lupdate-action@master
diff --git a/.github/workflows/update-translations.yml b/.github/workflows/update-translations.yml
@@ -17,13 +17,10 @@ jobs:
     - uses: actions/checkout@v5
       with:
         ref: development
-        submodules: true
+        submodules: recursive
         fetch-depth: 0
         persist-credentials: false
 
-    - name: Init all submodules recursively
-      run: git submodule update --init --recursive
-
     - name: update text for translation
       uses: Mudlet/lupdate-action@master
       with:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -320,6 +320,7 @@ set(mudlet_HDRS
     RoomMoveActivationHandler.h
     RoomMoveDragHandler.h
     SelectionRectangleHandler.h
+    SentryWrapper.h
     TAccessibleConsole.h
     TAccessibleTextEdit.h
     TAction.h
diff --git a/src/SentryWrapper.cpp b/src/SentryWrapper.cpp
@@ -25,9 +25,7 @@
 #endif
 
 #include <string>
-
-std::string makeExecutablePath(const std::string& dir, const std::string& name);
-
+#include "SentryWrapper.h"
 
 /**
  * Initializes Sentry options for crash/error reporting,
@@ -54,7 +52,6 @@ void initSentry()
         sentry_options_set_external_crash_reporter_path(options, makeExecutablePath(APP_DIR_PATH, "MudletCrashReporter").c_str());
 
         sentry_init(options);
-        auto sentryClose = qScopeGuard([] { sentry_close(); });
     #endif
 }
 
diff --git a/src/SentryWrapper.h b/src/SentryWrapper.h
@@ -0,0 +1,8 @@
+#ifdef WITH_SENTRY
+    #include "sentry.h"
+#endif
+
+#include <string>
+
+std::string makeExecutablePath(const std::string& dir, const std::string& name);
+void        initSentry();
diff --git a/src/crash_reporter/main.cpp b/src/crash_reporter/main.cpp
@@ -54,6 +54,9 @@ void sendCrashReport(const char *envelopePath)
     sentry_options_t *  opts = sentry_options_new();
     sentry_envelope_t * envelope = sentry_envelope_read_from_file(envelopePath);
 
+    if (!opts || !envelope) {
+        return;
+    }
     sentry_options_set_dsn(opts, SENTRY_DSN);
     sentry__transport_startup(opts->transport, opts);
     sentry__transport_send_envelope(opts->transport, envelope);
diff --git a/src/main.cpp b/src/main.cpp
@@ -43,6 +43,7 @@
 #include "TAccessibleConsole.h"
 #include "TAccessibleTextEdit.h"
 #include "FileOpenHandler.h"
+#include "SentryWrapper.h"
 
 #if defined(Q_OS_WINDOWS) && defined(INCLUDE_UPDATER)
 #include <windows.h>
@@ -57,7 +58,6 @@ extern void qInitResources_additional_splash_screens();
 extern void qInitResources_mudlet_fonts_common();
 extern void qInitResources_mudlet_fonts_posix();
 void        initializeQRCResources();
-void        initSentry();
 
 #if defined(Q_OS_WINDOWS)
 bool runUpdate();
@@ -162,6 +162,7 @@ int main(int argc, char* argv[])
 
     #ifdef WITH_SENTRY
         initSentry();
+        auto sentryClose = qScopeGuard([] { sentry_close(); });
     #endif
 
 #ifdef Q_OS_WINDOWS
diff --git a/src/mudlet-lua/lua/DateTime.lua b/src/mudlet-lua/lua/DateTime.lua
@@ -46,31 +46,6 @@ datetime = {
   }
 }
 
--- rex.gsub was crashing so here is a homemade
-local function rex_gsub_custom(str, pattern, repl)
-    local out = {}
-    local last_end = 1
-
-    while true do
-        local start_pos, end_pos, cap = rex.find(str, pattern, last_end)
-        if not start_pos then
-            table.insert(out, str:sub(last_end))
-            break
-        end
-
-        table.insert(out, str:sub(last_end, start_pos - 1))
-
-        if type(repl) == "function" then
-            table.insert(out, repl(cap))
-        else
-            table.insert(out, repl)
-        end
-
-        last_end = end_pos + 1
-    end
-
-    return table.concat(out)
-end
 
 -- the timestamp is stored in UTC time, so work out the difference in seconds
 -- from local to UTC time. Credit: https://github.com/stevedonovan/Penlight/blob/master/lua/pl/Date.lua#L85
diff --git a/src/mudlet-lua/lua/GUIUtils.lua b/src/mudlet-lua/lua/GUIUtils.lua
@@ -2053,30 +2053,7 @@ end
 local ansiPattern = rex.new("\\e\\[([0-9:;]*?)m")
 
 -- rex.gsub was crashing so here is a homemade
-local function rex_gsub_custom(str, pattern, repl)
-    local out = {}
-    local last_end = 1
-
-    while true do
-        local start_pos, end_pos, cap = rex.find(str, pattern, last_end)
-        if not start_pos then
-            table.insert(out, str:sub(last_end))
-            break
-        end
-
-        table.insert(out, str:sub(last_end, start_pos - 1))
-
-        if type(repl) == "function" then
-            table.insert(out, repl(cap))
-        else
-            table.insert(out, repl)
-        end
-
-        last_end = end_pos + 1
-    end
-
-    return table.concat(out)
-end
+-- Use shared rex_gsub_custom from StringUtils.lua
 
 -- function for converting a raw ANSI string into plain strings
 function ansi2string(text)
diff --git a/src/mudlet-lua/lua/StringUtils.lua b/src/mudlet-lua/lua/StringUtils.lua
@@ -215,3 +215,24 @@ function f(supersecretstringvariablenocollision)
     end
   end))
 end
+
+-- Homemade rex.gsub(), original was crashing.
+function rex_gsub_custom(str, pattern, repl)
+  local out = {}
+  local last_end = 1
+  while true do
+    local start_pos, end_pos, cap = rex.find(str, pattern, last_end)
+    if not start_pos then
+      table.insert(out, str:sub(last_end))
+      break
+    end
+    table.insert(out, str:sub(last_end, start_pos - 1))
+    if type(repl) == "function" then
+      table.insert(out, repl(cap))
+    else
+      table.insert(out, repl)
+    end
+    last_end = end_pos + 1
+  end
+  return table.concat(out)
+end
