Add option to load last-know-good patch list

Contributes-To: sailfishos-patches#277
nephros · Nov 26, 2024 · eca3be2 · eca3be2
1 parent fa63042
commit eca3be2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/src/bin/patchmanager-daemon/dbus/org.SfietKonstantin.patchmanager.xml b/src/bin/patchmanager-daemon/dbus/org.SfietKonstantin.patchmanager.xml
@@ -107,6 +107,9 @@
         <method name="getLoaded">
             <arg name="loaded" type="b" direction="out" />
         </method>
+        <method name="revertToLastGood">
+            <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+        </method>
         <method name="resolveFailure">
             <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
         </method>

diff --git a/src/bin/patchmanager-daemon/patchmanagerobject.cpp b/src/bin/patchmanager-daemon/patchmanagerobject.cpp
@@ -1586,6 +1586,12 @@ bool PatchManagerObject::getLoaded() const
     return m_serverThread->isRunning();
 }
 
+void PatchManagerObject::revertToLastGood()
+{
+    m_appliedPatches = getLastGoodPatches();
+    setAppliedPatches(m_appliedPatches);
+}
+
 /*!
     Reset internal failure state and re-initialize.
 

diff --git a/src/bin/patchmanager-daemon/patchmanagerobject.h b/src/bin/patchmanager-daemon/patchmanagerobject.h
@@ -129,6 +129,7 @@ public slots:
     bool getFailure() const;
     bool getLoaded() const;
     void resolveFailure();
+    void revertToLastGood();
     void loadRequest(bool apply);
 
     void lipstickChanged(const QString &state);

diff --git a/src/qml/PatchManagerPage.qml b/src/qml/PatchManagerPage.qml
@@ -239,6 +239,12 @@ Page {
                 onClicked: pageStack.push(Qt.resolvedUrl("RestartServicesDialog.qml"))
             }
 
+            MenuItem {
+                text: qsTranslate("", "Load Pre-Failure List")
+                visible: PatchManager.failure
+                onClicked: menuRemorse.execute( text, function() { PatchManager.call(PatchManager.revertToLastGood()) } )
+            }
+
             MenuItem {
                 text: qsTranslate("", "Resolve failure")
                 visible: PatchManager.failure

diff --git a/src/qml/patchmanager.cpp b/src/qml/patchmanager.cpp
@@ -817,6 +817,13 @@ void PatchManager::onLoadedChanged(bool loaded)
     emit loadedChanged(m_loaded);
 }
 
+void PatchManager::revertToLastGood()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    m_interface->revertToLastGood();
+}
+
 /*! Calls the \e resolveFailure method on D-Bus */
 void PatchManager::resolveFailure()
 {

diff --git a/src/qml/patchmanager.h b/src/qml/patchmanager.h
@@ -182,6 +182,7 @@ public slots:
     void onFailureChanged(bool failed);
     void onLoadedChanged(bool loaded);
 
+    void revertToLastGood();
     void resolveFailure();
 
 signals: