diff --git a/upgrade/UpdateWindow.cpp b/upgrade/UpdateWindow.cpp deleted file mode 100644 index f91480d6..00000000 --- a/upgrade/UpdateWindow.cpp +++ /dev/null @@ -1,531 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "quazip/quazip.h" -#include "quazip/quazipfile.h" -#include "UpdateWindow.h" -#include "ui_UpdateWindow.h" -#include "../version.h" - -#ifdef Q_WS_WIN32 -#include -#endif - -void delay(int ms) -{ -#ifdef Q_WS_WIN32 - delay(ms); -#else - sleep(ms/1000); -#endif -} - -UpdateWindow::UpdateWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::UpdateWindow) -{ - ui->setupUi(this); - if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) { - systray=new QSystemTrayIcon(QIcon(":/images/sheep.png"),this); - systray->show(); - systraymenu=new QMenu(this); - systray->setContextMenu(systraymenu); - QAction *a=systraymenu->addAction("SleepyHead Updater v"+VersionString()); - a->setEnabled(false); - systraymenu->addSeparator(); - //systraymenu->addAction("About",this,SLOT(on_action_About_triggered())); - //systraymenu->addAction("Check for Updates",this,SLOT(on_actionCheck_for_Updates_triggered())); - systraymenu->addSeparator(); - systraymenu->addAction("Exit",this,SLOT(close())); - connect(systray,SIGNAL(messageClicked()),this,SLOT(notify_clicked())); - } else { - systray=NULL; - systraymenu=NULL; - } - requestmode=RM_None; - netmanager = new QNetworkAccessManager(this); - connect(netmanager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*))); - update=NULL; - ui->stackedWidget->setCurrentIndex(0); - -// QPalette p=ui->buildNotes->palette(); -// QColor win=p.color(QPalette::Window); -// ui->buildNotes->setStyleSheet("background-color: "+win.name()); -} - -UpdateWindow::~UpdateWindow() -{ - if (systray) disconnect(systray,SIGNAL(messageClicked()),this,SLOT(notify_clicked())); - - 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; - } - } - 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::Start() -{ -} - -void UpdateWindow::Notify(QString s,int ms, QString title) -{ - if (systray && systray->supportsMessages()) { - systray->showMessage(title,s,QSystemTrayIcon::Information,ms); - } else { - //ui->statusBar->showMessage(s,ms); - } -} - -void UpdateWindow::notify_clicked() -{ - qDebug() << "Clicked on FOO!"; - -} - -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; - - 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)) { - 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); - show(); - } - } else { - qDebug() << "XML Parsing Error"; - } -} - -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(); - 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 { - f.setFileName(path); - f.open(QFile::WriteOnly); - f.write(qzf.readAll()); - f.close(); - if (qzf.getZipError()) { - errors++; - } else { - } - } - if (bar) { - bar->setValue((1.0/float(fsize)*float(i+1))*100.0); - QApplication::processEvents(); - } - qzf.close(); - } - zip.close(); - if (!errors) { - 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())); - - /*if (!needQtVersion.isEmpty()) { - requestmode=RM_UpdateQT; - QString filename="qtlibs-"+needQtVersion+"-"+PlatformString.toLower()+".zip"; - QNetworkReply *nr=netmanager->get(QNetworkRequest(QUrl("http://192.168.1.8/"+filename))); - netmanager->connect(nr,SIGNAL(downloadProgress(qint64,qint64)),this, SLOT(downloadProgress(qint64,qint64))); - dltime.start(); - } else { - ui->label->setText("Downloading Complete"); - requestmode=RM_None; - } */ - ui->plainTextEdit->appendPlainText("Download Complete"); - - /*QByteArray ba=reply->readAll(); - QString a="Checking File Integrity"; - ui->label->setText(a); - ui->plainTextEdit->appendPlainText(a); - QCryptographicHash hash(QCryptographicHash::Sha1); - hash.addData(ba); - if (hash.result().toHex()!=update->hash) { - QString a="Integrity check failed."; - - ui->plainTextEdit->appendPlainText(a); - Notify("Download file is corrupt :(\n",5000,"Download Failed"); - - return; - } else ui->plainTextEdit->appendPlainText("File integrity checked out ok"); - - QByteArray bb=qUncompress(ba); - if (bb.isEmpty()) { - ui->plainTextEdit->appendPlainText("Couldn't decompress file "+update->filename); - Notify("Could not decompress update file :(\n",5000,"Download Failed"); - return; - } - f.write(bb); - f.close(); */ - } else if (requestmode==RM_UpdateQT) { - ui->plainTextEdit->appendPlainText("Received "+QString::number(reply->size())+" bytes"); - } - } else { - 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) { - qDebug() << "Finished"; - } else { - QMessageBox::warning(this,"Download Error","Sorry, could not get all necessary files for upgrade.. Aborting.",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); - - 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); - //new QProgressBar(ui->tableWidget)); - //ui->tableWidget->setItem(i,3,wi); //new QTableWidgetItem(update->filename)); - ui->tableWidget->setItem(i,4,new QTableWidgetItem(update->url)); - } - ui->stackedWidget->setCurrentIndex(1); - upgradeNext(); -} diff --git a/upgrade/UpdateWindow.h b/upgrade/UpdateWindow.h deleted file mode 100644 index 7537c268..00000000 --- a/upgrade/UpdateWindow.h +++ /dev/null @@ -1,65 +0,0 @@ -#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 Notify(QString s,int ms=5000, QString title="SleepyHead v"+VersionString()); - - void ParseUpdateXML(QIODevice * dev); - -protected slots: - void Start(); - void replyFinished(QNetworkReply * reply); - void notify_clicked(); - void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); - void dataReceived(); - void requestFile(); - -private slots: - void on_CloseButton_clicked(); - - void on_upgradeButton_clicked(); - - void upgradeNext(); - -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; -}; - -#endif // UPDATEWINDOW_H diff --git a/upgrade/UpdateWindow.ui b/upgrade/UpdateWindow.ui deleted file mode 100644 index 6478e13b..00000000 --- a/upgrade/UpdateWindow.ui +++ /dev/null @@ -1,387 +0,0 @@ - - - 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 - - - - - - - :/images/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 - - - - - &Abort - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &Finish - - - - - - - - - - - - - - - - - QWebView - QWidget -
QtWebKit/QWebView
- - - - - - - - cancelButton - clicked() - UpdateWindow - close() - - - 46 - 369 - - - 249 - 158 - - - - - diff --git a/upgrade/main.cpp b/upgrade/main.cpp deleted file mode 100644 index 8bcff81b..00000000 --- a/upgrade/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include -#include -#include "UpdateWindow.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - UpdateWindow w; - - w.checkForUpdates(); - // w.show(); - - return a.exec(); -} diff --git a/upgrade/resources.qrc b/upgrade/resources.qrc deleted file mode 100644 index e4e53666..00000000 --- a/upgrade/resources.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - sheep.png - - diff --git a/upgrade/updateparser.cpp b/upgrade/updateparser.cpp deleted file mode 100644 index 92a10bfa..00000000 --- a/upgrade/updateparser.cpp +++ /dev/null @@ -1,120 +0,0 @@ -#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/upgrade/updateparser.h b/upgrade/updateparser.h deleted file mode 100644 index c018891c..00000000 --- a/upgrade/updateparser.h +++ /dev/null @@ -1,93 +0,0 @@ -#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 diff --git a/upgrade/upgrade.pro b/upgrade/upgrade.pro deleted file mode 100644 index a93595a3..00000000 --- a/upgrade/upgrade.pro +++ /dev/null @@ -1,72 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2011-12-14T23:44:40 -# -#------------------------------------------------- - -QT += core gui network xml webkit - -TARGET = upgrade -TEMPLATE = app - -DEFINES += QUAZIP_BUILD -CONFIG(staticlib): DEFINES += QUAZIP_STATIC - -unix:!symbian { - headers.path=$$PREFIX/include/quazip - headers.files=$$HEADERS - target.path=$$PREFIX/lib - INSTALLS += headers target - - OBJECTS_DIR=.obj - MOC_DIR=.moc - - LIBS += -lz -} - -win32 { - headers.path=$$PREFIX/include/quazip - headers.files=$$HEADERS - target.path=$$PREFIX/lib - INSTALLS += headers target - - *-g++*: LIBS += -lz.dll - *-msvc*: LIBS += -lzlibwapi - *-msvc*: QMAKE_LFLAGS += /IMPLIB:$$DESTDIR\\quazip.lib -} - -SOURCES += main.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 \ - UpdateWindow.cpp - -HEADERS += \ - 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 \ - UpdateWindow.h - -FORMS += \ - UpdateWindow.ui - -RESOURCES += \ - resources.qrc