Modify generate update json

KangLin · Feb 2, 2024 · 55799d5 · 55799d5
1 parent c0c4182
commit 55799d5
Show file tree

Hide file tree

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

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -88,8 +88,10 @@ jobs:
           MD5=`md5sum calendar_${{env.Calendar_VERSION}}_ubuntu_amd64.deb|awk '{print $1}'`
           echo "MD5:${MD5}"
           /opt/Calendar/bin/Calendar.sh \
-               -f "${{github.workspace}}/update_linux.xml" \
+               -f "${{github.workspace}}/update_ubuntu.json" \
+               --foc 1 \
                --md5 ${MD5} \
+               -n "rabbitcalendar_${{env.Calendar_VERSION}}_ubuntu_amd64.deb"
                -m "${{env.Calendar_VERSION}}" \
                -u "https://github.com/KangLin/Calendar/releases/download/v${{env.Calendar_VERSION}}/rabbitcalendar_${{env.Calendar_VERSION}}_ubuntu_amd64.deb;https://sourceforge.net/projects/rabbitcalendar/files/v${{env.Calendar_VERSION}}/rabbitcalendar_${{env.Calendar_VERSION}}_ubuntu_amd64.deb"
 

diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar
diff --git a/App/main.cpp b/App/main.cpp
@@ -68,8 +68,11 @@ int main(int argc, char *argv[])
         }
     }
     pUpdate->SetInstallAutoStartup();
-    if(!pUpdate->GenerateUpdateXml()) 
-        return 0; 
+    if(a.arguments().length() > 1) {
+        pUpdate->GenerateUpdateJson();
+        pUpdate->GenerateUpdateXml();
+        return 0;
+    }
 #endif
 
     CMainWindow m;

diff --git a/Src/FrmCalendar.cpp b/Src/FrmCalendar.cpp
@@ -39,7 +39,8 @@ CTasksHandler::~CTasksHandler()
 
 uint CTasksHandler::onHandle(const QDate &date, QStringList &tasks)
 {
-    return m_pFrmCalendar->onHandle(date, tasks);
+    if(m_pFrmCalendar)
+        return m_pFrmCalendar->onHandle(date, tasks);
 }
 
 CFrmCalendar::CFrmCalendar(QWidget *parent) :
@@ -387,10 +388,10 @@ int CFrmCalendar::onHandle(/*in*/const QDate& date, /*out*/QStringList& t)
         if(task)
         {
             const QMetaObject* pObj = task->metaObject();
-            if(QString("CTaskActivity") == pObj->className())
+            if(pObj && QString("CTaskActivity") == pObj->className())
             {
                 CTaskActivity* pTask = static_cast<CTaskActivity*>(task.data());
-                if(pTask->CheckDate(date) == 0)
+                if(pTask && pTask->CheckDate(date) == 0)
                 {
                     nCount++;
                     t << pTask->GetTitle();
+7 −2		App/main.cpp
+2 −1		ChangeLog.md
+6 −4		Src/LunarCalendarModel.cpp
+3 −3		Src/LunarCalendarModel.h