From 2d130f1e0c4f20a9875f0a3ed2432be06bca7e3e Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 17 Dec 2011 02:31:58 +1000 Subject: [PATCH] Moved AutoUpdater to main application.. (Still not ready yet) --- SleepyHeadQT.pro | 38 +- UpdateWindow.cpp | 527 +++++++++++++++++++ UpdateWindow.h | 63 +++ UpdateWindow.ui | 370 +++++++++++++ common_gui.cpp | 15 + common_gui.h | 1 + mainwindow.cpp | 35 +- mainwindow.h | 2 +- {upgrade/quazip => quazip}/JlCompress.cpp | 0 {upgrade/quazip => quazip}/JlCompress.h | 0 {upgrade/quazip => quazip}/crypt.h | 0 {upgrade/quazip => quazip}/ioapi.h | 0 {upgrade/quazip => quazip}/qioapi.cpp | 0 {upgrade/quazip => quazip}/quaadler32.cpp | 0 {upgrade/quazip => quazip}/quaadler32.h | 0 {upgrade/quazip => quazip}/quachecksum32.h | 0 {upgrade/quazip => quazip}/quacrc32.cpp | 0 {upgrade/quazip => quazip}/quacrc32.h | 0 {upgrade/quazip => quazip}/quazip.cpp | 0 {upgrade/quazip => quazip}/quazip.h | 0 {upgrade/quazip => quazip}/quazip_global.h | 0 {upgrade/quazip => quazip}/quazipfile.cpp | 0 {upgrade/quazip => quazip}/quazipfile.h | 0 {upgrade/quazip => quazip}/quazipfileinfo.h | 0 {upgrade/quazip => quazip}/quazipnewinfo.cpp | 0 {upgrade/quazip => quazip}/quazipnewinfo.h | 0 {upgrade/quazip => quazip}/unzip.c | 0 {upgrade/quazip => quazip}/unzip.h | 0 {upgrade/quazip => quazip}/zip.c | 0 {upgrade/quazip => quazip}/zip.h | 0 updateparser.cpp | 120 +++++ updateparser.h | 93 ++++ 32 files changed, 1243 insertions(+), 21 deletions(-) create mode 100644 UpdateWindow.cpp create mode 100644 UpdateWindow.h create mode 100644 UpdateWindow.ui rename {upgrade/quazip => quazip}/JlCompress.cpp (100%) rename {upgrade/quazip => quazip}/JlCompress.h (100%) rename {upgrade/quazip => quazip}/crypt.h (100%) rename {upgrade/quazip => quazip}/ioapi.h (100%) rename {upgrade/quazip => quazip}/qioapi.cpp (100%) rename {upgrade/quazip => quazip}/quaadler32.cpp (100%) rename {upgrade/quazip => quazip}/quaadler32.h (100%) rename {upgrade/quazip => quazip}/quachecksum32.h (100%) rename {upgrade/quazip => quazip}/quacrc32.cpp (100%) rename {upgrade/quazip => quazip}/quacrc32.h (100%) rename {upgrade/quazip => quazip}/quazip.cpp (100%) rename {upgrade/quazip => quazip}/quazip.h (100%) rename {upgrade/quazip => quazip}/quazip_global.h (100%) rename {upgrade/quazip => quazip}/quazipfile.cpp (100%) rename {upgrade/quazip => quazip}/quazipfile.h (100%) rename {upgrade/quazip => quazip}/quazipfileinfo.h (100%) rename {upgrade/quazip => quazip}/quazipnewinfo.cpp (100%) rename {upgrade/quazip => quazip}/quazipnewinfo.h (100%) rename {upgrade/quazip => quazip}/unzip.c (100%) rename {upgrade/quazip => quazip}/unzip.h (100%) rename {upgrade/quazip => quazip}/zip.c (100%) rename {upgrade/quazip => quazip}/zip.h (100%) create mode 100644 updateparser.cpp create mode 100644 updateparser.h diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index 2e267843..80e91b98 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -69,11 +69,22 @@ SOURCES += main.cpp\ exportcsv.cpp \ common_gui.cpp \ SleepLib/loader_plugins/intellipap_loader.cpp \ - SleepLib/calcs.cpp + SleepLib/calcs.cpp \ + UpdateWindow.cpp \ + updateparser.cpp \ + quazip/zip.c \ + quazip/unzip.c \ + quazip/quazipnewinfo.cpp \ + quazip/quazipfile.cpp \ + quazip/quazip.cpp \ + quazip/quacrc32.cpp \ + quazip/quaadler32.cpp \ + quazip/qioapi.cpp \ + quazip/JlCompress.cpp unix:SOURCES += qextserialport/posix_qextserialport.cpp unix:!macx:SOURCES += qextserialport/qextserialenumerator_unix.cpp -unix:!macx:LIBS += -lX11 +unix:!macx:LIBS += -lX11 -lz macx { SOURCES += qextserialport/qextserialenumerator_osx.cpp @@ -127,7 +138,22 @@ HEADERS += \ common_gui.h \ SleepLib/loader_plugins/intellipap_loader.h \ SleepLib/calcs.h \ - version.h + version.h \ + UpdateWindow.h \ + updateparser.h \ + quazip/zip.h \ + quazip/unzip.h \ + quazip/quazipnewinfo.h \ + quazip/quazip_global.h \ + quazip/quazipfileinfo.h \ + quazip/quazipfile.h \ + quazip/quazip.h \ + quazip/quacrc32.h \ + quazip/quachecksum32.h \ + quazip/quaadler32.h \ + quazip/JlCompress.h \ + quazip/ioapi.h \ + quazip/crypt.h FORMS += \ @@ -139,10 +165,12 @@ FORMS += \ report.ui \ profileselect.ui \ newprofile.ui \ - exportcsv.ui + exportcsv.ui \ + UpdateWindow.ui RESOURCES += \ - Resources.qrc + Resources.qrc \ + resources.qrc OTHER_FILES += \ docs/index.html \ diff --git a/UpdateWindow.cpp b/UpdateWindow.cpp new file mode 100644 index 00000000..3cd7175c --- /dev/null +++ b/UpdateWindow.cpp @@ -0,0 +1,527 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "SleepLib/preferences.h" +#include "quazip/quazip.h" +#include "quazip/quazipfile.h" +#include "UpdateWindow.h" +#include "ui_UpdateWindow.h" +#include "version.h" +#include "mainwindow.h" +#include "common_gui.h" + +extern MainWindow * mainwin; + +UpdateWindow::UpdateWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::UpdateWindow) +{ + ui->setupUi(this); + + + QDesktopWidget *desktop = QApplication::desktop(); + + int screenWidth = desktop->width(); // get width of screen + int screenHeight = desktop->height(); // get height of screen + + QSize windowSize = size(); // size of our application window + int width = windowSize.width(); + int height = windowSize.height(); + + // little computations + int x = (screenWidth - width) / 2; + int y = (screenHeight - height) / 2; + y -= 50; + + // move window to desired coordinates + move ( x, y ); + + + + requestmode=RM_None; + netmanager = new QNetworkAccessManager(this); + connect(netmanager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*))); + update=NULL; + ui->stackedWidget->setCurrentIndex(0); +} + +UpdateWindow::~UpdateWindow() +{ + disconnect(netmanager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*))); + delete ui; +} + + +void UpdateWindow::checkForUpdates() +{ + QString filename=QApplication::applicationDirPath()+QDir::separator()+"update.xml"; + qDebug() << filename; + // Check updates.xml file if it's still recent.. + if (QFile::exists(filename)) { + QFileInfo fi(filename); + QDateTime created=fi.created(); + int age=created.secsTo(QDateTime::currentDateTime()); + + if (age<7200) { + QFile file(filename); + file.open(QFile::ReadOnly); + ParseUpdateXML(&file); + file.close(); + return; + } + } + mainwin->Notify("Checking for SleepyHead Updates"); + + requestmode=RM_CheckUpdates; + + reply=netmanager->get(QNetworkRequest(QUrl("http://192.168.1.8/update.xml"))); + ui->plainTextEdit->appendPlainText("Requesting "+reply->url().toString()); + netmanager->connect(reply,SIGNAL(downloadProgress(qint64,qint64)),this, SLOT(downloadProgress(qint64,qint64))); + dltime.start(); +} + +void UpdateWindow::dataReceived() +{ + //HttpStatusCodeAttribute + QString rs=reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); + if (rs!="200") return; + //QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); + + QByteArray read=reply->read(reply->bytesAvailable()); + qDebug() << "Received" << read.size() << "bytes"; + file.write(read); +} + +void UpdateWindow::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) +{ + QString rs=reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); + if (rs!="200") return; + + if (ui->tableWidget->rowCount()>0) { + double f=(double(bytesReceived) / double(bytesTotal)) * 100.0; + QProgressBar *bar=qobject_cast(ui->tableWidget->cellWidget(current_row,3)); + if (bar) + bar->setValue(f); + + ui->tableWidget->item(current_row,2)->setText(QString::number(bytesTotal/1048576.0,'f',3)+"MB"); + } + //ui->progressBar->setValue(f); + int elapsed=dltime.elapsed(); +} + +void UpdateWindow::requestFile() +{ + if (!update) return; + QProgressBar *bar=qobject_cast(ui->tableWidget->cellWidget(current_row,3)); + QString style="QProgressBar{\ + border: 1px solid gray;\ + border-radius: 3px;\ + text-align: center;\ + text-decoration: bold;\ + color: yellow;\ + }\ + QProgressBar::chunk {\ + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 \"light green\", stop: 1 green);\ + width: 10px;\ + margin: 0px;\ + }"; + + if (bar) + bar->setStyleSheet(style); + + QString filename=update->filename; + ui->plainTextEdit->appendPlainText("Requesting "+update->url); + + requestmode=RM_GetFile; + + QString path=QApplication::applicationDirPath()+QDir::separator()+"Download"; + QDir().mkdir(path); + path+=QDir::separator()+filename; + ui->plainTextEdit->appendPlainText("Saving as "+path); + file.setFileName(path); + file.open(QFile::WriteOnly); + dltime.start(); + + QNetworkRequest req=QNetworkRequest(QUrl(update->url)); + req.setRawHeader("User-Agent", "Wget/1.12 (linux-gnu)"); + reply=netmanager->get(req); + connect(reply,SIGNAL(readyRead()),this, SLOT(dataReceived())); + connect(reply,SIGNAL(downloadProgress(qint64,qint64)),this, SLOT(downloadProgress(qint64,qint64))); +} + +void UpdateWindow::ParseUpdateXML(QIODevice * dev) +{ + QXmlInputSource src(dev); + QXmlSimpleReader reader; + reader.setContentHandler(&updateparser); + if (reader.parse(src)) { + ui->plainTextEdit->appendPlainText("XML update structure parsed cleanly"); + + QStringList versions; + for (QHash::iterator it=updateparser.releases.begin();it!=updateparser.releases.end();it++) { + versions.push_back(it.key()); + } + qSort(versions); + + QString platform=PlatformString.toLower(); + release=NULL; + for (int i=versions.size()-1;i>=0;i--) { + QString verstr=versions[i]; + release=&updateparser.releases[verstr]; + if (release->updates.contains(platform)) { + break; + } else release=NULL; + } + if (!release || (VersionString() > release->version)) { + mainwin->Notify("No updates were found for your platform",5000,"SleepyHead Updates"); + delay(4000); + close(); + return; + } + + + qDebug() << "Version" << release->version << "has updates for" << platform; + + QString latestapp="", latestqt=""; + updates.clear(); + Update *upd=NULL; + Update *upq=NULL; + for (int i=0;iupdates[platform].size();i++) { + update=&release->updates[platform][i]; + if (update->type=="qtlibs") { + qDebug() << "QT Version" << update->version; + if (update->version > latestqt) { + latestqt=update->version; + upq=update; + } + } else if (update->type=="application") { + qDebug() << "Application Version" << update->version; + if (update->version > latestapp) { + latestapp=update->version; + upd=update; + } + } + } + + if (upq && (upq->version > QT_VERSION_STR)) { + updates.push_back(upq); + } + if (upd && upd->version > VersionString()) { + updates.push_back(upd); + } + + + if (updates.size()>0) { + QString html="

SleepyHead v"+release->version+" codename \""+release->codename+"\"

"+release->notes[""]+"

"; + html+=platform.left(1).toUpper()+platform.mid(1); + html+=" platform notes

"+release->notes[platform]+"

"; + ui->webView->setHtml(html); + QString info; + if (VersionString()< release->version) { + ui->Title->setText("A new version of SleepyHead is available!"); + info="Shiny new v"+latestapp+" is available. You're running old and busted v"+VersionString(); + ui->notesTabWidget->setCurrentIndex(0); + } else { + ui->Title->setText("An update for SleepyHead is available."); + info="Version "+latestapp+" is available. You're currently running v"+VersionString(); + ui->notesTabWidget->setCurrentIndex(1); + } + ui->versionInfo->setText(info); + + QString notes; + for (int i=0;iupdates[platform].size();i++) { + update=&release->updates[platform][i]; + if ((update->type=="application") && (update->version > VersionString())) { + notes+="SleepyHead v"+update->version+" build notes
"+update->notes.trimmed()+"

"; + } else if ((update->type=="qtlibs") && (update->version > QT_VERSION_STR)) { + notes+="Update to QtLibs (v"+update->version+")
"+update->notes.trimmed(); + } + } + ui->buildNotes->setText(notes); + setWindowModality(Qt::ApplicationModal); + show(); + } + } else { + mainwin->Notify("There was an error parsing the XML Update file."); + } +} + +void UpdateWindow::replyFinished(QNetworkReply * reply) +{ + netmanager->disconnect(reply,SIGNAL(downloadProgress(qint64,qint64)),this, SLOT(downloadProgress(qint64,qint64))); + if (reply->error()==QNetworkReply::NoError) { + if (requestmode==RM_CheckUpdates) { + ui->plainTextEdit->appendPlainText(QString::number(reply->size())+" bytes received."); + QString filename=QApplication::applicationDirPath()+QDir::separator()+reply->url().toString().section("/",-1); + qDebug() << filename; + QFile file(filename); + file.open(QFile::WriteOnly); + file.write(reply->readAll()); + file.close(); + file.open(QFile::ReadOnly); + //QTextStream ts(&file); + ParseUpdateXML(&file); + file.close(); + reply->deleteLater(); + } else if (requestmode==RM_GetFile) { + disconnect(reply,SIGNAL(readyRead()),this, SLOT(dataReceived())); + file.close(); + //HttpStatusCodeAttribute + QString rs=reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); + + bool failed=false; + if (rs=="404") { + qDebug() << "File not found"; + failed=true; + } else { + qDebug() << "StatCodeAttr" << rs; + QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); + if (!redirectUrl.isEmpty() && (redirectUrl!=reply->url())) { + file.open(QFile::WriteOnly); //reopen file.. + update->url=redirectUrl.toString(); + ui->plainTextEdit->appendPlainText("Redirected to "+update->url); + QTimer::singleShot(100,this,SLOT(requestFile())); + reply->deleteLater(); + return; + } + ui->plainTextEdit->appendPlainText("Received "+QString::number(file.size())+" bytes"); + if (update->size>0) { + double s1=update->size/1048576.0; + double s2=ui->tableWidget->item(current_row,2)->text().toDouble(); + if (s1!=s2) { + failed=true; + ui->plainTextEdit->appendPlainText("File size mismatch for "+update->filename); + } + } else { + QString path=QApplication::applicationDirPath()+QDir::separator()+"Download"; + path+=QDir::separator()+update->filename; + QFile f(path); + f.open(QFile::ReadOnly); + QCryptographicHash hash(QCryptographicHash::Sha1); + hash.addData(f.readAll()); + QString res=hash.result().toHex(); + if (res!=update->hash) { + ui->plainTextEdit->appendPlainText("File integrity check failed for "+update->filename); + failed=true; + } + } + } + reply->deleteLater(); + QProgressBar *bar=qobject_cast(ui->tableWidget->cellWidget(current_row,3)); + if (!failed) { + //file.open(QFile::ReadOnly); + QuaZip zip(&file); + + if (!zip.open(QuaZip::mdUnzip)) { + failed=true; + } else { + + QStringList files=zip.getFileNameList(); + QFile f; + int errors=0; + int fsize=files.size(); + QByteArray ba; + QStringList update_txt; + QStringList unzipped; + QStringList original; + + for (int i=0;iplainTextEdit->appendPlainText("Extracting "+files.at(i)); + QuaZipFile qzf(file.fileName(),files.at(i)); + qzf.open(QuaZipFile::ReadOnly); + + QString path=QApplication::applicationDirPath()+QDir::separator()+"Download"+QDir::separator()+files.at(i); + if (path.endsWith(QDir::separator())) { + QDir().mkpath(path); + if (update->unzipped_path.isEmpty()) + update->unzipped_path=path; + } else { + ba=qzf.readAll(); + if (qzf.getZipError()) { + errors++; + } else if (files.at(i)=="update.txt") { + QTextStream ts(ba); + QString line; + do { + line=ts.readLine(); + if (!line.isNull()) update_txt.append(line); + } while (!line.isNull()); + } else { + unzipped.append(path); + original.append(QApplication::applicationDirPath()+QDir::separator()+files.at(i).section("/",-1)); + f.setFileName(path); + f.open(QFile::WriteOnly); + f.write(ba); + f.close(); + } + } + if (bar) { + bar->setValue((1.0/float(fsize)*float(i+1))*100.0); + QApplication::processEvents(); + } + qzf.close(); + } + zip.close(); + if (!errors) { + for (int i=0;iplainTextEdit->appendPlainText("Copied "+unzipped[i]+" to "+original[i]); + } else { + QFile f(original[i]); + if (f.exists()) { + if (!f.remove()) { + f.rename(original[i],original[i]+".bak"); + ui->plainTextEdit->appendPlainText("Renaming "+original[i]); + } else { + ui->plainTextEdit->appendPlainText("Removing "+original[i]); + } + } + if (QFile::copy(unzipped[i],original[i])) { + ui->plainTextEdit->appendPlainText("Copied "+unzipped[i]+" to "+original[i]); + } else { + ui->plainTextEdit->appendPlainText("Copy Failed"); + failed=true; + } + } + + } + // Parse replacement instructions file? or just dump zip over the top? + + + // To clean up or not to clean up... is a reasonably valid question. + //file.remove(); + } + } + + + } + ui->tableWidget->item(current_row,0)->setCheckState(Qt::Checked); + if (failed) { + qDebug() << "File is corrupted"; + if (bar) { + bar->setFormat("Failed"); + QString style="QProgressBar{\ + border: 1px solid gray;\ + border-radius: 3px;\ + text-align: center;\ + text-decoration: bold;\ + color: yellow;\ + }\ + QProgressBar::chunk {\ + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 \"dark red\", stop: 1 red);\ + width: 10px;\ + margin: 0px;\ + }"; + //: qlineargradient(x1: 0, y1: 0.5, x2: 1, y2: 0.5, stop: 0 red, stop: 1 white); + bar->setStyleSheet(style); + } + } + ui->tableWidget->item(current_row,0)->setData(Qt::UserRole+1,failed); + QTimer::singleShot(100,this,SLOT(upgradeNext())); + ui->plainTextEdit->appendPlainText("Download Complete"); + + } else if (requestmode==RM_UpdateQT) { + ui->plainTextEdit->appendPlainText("Received "+QString::number(reply->size())+" bytes"); + } + } else { + mainwin->Notify("There was an error completing a network request:\n\n("+reply->errorString()+")"); + } +} + +void UpdateWindow::on_CloseButton_clicked() +{ + close(); +} + +void UpdateWindow::upgradeNext() +{ + QTableWidgetItem *item; + bool fnd=false; + for (current_row=0;current_rowtableWidget->rowCount();current_row++) { + item=ui->tableWidget->item(current_row,0); + bool complete=item->checkState()==Qt::Checked; + if (complete) + continue; + update=item->data(Qt::UserRole).value(); + qDebug() << "Processing" << update->url; + fnd=true; + requestFile(); + break; + } + + if (!fnd) { + bool ok=true; + for (current_row=0;current_rowtableWidget->rowCount();current_row++) { + bool failed=ui->tableWidget->item(current_row,0)->data(Qt::UserRole+1).toBool(); + if (failed) { + ok=false; + break; + } + } + if (ok) { + success=true; + //QMessageBox::information(this,"Updates Complete","SleepyHead has been updated and needs to restart.",QMessageBox::Ok); + ui->downloadTitle->setText("Update Complete!"); + ui->FinishedButton->setVisible(true); + ui->downloadLabel->setText("Updates Complete. SleepyHead needs to restart now, click Finished to do so."); + } else { + ui->downloadTitle->setText("Update Failed :("); + success=false; + ui->downloadLabel->setText("Download Error. Sorry, try again later."); + ui->FinishedButton->setVisible(true); + //QMessageBox::warning(this,"Download Error","Sorry, could not get all necessary files for upgrade.. Try again later.",QMessageBox::Ok); + //close(); + } + } +} + + +void UpdateWindow::on_upgradeButton_clicked() +{ + if (!updates.size()) return; + ui->tableWidget->clearContents(); + ui->tableWidget->setColumnHidden(4,true); + ui->tableWidget->setColumnHidden(5,true); + ui->FinishedButton->setVisible(false); + ui->downloadLabel->setText("Downloading & Installing Updates..."); + ui->downloadTitle->setText("Please wait while downloading and installing updates."); + success=false; + for (int i=0;itableWidget->insertRow(i); + QTableWidgetItem *item=new QTableWidgetItem(update->type); + QVariant av; + av.setValue(update); + item->setData(Qt::UserRole,av); + item->setCheckState(Qt::Unchecked); + item->setFlags(Qt::ItemIsEnabled); + ui->tableWidget->setItem(i,0,item); + ui->tableWidget->setItem(i,1,new QTableWidgetItem(update->version)); + ui->tableWidget->setItem(i,2,new QTableWidgetItem(QString::number(update->size/1048576.0,'f',3)+"MB")); + QProgressBar *bar=new QProgressBar(ui->tableWidget); + bar->setMaximum(100); + bar->setValue(0); + + ui->tableWidget->setCellWidget(i,3,bar); + ui->tableWidget->setItem(i,4,new QTableWidgetItem(update->url)); + } + ui->stackedWidget->setCurrentIndex(1); + upgradeNext(); +} + +void UpdateWindow::on_FinishedButton_clicked() +{ + if (success) + mainwin->RestartApplication(); + else close(); +} diff --git a/UpdateWindow.h b/UpdateWindow.h new file mode 100644 index 00000000..588e3471 --- /dev/null +++ b/UpdateWindow.h @@ -0,0 +1,63 @@ +#ifndef UPDATEWINDOW_H +#define UPDATEWINDOW_H + +#include +#include +#include +#include +#include + +#include "version.h" +#include "updateparser.h" + +namespace Ui { +class UpdateWindow; +} + +enum RequestMode { RM_None, RM_CheckUpdates, RM_GetFile, RM_UpdateQT }; + +class UpdateWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit UpdateWindow(QWidget *parent = 0); + ~UpdateWindow(); + void checkForUpdates(); + void ParseUpdateXML(QIODevice * dev); + +protected slots: + void replyFinished(QNetworkReply * reply); + void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); + void dataReceived(); + void requestFile(); + +private slots: + void on_CloseButton_clicked(); + + void on_upgradeButton_clicked(); + + void upgradeNext(); + + void on_FinishedButton_clicked(); + +private: + UpdateParser updateparser; + + Ui::UpdateWindow *ui; + QSystemTrayIcon *systray; + QMenu *systraymenu; + RequestMode requestmode; + QTime dltime; + QString needQtVersion; + Update *update; + Release *release; + QFile file; + QNetworkAccessManager *netmanager; + QNetworkReply * reply; + QList updates; + int current_row; + bool success; +}; + +#endif // UPDATEWINDOW_H diff --git a/UpdateWindow.ui b/UpdateWindow.ui new file mode 100644 index 00000000..67f081b7 --- /dev/null +++ b/UpdateWindow.ui @@ -0,0 +1,370 @@ + + + UpdateWindow + + + + 0 + 0 + 589 + 416 + + + + SleepyHead Updater + + + + :/images/sheep.png:/images/sheep.png + + + + + 0 + + + 0 + + + + + 1 + + + + + + + + 0 + 0 + + + + + 14 + 75 + true + + + + A new version of $APP is available + + + + + + + + + + 100 + 100 + + + + + + + :/docs/sheep.png + + + true + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Version Information + + + + + + + 0 + + + + Release Notes + + + + 0 + + + 0 + + + + + + about:blank + + + + + + + + + Build Notes + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + + + + + + + + + QFrame::Box + + + QFrame::Sunken + + + + + + &No Thanks + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Remind Me Later + + + + + + + &Upgrade Now + + + + + + + + + + + + 4 + + + 4 + + + + + + 75 + true + + + + Please wait while updates are downloaded and installed... + + + + + + + + + + 0 + + + + Updates + + + + 0 + + + 0 + + + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::NoSelection + + + QAbstractItemView::SelectRows + + + true + + + false + + + + Component + + + + + Version + + + + + Size + + + + + Progress + + + + + + + + + Log + + + + 0 + + + 0 + + + + + + + + + + + + + 0 + + + 0 + + + + + Downloading & Installing Updates + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Finished + + + + + + + + + + + + + + + + + QWebView + QWidget +
QtWebKit/QWebView
+ + + + + + + diff --git a/common_gui.cpp b/common_gui.cpp index 5cc67c76..11cb059d 100644 --- a/common_gui.cpp +++ b/common_gui.cpp @@ -7,6 +7,16 @@ #include "common_gui.h" #include "qglobal.h" +void delay(int ms) +{ +#ifdef Q_WS_WIN32 + delay(ms); +#else + sleep(ms/1000); +#endif +} + + #if (QT_VERSION >= QT_VERSION_CHECK(4,8,0)) // Qt 4.8 makes this a whole lot easier Qt::DayOfWeek firstDayOfWeekFromLocale() @@ -28,6 +38,11 @@ Qt::DayOfWeek firstDayOfWeekFromLocale() #endif +#ifdef Q_WS_WIN32 +#include +#endif + + // This function has been "borrowed".. Ahem.. Qt::DayOfWeek firstDayOfWeekFromLocale() { diff --git a/common_gui.h b/common_gui.h index 9c1aa60a..1e969422 100644 --- a/common_gui.h +++ b/common_gui.h @@ -10,5 +10,6 @@ #include Qt::DayOfWeek firstDayOfWeekFromLocale(); +void delay(int ms); #endif diff --git a/mainwindow.cpp b/mainwindow.cpp index 58ab547c..c613a37c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -30,6 +30,7 @@ #include "exportcsv.h" #include "SleepLib/schema.h" #include "Graphs/glcommon.h" +#include "UpdateWindow.h" QProgressBar *qprogress; QLabel *qstatus; @@ -189,10 +190,10 @@ MainWindow::~MainWindow() mainwin=NULL; delete ui; } -void MainWindow::Notify(QString s,int ms) +void MainWindow::Notify(QString s,int ms,QString title) { if (systray) { - systray->showMessage("SleepyHead v"+PREF["VersionString"].toString(),s,QSystemTrayIcon::Information,ms); + systray->showMessage(title,s,QSystemTrayIcon::Information,ms); } else { ui->statusbar->showMessage(s,ms); } @@ -200,7 +201,7 @@ void MainWindow::Notify(QString s,int ms) void MainWindow::Startup() { - qDebug() << PREF["AppName"].toString().toAscii()+" v"+PREF["VersionString"].toString().toAscii() << "built with Qt"<< QT_VERSION_STR << "on" << __DATE__ << __TIME__; + qDebug() << PREF["AppName"].toString().toAscii()+" v"+VersionString().toAscii() << "built with Qt"<< QT_VERSION_STR << "on" << __DATE__ << __TIME__; qstatus->setText(tr("Loading Data")); qprogress->show(); //qstatusbar->showMessage(tr("Loading Data"),0); @@ -510,22 +511,26 @@ void MainWindow::on_oximetryButton_clicked() void MainWindow::CheckForUpdates() { - QTimer::singleShot(100,this,SLOT(on_actionCheck_for_Updates_triggered())); - //on_actionCheck_for_Updates_triggered(); + //QTimer::singleShot(100,this,SLOT(on_actionCheck_for_Updates_triggered())); + on_actionCheck_for_Updates_triggered(); } void MainWindow::on_actionCheck_for_Updates_triggered() { - if (PREF.Exists("Updates_LastChecked")) { - if (PREF["Updates_LastChecked"].toDateTime().secsTo(QDateTime::currentDateTime())<7200) { - // Instead of doing this, just use the cached crud - if (prefdialog) prefdialog->RefreshLastChecked(); - mainwin->Notify("No New Updates - You already checked recently..."); - return; - } - } - mainwin->Notify("Checking for Updates"); - netmanager->get(QNetworkRequest(QUrl("http://sleepyhead.sourceforge.net/current_version.txt"))); + UpdateWindow *w=new UpdateWindow(this); + + w->checkForUpdates(); + +// if (PREF.Exists("Updates_LastChecked")) { +// if (PREF["Updates_LastChecked"].toDateTime().secsTo(QDateTime::currentDateTime())<7200) { +// // Instead of doing this, just use the cached crud +// if (prefdialog) prefdialog->RefreshLastChecked(); +// mainwin->Notify("No New Updates - You already checked recently..."); +// return; +// } +// } +// mainwin->Notify("Checking for Updates"); +// netmanager->get(QNetworkRequest(QUrl("http://sleepyhead.sourceforge.net/current_version.txt"))); } void MainWindow::replyFinished(QNetworkReply * reply) { diff --git a/mainwindow.h b/mainwindow.h index d14c5f0a..bc6ba1a3 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -40,7 +40,7 @@ public: void Log(QString s); QMenu * CreateMenu(QString title); void CheckForUpdates(); - void Notify(QString s,int ms=5000); + void Notify(QString s,int ms=5000, QString title="SleepyHead v"+VersionString()); gGraphView *snapshotGraph() { return SnapshotGraph; } Daily *getDaily() { return daily; } Overview *getOverview() { return overview; } diff --git a/upgrade/quazip/JlCompress.cpp b/quazip/JlCompress.cpp similarity index 100% rename from upgrade/quazip/JlCompress.cpp rename to quazip/JlCompress.cpp diff --git a/upgrade/quazip/JlCompress.h b/quazip/JlCompress.h similarity index 100% rename from upgrade/quazip/JlCompress.h rename to quazip/JlCompress.h diff --git a/upgrade/quazip/crypt.h b/quazip/crypt.h similarity index 100% rename from upgrade/quazip/crypt.h rename to quazip/crypt.h diff --git a/upgrade/quazip/ioapi.h b/quazip/ioapi.h similarity index 100% rename from upgrade/quazip/ioapi.h rename to quazip/ioapi.h diff --git a/upgrade/quazip/qioapi.cpp b/quazip/qioapi.cpp similarity index 100% rename from upgrade/quazip/qioapi.cpp rename to quazip/qioapi.cpp diff --git a/upgrade/quazip/quaadler32.cpp b/quazip/quaadler32.cpp similarity index 100% rename from upgrade/quazip/quaadler32.cpp rename to quazip/quaadler32.cpp diff --git a/upgrade/quazip/quaadler32.h b/quazip/quaadler32.h similarity index 100% rename from upgrade/quazip/quaadler32.h rename to quazip/quaadler32.h diff --git a/upgrade/quazip/quachecksum32.h b/quazip/quachecksum32.h similarity index 100% rename from upgrade/quazip/quachecksum32.h rename to quazip/quachecksum32.h diff --git a/upgrade/quazip/quacrc32.cpp b/quazip/quacrc32.cpp similarity index 100% rename from upgrade/quazip/quacrc32.cpp rename to quazip/quacrc32.cpp diff --git a/upgrade/quazip/quacrc32.h b/quazip/quacrc32.h similarity index 100% rename from upgrade/quazip/quacrc32.h rename to quazip/quacrc32.h diff --git a/upgrade/quazip/quazip.cpp b/quazip/quazip.cpp similarity index 100% rename from upgrade/quazip/quazip.cpp rename to quazip/quazip.cpp diff --git a/upgrade/quazip/quazip.h b/quazip/quazip.h similarity index 100% rename from upgrade/quazip/quazip.h rename to quazip/quazip.h diff --git a/upgrade/quazip/quazip_global.h b/quazip/quazip_global.h similarity index 100% rename from upgrade/quazip/quazip_global.h rename to quazip/quazip_global.h diff --git a/upgrade/quazip/quazipfile.cpp b/quazip/quazipfile.cpp similarity index 100% rename from upgrade/quazip/quazipfile.cpp rename to quazip/quazipfile.cpp diff --git a/upgrade/quazip/quazipfile.h b/quazip/quazipfile.h similarity index 100% rename from upgrade/quazip/quazipfile.h rename to quazip/quazipfile.h diff --git a/upgrade/quazip/quazipfileinfo.h b/quazip/quazipfileinfo.h similarity index 100% rename from upgrade/quazip/quazipfileinfo.h rename to quazip/quazipfileinfo.h diff --git a/upgrade/quazip/quazipnewinfo.cpp b/quazip/quazipnewinfo.cpp similarity index 100% rename from upgrade/quazip/quazipnewinfo.cpp rename to quazip/quazipnewinfo.cpp diff --git a/upgrade/quazip/quazipnewinfo.h b/quazip/quazipnewinfo.h similarity index 100% rename from upgrade/quazip/quazipnewinfo.h rename to quazip/quazipnewinfo.h diff --git a/upgrade/quazip/unzip.c b/quazip/unzip.c similarity index 100% rename from upgrade/quazip/unzip.c rename to quazip/unzip.c diff --git a/upgrade/quazip/unzip.h b/quazip/unzip.h similarity index 100% rename from upgrade/quazip/unzip.h rename to quazip/unzip.h diff --git a/upgrade/quazip/zip.c b/quazip/zip.c similarity index 100% rename from upgrade/quazip/zip.c rename to quazip/zip.c diff --git a/upgrade/quazip/zip.h b/quazip/zip.h similarity index 100% rename from upgrade/quazip/zip.h rename to quazip/zip.h diff --git a/updateparser.cpp b/updateparser.cpp new file mode 100644 index 00000000..92a10bfa --- /dev/null +++ b/updateparser.cpp @@ -0,0 +1,120 @@ +#include + + +#include "updateparser.h" + +bool UpdateParser::startDocument() +{ + inRelease=false; + inUpdate=false; + inNotes=false; + inUpdateNotes=false; + release=NULL; + update=NULL; + return true; +} + +bool UpdateParser::endElement(const QString &namespaceURI, const QString &localName, const QString &qName) +{ + QString name=qName.toLower(); + if (name=="release") { + inRelease=false; + release=NULL; + } else if (inRelease && name=="update") { + inUpdate=false; + update=NULL; + } else if (inUpdate && name=="notes") + inUpdateNotes=false; + else if (inRelease && name=="notes") + inNotes=false; + return true; +} +bool UpdateParser::characters(const QString &ch) +{ + if (inUpdateNotes) { + update->notes=ch; + } else if (inNotes) { + release->notes[platform]=ch; + } + return true; +} + +bool UpdateParser::startElement(const QString &namespaceURI, const QString &localName, const QString &qName, const QXmlAttributes &atts) +{ + QString name=qName.toLower(); + if (inRelease && name=="update") { + QString ver, type; + for (int i=0;iupdates[platform].push_back(Update(type,ver,platform,date)); + update=&release->updates[platform][release->updates[platform].size()-1]; + inUpdate=true; + } else if (inRelease && name=="info") { + QString tmp=atts.value("url"); + if (tmp.isEmpty()) return false; + release->info_url=tmp; + } else if (inUpdate && name=="file") { + for (int i=0;ifilename=atts.value(i); + if (atts.localName(i)=="size") { + bool ok; + update->size=atts.value(i).toLongLong(&ok); + //if (!ok) return false; + } + if (atts.localName(i)=="url") + update->url=atts.value(i); + if (atts.localName(i)=="hash") + update->hash=atts.value(i).toLower(); + } + } else if (inUpdate && name=="notes") { + inUpdateNotes=true; + } else if (inRelease && name=="notes") { + platform=""; + if (atts.count()>=1) { + if (atts.localName(0)=="platform") { + platform=atts.value(0); + } + } + inNotes=true; + } else if (name=="release") { + inRelease=true; + QString codename,status; + for (int i=0;ilatest_version) latest_version=version; + } + return true; +} +bool UpdateParser::endDocument() +{ + /*for (QHash::iterator r=releases.begin();r!=releases.end();r++) { + Release & rel=r.value(); + qDebug() << "New Version" << r.key() << rel.codename << rel.notes; + for (QHash::iterator u=rel.files.begin();u!=rel.files.end();u++) { + Update & up=u.value(); + qDebug() << "Platform:" << u.key() << up.filename << up.date; + } + }*/ + return true; +} + diff --git a/updateparser.h b/updateparser.h new file mode 100644 index 00000000..c018891c --- /dev/null +++ b/updateparser.h @@ -0,0 +1,93 @@ +#ifndef UPDATEPARSER_H +#define UPDATEPARSER_H + +#include +#include +#include + +struct Update +{ +public: + explicit Update() { size=0;} + explicit Update(const Update & copy) { + type=copy.type; + version=copy.version; + platform=copy.platform; + date=copy.date; + filename=copy.filename; + url=copy.url; + hash=copy.hash; + size=copy.size; + notes=copy.notes; + unzipped_path=copy.unzipped_path; + } + + Update(QString _type, QString _version, QString _platform, QDate _date) + { + type=_type; + version=_version; + platform=_platform; + date=_date; + size=0; + } + QString type; + QString version; + QString platform; + QDate date; + QString filename; + QString url; + QString hash; + qint64 size; + QString notes; + QString unzipped_path; +}; + +struct Release +{ + Release() {} + Release(const Release & copy) { + version=copy.version; + codename=copy.version; + notes=copy.notes; + info_url=copy.info_url; + status=copy.status; + updates=copy.updates; + } + + Release(QString ver, QString code, QString stat) { version=ver; codename=code; status=stat; } + QString version; + QString codename; + QString status; + QString info_url; + QHash notes; // by platform + QHash > updates; +}; + +Q_DECLARE_METATYPE(Update *) + +class UpdateParser:public QXmlDefaultHandler +{ +public: + bool startDocument(); + bool endElement(const QString &namespaceURI, const QString &localName, const QString &name); + bool characters(const QString &ch); + bool startElement(const QString &namespaceURI, const QString &localName, const QString &name, const QXmlAttributes &atts); + bool endDocument(); + QString latest() { return latest_version; } + + QHash releases; +private: + Update * update; + Release * release; + QString version, platform; + QString release_date; + QString latest_version; + bool inRelease; + bool inUpdate; + bool inNotes; + bool inUpdateNotes; +}; + + + +#endif // UPDATEPARSER_H