Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/upgradenotifier into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Automatically check if upgrades for chroots are available when QtCreator is started

Automatically check if upgrades for chroots are available when QtCreator is started

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[Zoltan Balogh (bzoltan)]

Inline comments

review: Needs Fixing

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/upgradenotifier]

328. By Benjamin Zeller on 2015-01-14

- Add setting to disable the automatic check
- Fix comments from bzoltan

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/491/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/491/rebuild

review: Approve (continuous-integration)

[lp:~zeller-benjamin/qtcreator-plugin-ubuntu/upgradenotifier]

329. By Benjamin Zeller on 2015-01-23

Merge

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/503/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/503/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== added file 'share/qtcreator/ubuntu/scripts/qtc_chroot_get_upgrades.py'
--- share/qtcreator/ubuntu/scripts/qtc_chroot_get_upgrades.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/ubuntu/scripts/qtc_chroot_get_upgrades.py	2015-01-23 10:28:15 +0000
@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# QTC chroot update check
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Benjamin Zeller <[e-mail]>
+
+import signal
+import subprocess
+import sys
+import os
+import uuid
+import shutil
+
+def splitIgnoreEmptyParts(s, delim=None):
+    return [x for x in s.split(delim) if x]
+
+if (len(sys.argv) < 3):
+    print("Useage: qtc_chroot_get_upgrades <framework> <architecture>")
+    sys.exit(-1)
+
+click      = shutil.which("click")
+session_id = ""
+chroot_name_prefix = os.getenv('CLICK_CHROOT_SUFFIX', "click")
+
+architecture = sys.argv[1]
+framework    = sys.argv[2]
+subproc      = None
+
+if (len(session_id) == 0):
+    session_id   = str(uuid.uuid4())
+    pre_spawned_session = False
+else:
+    pre_spawned_session = True
+
+def endSession():
+    subprocess.call([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"end-session",session_id],stdout=subprocess.DEVNULL)
+
+def exit_gracefully(arg1,arg2):
+    if(subproc is not None):
+        subproc.kill()
+    endSession()
+    sys.exit(-1)
+
+signal.signal(signal.SIGTERM, exit_gracefully)
+signal.signal(signal.SIGINT , exit_gracefully)
+signal.signal(signal.SIGHUP , exit_gracefully)
+
+if ( not pre_spawned_session ):
+    success = subprocess.call([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"begin-session",session_id],stdout=subprocess.DEVNULL)
+
+subproc = subprocess.Popen([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"maint","-n",session_id
+                           ,"env","LC_ALL=C","apt-get","update"],stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
+subproc.wait()
+subproc = subprocess.Popen([click, "chroot","-a",architecture,"-f",framework,"-n",chroot_name_prefix,"maint","-n",session_id
+                           ,"env","LC_ALL=C","apt","list","--upgradable"],stdout=subprocess.PIPE,stderr=subprocess.DEVNULL, universal_newlines=True)
+stdout, stderr = subproc.communicate()
+endSession()
+
+packages = splitIgnoreEmptyParts(stdout,"\n")
+if(len(packages) == 0):
+    sys.exit(0)
+
+packages.pop(0)
+sys.exit(len(packages))
+
+
+
+
+

=== added file 'src/ubuntu/targetupgrademanager.cpp'
--- src/ubuntu/targetupgrademanager.cpp	1970-01-01 00:00:00 +0000
+++ src/ubuntu/targetupgrademanager.cpp	2015-01-23 10:28:15 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Benjamin Zeller <[e-mail]>
+ */
+
+#include "targetupgrademanager.h"
+
+#include "ubuntuconstants.h"
+#include "ubuntuclickdialog.h"
+#include "ui_targetupgrademanagerdialog.h"
+
+#include <coreplugin/coreplugin.h>
+#include <utils/qtcassert.h>
+
+#include <QProcess>
+#include <QString>
+#include <QPointer>
+#include <QSettings>
+
+
+namespace Ubuntu {
+namespace Internal {
+
+TargetUpgradeManager::TargetUpgradeManager(QObject *parent) :
+    QObject(parent), m_state(Idle)
+{
+}
+
+void TargetUpgradeManager::checkForUpgrades()
+{
+    QSettings settings (QLatin1String(Constants::SETTINGS_COMPANY),QLatin1String(Constants::SETTINGS_PRODUCT));
+    settings.beginGroup(QLatin1String(Constants::SETTINGS_GROUP_CLICK));
+    bool set = settings.value(QLatin1String(Constants::SETTINGS_KEY_AUTO_CHECK_CHROOT_UPDATES),true).toBool();
+    settings.endGroup();
+
+    if(set && m_state == Idle) {
+        m_state = CollectPendingUpdates;
+        m_outdatedChroots.clear();
+        foreach(const UbuntuClickTool::Target &chroot, UbuntuClickTool::listAvailableTargets()) {
+            QPointer<QProcess> proc(new QProcess(this));
+            connect(proc.data(),SIGNAL(finished(int)),this,SLOT(processFinished()));
+
+            proc->start(QString::fromLatin1(Constants::CHROOT_UPDATE_LIST_SCRIPT)
+                        .arg(Constants::UBUNTU_RESOURCE_PATH)
+                        .arg(chroot.architecture)
+                        .arg(chroot.framework));
+
+            Task t;
+            t.proc = proc;
+            t.target = chroot;
+            m_running.insert(reinterpret_cast<qintptr>(proc.data()),t);
+        }
+    }
+}
+
+void TargetUpgradeManager::processFinished()
+{
+    qintptr id = reinterpret_cast<qintptr>(sender());
+    QTC_ASSERT(m_running.contains(id),return);
+
+    switch(m_state) {
+        case CollectPendingUpdates:{
+            Task task = m_running.take(id);
+            task.proc->deleteLater();
+
+            if(task.proc->exitStatus() == QProcess::NormalExit && task.proc->exitCode() > 0)
+                m_outdatedChroots.append(task.target);
+
+            if(m_running.isEmpty()) {
+                m_state = Idle;
+
+                if(m_outdatedChroots.isEmpty())
+                    break;
+
+                TargetUpgradeManagerDialog::selectAndUpgradeTargets(m_outdatedChroots,Core::ICore::mainWindow());
+                m_outdatedChroots.clear();
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+TargetUpgradeManagerDialog::TargetUpgradeManagerDialog(QWidget *parent) : QDialog(parent)
+{
+    m_ui = new Ubuntu::Internal::Ui::TargetUpgradeManagerDialog;
+    m_ui->setupUi(this);
+}
+
+TargetUpgradeManagerDialog::~TargetUpgradeManagerDialog()
+{
+    delete m_ui;
+}
+
+void TargetUpgradeManagerDialog::selectAndUpgradeTargets(QList<UbuntuClickTool::Target> targets,QWidget *parent)
+{
+
+    TargetUpgradeManagerDialog dlg(parent);
+    for(int i = 0; i < targets.size(); i++) {
+        QTreeWidgetItem *item = new QTreeWidgetItem;
+        item->setCheckState(0,Qt::Unchecked);
+        item->setText(0,targets.at(i).framework+QStringLiteral("-")+targets.at(i).architecture);
+        dlg.m_ui->treeWidget->addTopLevelItem(item);
+    }
+
+    if( dlg.exec() == QDialog::Accepted ) {
+        for(int i = 0; i < targets.size(); i++) {
+            if(dlg.m_ui->treeWidget->topLevelItem(i)->checkState(0) == Qt::Checked) {
+                UbuntuClickDialog::maintainClickModal(targets.at(i),UbuntuClickTool::Upgrade);
+            }
+        }
+    }
+}
+
+} // namespace Internal
+} // namespace Ubuntu

=== added file 'src/ubuntu/targetupgrademanager.h'
--- src/ubuntu/targetupgrademanager.h	1970-01-01 00:00:00 +0000
+++ src/ubuntu/targetupgrademanager.h	2015-01-23 10:28:15 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Benjamin Zeller <[e-mail]>
+ */
+
+#ifndef UBUNTU_INTERNAL_TARGETUPGRADEMANAGER_H
+#define UBUNTU_INTERNAL_TARGETUPGRADEMANAGER_H
+
+#include <QObject>
+#include <QMap>
+#include <QPointer>
+#include <QDialog>
+
+#include "ubuntuclicktool.h"
+
+class QProcess;
+
+namespace Ubuntu {
+namespace Internal {
+
+namespace Ui {
+    class TargetUpgradeManagerDialog;
+}
+
+class TargetUpgradeManager : public QObject
+{
+    Q_OBJECT
+
+    enum State {
+        Idle,
+        CollectPendingUpdates
+    };
+
+    struct Task {
+        UbuntuClickTool::Target target;
+        QPointer<QProcess> proc;
+    };
+
+public:
+    explicit TargetUpgradeManager(QObject *parent = 0);
+
+public slots:
+    void checkForUpgrades ();
+
+private slots:
+    void processFinished ();
+
+private:
+    QMap<qintptr,Task> m_running;
+    QList<UbuntuClickTool::Target> m_outdatedChroots;
+    State m_state;
+
+};
+
+class TargetUpgradeManagerDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    TargetUpgradeManagerDialog(QWidget *parent = 0);
+    ~TargetUpgradeManagerDialog();
+
+    static void selectAndUpgradeTargets (QList<UbuntuClickTool::Target> targets,QWidget *parent);
+
+private:
+    Ui::TargetUpgradeManagerDialog *m_ui;
+};
+
+} // namespace Internal
+} // namespace Ubuntu
+
+#endif // UBUNTU_INTERNAL_TARGETUPGRADEMANAGER_H

=== added file 'src/ubuntu/targetupgrademanagerdialog.ui'
--- src/ubuntu/targetupgrademanagerdialog.ui	1970-01-01 00:00:00 +0000
+++ src/ubuntu/targetupgrademanagerdialog.ui	2015-01-23 10:28:15 +0000
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Ubuntu::Internal::TargetUpgradeManagerDialog</class>
+ <widget class="QDialog" name="Ubuntu::Internal::TargetUpgradeManagerDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>653</width>
+    <height>479</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Updates are available for your Kits. Please select those which should be updated.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTreeWidget" name="treeWidget">
+     <column>
+      <property name="text">
+       <string/>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Ubuntu::Internal::TargetUpgradeManagerDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>440</x>
+     <y>448</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>649</x>
+     <y>41</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Ubuntu::Internal::TargetUpgradeManagerDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>358</x>
+     <y>457</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>648</x>
+     <y>79</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

=== modified file 'src/ubuntu/ubuntu.pro'
--- src/ubuntu/ubuntu.pro	2015-01-16 13:03:01 +0000
+++ src/ubuntu/ubuntu.pro	2015-01-23 10:28:15 +0000
@@ -26,7 +26,8 @@
     ubuntupackagestepconfigwidget.ui \
     ubuntumanifesteditor.ui \
     ubuntuapparmoreditor.ui \
-    ubunturemoterunconfigurationwidget.ui
+    ubunturemoterunconfigurationwidget.ui \
+    targetupgrademanagerdialog.ui
 
 RESOURCES += \
     resources.qrc
@@ -134,7 +135,8 @@
     ubuntutestcontrol.cpp \
     ubuntupackageoutputparser.cpp \
     ubuntuprojecthelper.cpp \
-    wizards/ubuntuprojectmigrationwizard.cpp
+    wizards/ubuntuprojectmigrationwizard.cpp \
+    targetupgrademanager.cpp
 
 HEADERS += \
     ubuntuplugin.h \
@@ -219,7 +221,8 @@
     ubuntupackageoutputparser.h \
     ubuntuprojecthelper.h \
     ubuntuscopefinalizer.h \
-    wizards/ubuntuprojectmigrationwizard.h
+    wizards/ubuntuprojectmigrationwizard.h \
+    targetupgrademanager.h
 
 INCLUDEPATH+=$$OUT_PWD
 

=== modified file 'src/ubuntu/ubuntuconstants.h'
--- src/ubuntu/ubuntuconstants.h	2015-01-07 10:50:28 +0000
+++ src/ubuntu/ubuntuconstants.h	2015-01-23 10:28:15 +0000
@@ -427,7 +427,8 @@
 
 const char  SETTINGS_COMPANY[] = "Canonical";
 const char  SETTINGS_PRODUCT[] = "UbuntuSDK";
-const char  SETTINGS_GROUP_MODE[] = "Mode";
+const char  SETTINGS_GROUP_MODE[]  = "Mode";
+const char  SETTINGS_GROUP_CLICK[] = "Click";
 const char  SETTINGS_GROUP_DEVICE_CONNECTIVITY[] = "DeviceConnectivity";
 const char  SETTINGS_GROUP_DEVICES[] = "Devices";
 
@@ -441,6 +442,7 @@
 const char  SETTINGS_KEY_QML[] = "QML";
 const char  SETTINGS_KEY_SSH[] = "SSH";
 const char  SETTINGS_KEY_AUTOTOGGLE[] = "Auto_Toggle";
+const char  SETTINGS_KEY_AUTO_CHECK_CHROOT_UPDATES[] = "Auto_Check_Chroot_Updates";
 
 //const char  SETTINGS_GROUP_CLICK[] = "Click";
 //const char  SETTINGS_KEY_CLICK_REVIEWERSTOOLS[] = "ReviewersToolsEnabled";
@@ -583,6 +585,10 @@
 //Actions
 const char UBUNTU_MIGRATE_QMAKE_PROJECT[] = "UbuntuProjectManager.MigrateQMakeProject";
 
+//TargetUpgradeManager
+const char CHROOT_UPDATE_LIST_SCRIPT[] = "%1/ubuntu/scripts/qtc_chroot_get_upgrades.py %2 %3";
+
+
 } // namespace Ubuntu
 } // namespace Constants
 

=== modified file 'src/ubuntu/ubuntuplugin.cpp'
--- src/ubuntu/ubuntuplugin.cpp	2014-12-12 13:42:11 +0000
+++ src/ubuntu/ubuntuplugin.cpp	2015-01-23 10:28:15 +0000
@@ -43,6 +43,7 @@
 #include "ubuntupackageoutputparser.h"
 #include "ubuntuprojecthelper.h"
 #include "ubuntuscopefinalizer.h"
+#include "targetupgrademanager.h"
 
 #include "wizards/ubuntuprojectapplicationwizard.h"
 #include "wizards/ubuntufirstrunwizard.h"
@@ -305,6 +306,10 @@
                ,this,SLOT(onKitsLoaded()));
 
     showFirstStartWizard();
+
+    TargetUpgradeManager *mgr = new TargetUpgradeManager();
+    addAutoReleasedObject(mgr);
+    mgr->checkForUpgrades();
 }
 
 void UbuntuPlugin::showFirstStartWizard()

=== modified file 'src/ubuntu/ubuntusettingsclickwidget.cpp'
--- src/ubuntu/ubuntusettingsclickwidget.cpp	2014-09-30 15:44:15 +0000
+++ src/ubuntu/ubuntusettingsclickwidget.cpp	2015-01-23 10:28:15 +0000
@@ -40,6 +40,9 @@
     ui->setupUi(this);
 
     m_settings = new QSettings(QLatin1String(Constants::SETTINGS_COMPANY),QLatin1String(Constants::SETTINGS_PRODUCT));
+    m_settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP_CLICK));
+    ui->enableUpdateCheckerCheckBox->setChecked(m_settings->value(QLatin1String(Constants::SETTINGS_KEY_AUTO_CHECK_CHROOT_UPDATES),true).toBool());
+    m_settings->endGroup();
 
     m_deleteMapper = new QSignalMapper(this);
     connect(m_deleteMapper, SIGNAL(mapped(int)),this, SLOT(on_deleteClickChroot(int)));
@@ -55,6 +58,11 @@
 }
 
 void UbuntuSettingsClickWidget::apply() {
+
+    m_settings->beginGroup(QLatin1String(Constants::SETTINGS_GROUP_CLICK));
+    m_settings->setValue(QLatin1String(Constants::SETTINGS_KEY_AUTO_CHECK_CHROOT_UPDATES),ui->enableUpdateCheckerCheckBox->checkState() == Qt::Checked);
+    m_settings->endGroup();
+
     m_settings->sync();
 }
 

=== modified file 'src/ubuntu/ubuntusettingsclickwidget.ui'
--- src/ubuntu/ubuntusettingsclickwidget.ui	2014-09-30 15:44:15 +0000
+++ src/ubuntu/ubuntusettingsclickwidget.ui	2015-01-23 10:28:15 +0000
@@ -21,6 +21,13 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
+       <widget class="QCheckBox" name="enableUpdateCheckerCheckBox">
+        <property name="text">
+         <string>Automatically check for updates</string>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QTreeWidget" name="treeWidgetClickTargets">
         <property name="editTriggers">
          <set>QAbstractItemView::NoEditTriggers</set>