Modify generate update json

KangLin · Feb 2, 2024 · 412da1e · 412da1e
1 parent aa3e6a4
commit 412da1e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -197,7 +197,9 @@ jobs:
         working-directory: ${{github.workspace}}\build
         run: |
           ${{github.workspace}}\build\install\bin\FaceRecognizerApp.exe ^
-              -f "update_windows.xml" ^
+              -f "update_windows.json" ^
+              --foc 1 ^
+              -n "FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe" ^
               -u https://github.com/KangLin/FaceRecognizer/releases/download/${{env.FaceRecognizer_VERSION}}/FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe;https://sourceforge.net/projects/FaceRecognizer/files/${{env.FaceRecognizer_VERSION}}/FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe ^
               --pf FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe ^
               -m "${{env.FaceRecognizer_VERSION}}"

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -134,9 +134,11 @@ jobs:
           MD5=`md5sum facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb|awk '{print $1}'`
           echo "MD5:${MD5}"
           /bin/bash /opt/FaceRecognizer/bin/FaceRecognizer.sh \
-              -f "${{github.workspace}}/update_linux.xml" \
+              -f "${{github.workspace}}/update_linux.json" \
+              --foc 1 \
               --md5 ${MD5} \
               -m "${{env.FaceRecognizer_VERSION}}" \
+              -n "facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb" \
               -u "https://github.com/KangLin/FaceRecognizer/releases/download/v${{env.FaceRecognizer_VERSION}}/facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb;https://sourceforge.net/projects/FaceRecognizer/files/v${{env.FaceRecognizer_VERSION}}/facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb"
 
       - name: Update artifact

diff --git a/App/MainWindow.cpp b/App/MainWindow.cpp
@@ -38,7 +38,7 @@
 #include <QScreen>
 #include <QLoggingCategory>
 
-Q_LOGGING_CATEGORY(log, "main")
+static Q_LOGGING_CATEGORY(log, "main")
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),

diff --git a/App/RecognizerThread.cpp b/App/RecognizerThread.cpp
@@ -7,7 +7,7 @@
 
 #include <QLoggingCategory>
 
-Q_DECLARE_LOGGING_CATEGORY(log)
+static Q_LOGGING_CATEGORY(log, "Thread")
 
 CRecognizerThread::CRecognizerThread(CManageRecognizerVideo *parent) : QThread()
 {

diff --git a/App/main.cpp b/App/main.cpp
@@ -3,6 +3,7 @@
   */
 
 #include <QApplication>
+#include <QLoggingCategory>
 #if defined(Q_OS_ANDROID)
     #include <QtAndroidExtras/QtAndroid>
 #endif
@@ -15,7 +16,7 @@
     #include "FrmUpdater/FrmUpdater.h"
 #endif
 
-Q_DECLARE_LOGGING_CATEGORY(log)
+static Q_LOGGING_CATEGORY(log, "main")
 
 int main(int argc, char *argv[])
 {
@@ -49,8 +50,11 @@ int main(int argc, char *argv[])
 #ifdef RABBITCOMMON 
     CFrmUpdater *pUpdate = new CFrmUpdater();
     pUpdate->SetTitle(QImage(":/image/FaceRecognizer"));
-    if(!pUpdate->GenerateUpdateXml()) 
-        return 0; 
+    if(app.arguments().length() > 1) {
+        pUpdate->GenerateUpdateJson();
+        pUpdate->GenerateUpdateXml();
+        return 0;
+    }
 #endif
 
     QFile f(":/qss/black.qss");