chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

More update cleanups

Browse Source
This commit is contained in:
Mark Watkins 2011-12-17 21:59:43 +10:00
parent e351b0e3e3
commit be9748fd10
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
UpdaterWindow.cpp
View File

@ -64,7 +64,7 @@ UpdaterWindow::~UpdaterWindow()
void UpdaterWindow::checkForUpdates() void UpdaterWindow::checkForUpdates()
{ {
QString filename=QApplication::applicationDirPath()+QDir::separator()+"update.xml"; QString filename=QApplication::applicationDirPath()+"/update.xml";
// Check updates.xml file if it's still recent.. // Check updates.xml file if it's still recent..
if (QFile::exists(filename)) { if (QFile::exists(filename)) {
QFileInfo fi(filename); QFileInfo fi(filename);
@ -99,10 +99,8 @@ void UpdaterWindow::downloadUpdateXML()
void UpdaterWindow::dataReceived() void UpdaterWindow::dataReceived()
{ {
//HttpStatusCodeAttribute
QString rs=reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); QString rs=reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString();
if (rs!="200") return; if (rs!="200") return;
//QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
QByteArray read=reply->read(reply->bytesAvailable()); QByteArray read=reply->read(reply->bytesAvailable());
qDebug() << "Received" << read.size() << "bytes"; qDebug() << "Received" << read.size() << "bytes";
@ -151,9 +149,9 @@ void UpdaterWindow::requestFile()
requestmode=RM_GetFile; requestmode=RM_GetFile;
QString path=QApplication::applicationDirPath()+QDir::separator()+"Download"; QString path=QApplication::applicationDirPath()+"/Download";
QDir().mkdir(path); QDir().mkpath(path);
path+=QDir::separator()+filename; path+="/"+filename;
ui->plainTextEdit->appendPlainText("Saving as "+path); ui->plainTextEdit->appendPlainText("Saving as "+path);
file.setFileName(path); file.setFileName(path);
file.open(QFile::WriteOnly); file.open(QFile::WriteOnly);
@ -278,7 +276,7 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
} }
ui->plainTextEdit->appendPlainText(QString::number(reply->size())+" bytes received."); ui->plainTextEdit->appendPlainText(QString::number(reply->size())+" bytes received.");
QString filename=QApplication::applicationDirPath()+QDir::separator()+"update.xml"; QString filename=QApplication::applicationDirPath()+"/update.xml";
qDebug() << filename; qDebug() << filename;
QFile file(filename); QFile file(filename);
file.open(QFile::WriteOnly); file.open(QFile::WriteOnly);
@ -294,13 +292,13 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
file.close(); file.close();
//HttpStatusCodeAttribute //HttpStatusCodeAttribute
QString rs=reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString(); QString rs=reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toString();
qDebug() << "HTTP Status Code" << rs;
bool failed=false; bool failed=false;
if (rs=="404") { if (rs=="404") {
qDebug() << "File not found"; qDebug() << "File not found";
failed=true; failed=true;
} else { } else {
qDebug() << "StatCodeAttr" << rs;
QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); QUrl redirectUrl = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
if (!redirectUrl.isEmpty() && (redirectUrl!=reply->url())) { if (!redirectUrl.isEmpty() && (redirectUrl!=reply->url())) {
file.open(QFile::WriteOnly); //reopen file.. file.open(QFile::WriteOnly); //reopen file..
@ -319,8 +317,7 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
ui->plainTextEdit->appendPlainText("File size mismatch for "+update->filename); ui->plainTextEdit->appendPlainText("File size mismatch for "+update->filename);
} }
} else { } else {
QString path=QApplication::applicationDirPath()+QDir::separator()+"Download"; QString path=QApplication::applicationDirPath()+"/Download/"+update->filename;
path+=QDir::separator()+update->filename;
QFile f(path); QFile f(path);
f.open(QFile::ReadOnly); f.open(QFile::ReadOnly);
QCryptographicHash hash(QCryptographicHash::Sha1); QCryptographicHash hash(QCryptographicHash::Sha1);
@ -349,9 +346,9 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
QByteArray ba; QByteArray ba;
QStringList update_txt; QStringList update_txt;
QString apppath=QApplication::applicationDirPath()+QDir::separator(); QString apppath=QApplication::applicationDirPath()+"/";
QString backups=apppath+"Backups"+QDir::separator(); QString backups=apppath+"Backups/";
QString downloads=apppath+"Downloads"+QDir::separator(); QString downloads=apppath+"Downloads/";
QDir().mkpath(backups); QDir().mkpath(backups);
for (int i=0;i<fsize;i++) { for (int i=0;i<fsize;i++) {
@ -360,7 +357,7 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
qzf.open(QuaZipFile::ReadOnly); qzf.open(QuaZipFile::ReadOnly);
QString path=downloads+files.at(i); QString path=downloads+files.at(i);
if (path.endsWith(QDir::separator())) { if (path.endsWith("/") || path.endsWith("\\")) {
QDir().mkpath(path); QDir().mkpath(path);
if (update->unzipped_path.isEmpty()) if (update->unzipped_path.isEmpty())
update->unzipped_path=path; update->unzipped_path=path;

2
common_gui.cpp
View File

@ -11,7 +11,7 @@
#include "windows.h" #include "windows.h"
void sh_delay(int ms) void sh_delay(int ms)
{ {
Sleep(ms) Sleep(ms);
} }
#else #else
void sh_delay(int ms) void sh_delay(int ms)