changeset 492:88c29b718702

Merge

--- a/easyhg.pro	Thu Aug 18 12:57:35 2011 +0100
+++ b/easyhg.pro	Thu Aug 18 13:15:58 2011 +0100
@@ -62,7 +62,8 @@
     src/workstatuswidget.h \
     src/moreinformationdialog.h \
     src/annotatedialog.h \
-    src/hgignoredialog.h
+    src/hgignoredialog.h \
+    src/versiontester.h
 SOURCES = \
     src/main.cpp \
     src/mainwindow.cpp \
@@ -97,7 +98,8 @@
     src/workstatuswidget.cpp \
     src/moreinformationdialog.cpp \
     src/annotatedialog.cpp \
-    src/hgignoredialog.cpp
+    src/hgignoredialog.cpp \
+    src/versiontester.cpp
 
 macx-* {
     SOURCES += src/common_osx.mm

--- a/src/mainwindow.cpp	Thu Aug 18 12:57:35 2011 +0100
+++ b/src/mainwindow.cpp	Thu Aug 18 13:15:58 2011 +0100
@@ -50,6 +50,7 @@
 #include "version.h"
 #include "workstatuswidget.h"
 #include "hgignoredialog.h"
+#include "versiontester.h"
 
 
 MainWindow::MainWindow(QString myDirPath) :
@@ -131,6 +132,11 @@
     cs->addDefaultName("default");
     cs->addDefaultName(getUserInfo());
 
+    VersionTester *vt = new VersionTester
+        ("easymercurial.org", "/latest-version.txt", EASYHG_VERSION);
+    connect(vt, SIGNAL(newerVersionAvailable(QString)),
+            this, SLOT(newerVersionAvailable(QString)));
+
     hgTest();
     updateRecentMenu();
 }
@@ -3062,6 +3068,17 @@
     settings.setValue("firststart", m_firstStart);
 }
 
-
-
-
+void MainWindow::newerVersionAvailable(QString version)
+{
+    QSettings settings;
+    settings.beginGroup("NewerVersionWarning");
+    QString tag = QString("version-%1-available-show").arg(version);
+    if (settings.value(tag, true).toBool()) {
+        QString title(tr("Newer version available"));
+        QString text(tr("<h3>Newer version available</h3><p>You are using version %1 of EasyMercurial, but version %3 is now available.</p><p>Please see the <a href=\"http://easymercurial.org/\">EasyMercurial website</a> for more information.</p>").arg(EASYHG_VERSION).arg(version));
+        QMessageBox::information(this, title, text);
+        settings.setValue(tag, false);
+    }
+    settings.endGroup();
+}
+

--- a/src/mainwindow.h	Thu Aug 18 12:57:35 2011 +0100
+++ b/src/mainwindow.h	Thu Aug 18 13:15:58 2011 +0100
@@ -116,6 +116,8 @@
     void checkFilesystem();
     void actuallyRestoreFileSystemWatcher();
 
+    void newerVersionAvailable(QString);
+
 private:
     void hgQueryBranch();
     void hgQueryHeads();

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/versiontester.cpp	Thu Aug 18 13:15:58 2011 +0100
@@ -0,0 +1,96 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    EasyMercurial
+
+    Based on hgExplorer by Jari Korhonen
+    Copyright (c) 2010 Jari Korhonen
+    Copyright (c) 2011 Chris Cannam
+    Copyright (c) 2011 Queen Mary, University of London
+    
+    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 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#include "versiontester.h"
+#include "debug.h"
+
+#include <iostream>
+
+#include <QHttp>
+
+VersionTester::VersionTester(QString hostname, QString versionFilePath,
+			     QString myVersion) :
+    m_httpFailed(false),
+    m_myVersion(myVersion)
+{
+    QHttp *http = new QHttp();
+    connect(http, SIGNAL(responseHeaderReceived(const QHttpResponseHeader &)),
+            this, SLOT(httpResponseHeaderReceived(const QHttpResponseHeader &)));
+    connect(http, SIGNAL(done(bool)),
+            this, SLOT(httpDone(bool)));
+    http->setHost(hostname);
+    http->get(versionFilePath);
+}
+
+VersionTester::~VersionTester()
+{
+}
+
+bool
+VersionTester::isVersionNewerThan(QString a, QString b)
+{
+    QRegExp re("[._-]");
+    QStringList alist = a.split(re, QString::SkipEmptyParts);
+    QStringList blist = b.split(re, QString::SkipEmptyParts);
+    int ae = alist.size();
+    int be = blist.size();
+    int e = std::max(ae, be);
+    for (int i = 0; i < e; ++i) {
+    int an = 0, bn = 0;
+    if (i < ae) {
+        an = alist[i].toInt();
+        if (an == 0) an = -1; // non-numeric field -> "-pre1" etc
+    }
+    if (i < be) {
+        bn = blist[i].toInt();
+        if (bn == 0) bn = -1;
+    }
+    if (an < bn) return false;
+    if (an > bn) return true;
+    }
+    return false;
+}
+
+void
+VersionTester::httpResponseHeaderReceived(const QHttpResponseHeader &h)
+{
+    if (h.statusCode() / 100 != 2) m_httpFailed = true;
+}
+
+void
+VersionTester::httpDone(bool error)
+{
+    QHttp *http = const_cast<QHttp *>(dynamic_cast<const QHttp *>(sender()));
+    if (!http) return;
+    http->deleteLater();
+    if (error || m_httpFailed) return;
+
+    QByteArray responseData = http->readAll();
+    QString str = QString::fromUtf8(responseData.data());
+    QStringList lines = str.split('\n', QString::SkipEmptyParts);
+    if (lines.empty()) return;
+
+    QString latestVersion = lines[0];
+    DEBUG << "Comparing current version \"" << m_myVersion
+	  << "\" with latest version \"" << latestVersion
+	  << "\"" << endl;
+    if (isVersionNewerThan(latestVersion, m_myVersion)) {
+        emit newerVersionAvailable(latestVersion);
+    }
+}
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/versiontester.h	Thu Aug 18 13:15:58 2011 +0100
@@ -0,0 +1,50 @@
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+
+/*
+    EasyMercurial
+
+    Based on hgExplorer by Jari Korhonen
+    Copyright (c) 2010 Jari Korhonen
+    Copyright (c) 2011 Chris Cannam
+    Copyright (c) 2011 Queen Mary, University of London
+    
+    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 2 of the
+    License, or (at your option) any later version.  See the file
+    COPYING included with this distribution for more information.
+*/
+
+#ifndef _VERSION_TESTER_H_
+#define _VERSION_TESTER_H_
+
+#include <QStringList>
+#include <QString>
+#include <QObject>
+
+class QHttpResponseHeader;
+
+class VersionTester : public QObject
+{
+    Q_OBJECT
+
+public:
+    VersionTester(QString hostname, QString versionFilePath, QString myVersion);
+    virtual ~VersionTester();
+    
+    static bool isVersionNewerThan(QString, QString);
+
+signals:
+    void newerVersionAvailable(QString);
+
+protected slots:
+    void httpResponseHeaderReceived(const QHttpResponseHeader &);
+    void httpDone(bool);
+
+private:
+    bool m_httpFailed;
+    QString m_myVersion;
+};
+
+#endif
+