Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Backports:SLE-15-SP3:Update
unetbootin
0001-rought-Qt5-port.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-rought-Qt5-port.patch of Package unetbootin
From d8266c51317d279caf8f6a0f595dc2642014b12b Mon Sep 17 00:00:00 2001 From: Valeriy Malov <jazzvoid@gmail.com> Date: Fri, 28 Jul 2017 19:45:04 +0300 Subject: [PATCH 1/4] rought Qt5 port this breaks unetbootin::lstFtpDirFiles due to https://bugreports.qt.io/ browse/QTBUG-26294 --- main.cpp | 24 ++--- unetbootin.cpp | 194 ++++++++++++---------------------- unetbootin.h | 12 +-- unetbootin.pro | 1 + 4 files changed, 84 insertions(+), 147 deletions(-) Index: unetbootin/main.cpp =================================================================== --- unetbootin.orig/main.cpp +++ unetbootin/main.cpp @@ -9,6 +9,8 @@ This program is distributed in the hope #include "unetbootin.h" +#include <QMessageBox> + #ifdef Q_OS_WIN32 void configsysUndo(QString uninstPathL) @@ -403,18 +405,16 @@ int main(int argc, char **argv) uninstmsgb.setIcon(QMessageBox::Information); uninstmsgb.setWindowTitle(uninstaller::tr("%1 Uninstaller").arg(UNETBOOTINB)); uninstmsgb.setText(uninstaller::tr("%1 is currently installed. Remove the existing version?").arg(UNETBOOTINB)); - uninstmsgb.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); - switch (uninstmsgb.exec()) - { - case QMessageBox::Ok: - { - ubnUninst(); - } - case QMessageBox::Cancel: - break; - default: - break; - } + uninstmsgb.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel); + switch (uninstmsgb.exec()) + { + case QMessageBox::Ok: + ubnUninst(); + break; + case QMessageBox::Cancel: + default: + break; + } return 0; } #endif Index: unetbootin/unetbootin.cpp =================================================================== --- unetbootin.orig/unetbootin.cpp +++ unetbootin/unetbootin.cpp @@ -9,6 +9,10 @@ This program is distributed in the hope #include "unetbootin.h" +#include <QMessageBox> +#include <QFileDialog> +#include <QProgressDialog> + static const QList<QRegExp> ignoredtypesbothRL = QList<QRegExp>() << QRegExp("isolinux.bin$", Qt::CaseInsensitive) << QRegExp("isolinux.cfg$", Qt::CaseInsensitive) @@ -101,8 +105,8 @@ void callexternappT::run() void callexternappWriteToStdinT::run() { QProcess lnexternapp; - lnexternapp.start("\"" + execFile + "\" " + execParm); - lnexternapp.write(writeToStdin.toAscii().data()); + lnexternapp.start("\"" + execFile + "\" " + execParm); + lnexternapp.write(writeToStdin.toLatin1().data()); lnexternapp.closeWriteChannel(); lnexternapp.waitForFinished(-1); retnValu = QString(lnexternapp.readAll()); @@ -133,16 +137,6 @@ void copyfileT::run() emit finished(); } -ubngetrequestheader::ubngetrequestheader(QString urhost, QString urpath) -{ - this->setRequest("GET", urpath); - this->setValue("HOST", urhost); - this->setValue("User-Agent", "UNetbootin/1.1.1"); -// this->setValue("User-Agent", "Wget/1.10.2"); - this->setValue("Accept", "*/*"); - this->setValue("Connection", "Keep-Alive"); -} - randtmpfile::randtmpfile(QString rfpath, QString rfextn) { QString basefn = getrandfilename(rfpath, rfextn); @@ -159,7 +153,7 @@ QString randtmpfile::getrandfilename(QSt } return basefn; } - +/* void nDirListStor::sAppendSelfUrlInfoList(QUrlInfo curDirUrl) { if (curDirUrl.isValid() && curDirUrl.isReadable() && curDirUrl.isFile() && curDirUrl.size() > nMinFileSizeBytes && curDirUrl.size() < nMaxFileSizeBytes) @@ -171,7 +165,7 @@ void nDirListStor::sAppendSelfUrlInfoLis nDirFileListSL.append(curDirUrl.name()); } } - +*/ unetbootin::unetbootin(QWidget *parent) : QWidget(parent) { @@ -471,18 +465,20 @@ bool unetbootin::ubninitialize(QList<QPa { if (psecond.contains("listdistros", Qt::CaseInsensitive)) { + QTextStream out(stdout); for (int i = 1; i < this->distroselect->count(); ++i) { - printf("%s\n", this->distroselect->itemText(i).toAscii().constData()); + out << this->distroselect->itemText(i); } QApplication::exit(); exit(0); } else if (psecond.contains("listversions", Qt::CaseInsensitive)) { + QTextStream out(stdout); for (int i = 0; i < this->dverselect->count(); ++i) { - printf("%s\n", this->dverselect->itemText(i).toAscii().constData()); + out << this->dverselect->itemText(i); } QApplication::exit(); exit(0); @@ -1098,7 +1094,7 @@ bool unetbootin::checkifoutofspace(QStri bool outofspace = false; #ifdef Q_OS_UNIX struct statfs diskstatS; - if (!statfs(QString(destindir+"/.").toAscii(), &diskstatS)) + if (!statfs(QString(destindir+"/.").toLatin1(), &diskstatS)) { if (diskstatS.f_bavail * diskstatS.f_bfree < 1024) outofspace = true; @@ -2620,31 +2616,41 @@ void unetbootin::downloadfile(QString fi { rmFile(targetfile); } - QUrl dlurl(fileurl); - bool isftp = false; - if (dlurl.scheme() == "ftp") - { - isftp = true; - } - QHttp dlhttp; - QFtp dlftp; + QNetworkAccessManager manager; + QNetworkRequest dlurl(fileurl); + QNetworkReply * networkReply = manager.get(dlurl); + QEventLoop dlewait; pdesc5->setText(""); pdesc4->setText(tr("Downloading files, please wait...")); pdesc3->setText(tr("<b>Source:</b> <a href=\"%1\">%1</a>").arg(fileurl)); pdesc2->setText(tr("<b>Destination:</b> %1").arg(targetfile)); pdesc1->setText(tr("<b>Downloaded:</b> 0 bytes")); - QString realupath = QString(fileurl).remove(0, fileurl.indexOf(QString("://%1").arg(dlurl.host())) + QString("://%1").arg(dlurl.host()).length()); - if (isftp) + + QUrl redirectUrl; + bool downloadFailed = false; + + connect(networkReply, &QNetworkReply::finished, &dlewait, &QEventLoop::quit); + connect(networkReply, &QNetworkReply::downloadProgress, this, &unetbootin::dlprogressupdate64); + connect(networkReply, &QNetworkReply::redirected, [&redirectUrl](const QUrl &url){ redirectUrl = url; }); + connect(networkReply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), + [&downloadFailed](QNetworkReply::NetworkError){ downloadFailed = true; }); + + dlewait.exec(); + + if (!redirectUrl.isEmpty()) { - connect(&dlftp, SIGNAL(done(bool)), &dlewait, SLOT(quit())); - connect(&dlftp, SIGNAL(dataTransferProgress(qint64, qint64)), this, SLOT(dlprogressupdate64(qint64, qint64))); + downloadfile(redirectUrl.toString(), targetfile, minsize); + return; } - else + + if (downloadFailed) { - connect(&dlhttp, SIGNAL(done(bool)), &dlewait, SLOT(quit())); - connect(&dlhttp, SIGNAL(dataReadProgress(int, int)), this, SLOT(dlprogressupdate(int, int))); + QString errorStr = networkReply->errorString(); + showDownloadFailedScreen(fileurl); + return; } + QFile dloutfile; if (installType == tr("USB Drive")) { @@ -2654,83 +2660,17 @@ void unetbootin::downloadfile(QString fi { dloutfile.setFileName(targetfile); } + dloutfile.open(QIODevice::WriteOnly); - if (isftp) - { - dlftp.connectToHost(dlurl.host()); - dlftp.login(); - dlftp.get(realupath, &dloutfile); - } - else - { - dlhttp.setHost(dlurl.host()); - ubngetrequestheader dlrequest(dlurl.host(), realupath); - dlhttp.request(dlrequest, 0, &dloutfile); - } - dlewait.exec(); - if (!isftp) - { - QHttpResponseHeader dlresponse(dlhttp.lastResponse()); - int dlrstatus = dlresponse.statusCode(); - if (dlrstatus >= 300 && dlrstatus < 400 && dlresponse.hasKey("Location")) - { - dloutfile.close(); - rmFile(dloutfile); - downloadfile(dlresponse.value("Location"), targetfile, minsize); - return; - } - } - if (isftp) - { - dlftp.close(); - } - else - { - dlhttp.close(); - } + dloutfile.write(networkReply->readAll()); + networkReply->close(); + networkReply->deleteLater(); dloutfile.close(); if (installType == tr("USB Drive")) { dloutfile.rename(targetfile); } - if (QFile(targetfile).size() <= 4096) - { - QString redirectTargetURL; - QFile seeRedirect(targetfile); - seeRedirect.open(QIODevice::ReadOnly | QIODevice::Text); - QTextStream seeRedirectTextStream(&seeRedirect); - while (!seeRedirectTextStream.atEnd()) - { - QString curline = seeRedirectTextStream.readLine(); - if (curline.contains("content=\"0;url=")) - { - int urlstartidx = curline.indexOf("content=\"0;url=") + QString("content=\"0;url=").size(); - redirectTargetURL = curline.mid(urlstartidx); - if (redirectTargetURL.contains("\"")) - { - redirectTargetURL = redirectTargetURL.left(redirectTargetURL.indexOf("\"")); - } - break; - } - if (curline.contains("content='0;url=")) - { - int urlstartidx = curline.indexOf("content='0;url=") + QString("content='0;url=").size(); - redirectTargetURL = curline.mid(urlstartidx); - if (redirectTargetURL.contains("'")) - { - redirectTargetURL = redirectTargetURL.left(redirectTargetURL.indexOf("'")); - } - break; - } - } - seeRedirect.close(); - if (!redirectTargetURL.isEmpty()) - { - rmFile(targetfile); - downloadfile(redirectTargetURL, targetfile, minsize); - return; - } - } + if (QFile(targetfile).size() < minsize) { // download failed @@ -2812,31 +2752,33 @@ void unetbootin::cpprogressupdate64(qint } } -QString unetbootin::downloadpagecontents(QString pageurl) +QString unetbootin::downloadpagecontents(QUrl pageurl) { - QUrl pgurl(pageurl); - QHttp pghttp; + QNetworkAccessManager _manager; + QNetworkRequest dlurl(pageurl); + QNetworkReply * networkReply = _manager.get(dlurl); QEventLoop pgwait; - connect(&pghttp, SIGNAL(done(bool)), &pgwait, SLOT(quit())); - pghttp.setHost(pgurl.host()); - QString realpgupath = QString(pageurl).remove(0, pageurl.indexOf(QString("://%1").arg(pgurl.host())) + QString("://%1").arg(pgurl.host()).length()); - ubngetrequestheader pgrequest(pgurl.host(), realpgupath); - pghttp.request(pgrequest); + QUrl redirectUrl; + connect(networkReply, &QNetworkReply::finished, &pgwait, &QEventLoop::quit); + connect(networkReply, &QNetworkReply::redirected, [&redirectUrl](const QUrl &url){ redirectUrl = url; }); + pgwait.exec(); - QHttpResponseHeader pgresponse(pghttp.lastResponse()); - int pgrstatus = pgresponse.statusCode(); - if (pgrstatus >= 300 && pgrstatus < 400 && pgresponse.hasKey("Location")) - { - return downloadpagecontents(pgresponse.value("Location")); - } - else + + if (!redirectUrl.isEmpty()) { - return QString(pghttp.readAll()); + return downloadpagecontents(redirectUrl); } + + QString result = networkReply->readAll(); + networkReply->close(); + networkReply->deleteLater(); + return result; } QStringList unetbootin::lstFtpDirFiles(QString ldfDirStringUrl, int ldfMinSize, int ldfMaxSize) { + return {}; +/* QUrl ldfDirUrl(ldfDirStringUrl); QFtp ldfFtp; QEventLoop ldfWait; @@ -2851,14 +2793,14 @@ QStringList unetbootin::lstFtpDirFiles(Q ldfFtp.list(ldfDirUrl.path()); ldfWait.exec(); ldfFtp.close(); - return nDirListStorL.nDirFileListSL; + return nDirListStorL.nDirFileListSL;*/ } QStringList unetbootin::lstHttpDirFiles(QString ldfDirStringUrl) { QStringList relativefilelinksL; QStringList relativelinksLPreFilter = - downloadpagecontents(ldfDirStringUrl) + downloadpagecontents(QUrl(ldfDirStringUrl)) .replace(">", ">\n") .replace("<", "\n<") .split("\n"); @@ -3218,11 +3160,11 @@ int unetbootin::letterToNumber(QChar let { if (lettertoconvert.isLower()) { - return static_cast<int>(lettertoconvert.toAscii() - 'a'); + return static_cast<int>(lettertoconvert.toLatin1() - 'a'); } if (lettertoconvert.isUpper()) { - return static_cast<int>(lettertoconvert.toAscii() - 'A'); + return static_cast<int>(lettertoconvert.toLatin1() - 'A'); } else { Index: unetbootin/unetbootin.h =================================================================== --- unetbootin.orig/unetbootin.h +++ unetbootin/unetbootin.h @@ -152,19 +152,13 @@ signals: void finished(); }; -class ubngetrequestheader : public QHttpRequestHeader -{ -public: - ubngetrequestheader(QString urhost, QString urpath); -}; - class randtmpfile : public QFile { public: randtmpfile(QString rfpath, QString rfextn); static QString getrandfilename(QString rfpath, QString rfextn); }; - +/* class nDirListStor : public QObject { Q_OBJECT @@ -178,7 +172,7 @@ public: public slots: void sAppendSelfUrlInfoList(QUrlInfo curDirUrl); }; - +*/ class unetbootin : public QWidget, private Ui::unetbootinui { Q_OBJECT @@ -280,7 +274,7 @@ public: QString searchforgrub2includesfile(QString includesfile, QString archivefile, QStringList archivefileconts, QStringList visitedincludes); QPair<QPair<QStringList, QStringList>, QPair<QStringList, QStringList> > searchforgrub2includesfileL(QString includesfile, QString archivefile, QStringList archivefileconts, QStringList visitedincludes); void downloadfile(QString fileurl, QString targetfile, int minsize); - QString downloadpagecontents(QString pageurl); + QString downloadpagecontents(QUrl pageurl); QStringList lstFtpDirFiles(QString ldfDirStringUrl, int ldfMinSize, int ldfMaxSize); QStringList lstHttpDirFiles(QString ldfDirStringUrl); QStringList lstNetDirFiles(QString ldfDirStringUrl, int ldfMinSize, int ldfMaxSize); Index: unetbootin/unetbootin.pro =================================================================== --- unetbootin.orig/unetbootin.pro +++ unetbootin/unetbootin.pro @@ -14,6 +14,7 @@ SOURCES += main.cpp \ distrovercust.cpp QT += core \ gui \ + widgets \ network ICON = unetbootin.icns TRANSLATIONS += unetbootin.ts \
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
