Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wolfi323:branches:home:wolfi323:branches:KDE:Frameworks5
kget5
debug.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File debug.patch of Package kget5
diff --git a/core/transferhistorystore.cpp b/core/transferhistorystore.cpp index 65769521..92a4ff50 100644 --- a/core/transferhistorystore.cpp +++ b/core/transferhistorystore.cpp @@ -28,7 +28,7 @@ TransferHistoryItem::TransferHistoryItem() : QObject() TransferHistoryItem::TransferHistoryItem(const Transfer &transfer) : QObject() { - setDest(transfer.dest().toLocalFile()); + setDest(transfer.dest().toLocalFile()); qDebug() << "Wolfi: TransferHistoryItem(), setDest to" << transfer.dest().toLocalFile() << ", was" << transfer.dest().toString(); setSource(transfer.source().url()); setSize(transfer.totalSize()); setDateTime(QDateTime::currentDateTime()); diff --git a/ui/verificationdialog.cpp b/ui/verificationdialog.cpp index 63e5c087..0776f019 100644 --- a/ui/verificationdialog.cpp +++ b/ui/verificationdialog.cpp @@ -86,6 +86,7 @@ VerificationDialog::VerificationDialog(QWidget *parent, TransferHandler *transfe m_proxy(nullptr), m_fileModel(nullptr) { + qDebug() << "VerificationDialog::VerificationDialog(), file=" << file; if (m_verifier) { m_model = m_verifier->model(); connect(m_verifier, &Verifier::verified, this, &VerificationDialog::slotVerified); diff --git a/ui/transfersettingsdialog.cpp b/ui/transfersettingsdialog.cpp index 8dcabbf2..691f2b3e 100644 --- a/ui/transfersettingsdialog.cpp +++ b/ui/transfersettingsdialog.cpp @@ -30,6 +30,7 @@ TransferSettingsDialog::TransferSettingsDialog(QWidget *parent, TransferHandler m_model(m_transfer->fileModel()), m_proxy(nullptr) { + qDebug() << "TransferSettingsDialog::TransferSettingsDialog(), model=" << m_transfer->fileModel(); setWindowTitle(i18n("Transfer Settings for %1", m_transfer->source().fileName())); ui.setupUi(this); diff --git a/ui/newtransferdialog.cpp b/ui/newtransferdialog.cpp index 04ef0a6d..c10db5cf 100644 --- a/ui/newtransferdialog.cpp +++ b/ui/newtransferdialog.cpp @@ -180,6 +180,7 @@ void NewTransferDialog::setSource(const QList<QUrl> &sources) void NewTransferDialog::setDestinationFileName(const QString &filename) { + qDebug() << "NewTransferDialog::setDestinationFileName(), result=" << ui.destRequester->url().adjusted(QUrl::RemoveFilename).toString() + filename; ui.destRequester->setUrl(QString(ui.destRequester->url().adjusted(QUrl::RemoveFilename).toString() + filename)); } @@ -203,6 +204,7 @@ void NewTransferDialog::setDestination() if (!groupFolder.endsWith('/')) { groupFolder.append('/'); } + qDebug() << "NewTransferDialog::setDestination(), groupFolder=" << groupFolder; ui.destRequester->comboBox()->setCurrentItem(groupFolder, true); } } @@ -406,8 +406,9 @@ void NewTransferDialog::dialogAccepted() //set the last directory QString dir = m_destination.toLocalFile(); if (!QFileInfo(dir).isDir()) { - dir = m_destination.adjusted(QUrl::RemoveFilename).toLocalFile(); + dir = m_destination.adjusted(QUrl::RemoveFilename).toLocalFile(); qDebug() << "dir=" << dir << ", originally it would be" << m_destination.adjusted(QUrl::RemoveFilename).toString(); //sollte eigtl. lt. KUrl docs m_destination.adjusted(QUrl::RemoveFilename).path() sein? } + qCDebug(KGET_DEBUG) << "setLastDirectory(" << dir << " )"; Settings::setLastDirectory(dir); Settings::self()->save(); @@ -614,14 +623,15 @@ UrlChecker::removeDuplicates(urls); QString folder = (*itUrls).folder; + qDebug() << "NewTransferDialogHandler::handleUrls(), folder=" << folder; if (!folder.isEmpty() && (UrlChecker::checkFolder(QUrl::fromLocalFile(folder), true) != UrlChecker::NoError)) { folder.clear(); } const QString suggestedFileName = (*itUrls).suggestedFileName; QUrl newDest; const QUrl folderUrl = QUrl::fromLocalFile(folder); - +qDebug() << "folder=" << folder << ", folderUrl=" << folderUrl; //check if the sources are correct UrlChecker check(UrlChecker::Source); check.addUrls(urls); @@ -646,19 +656,22 @@ if (!folder.isEmpty()) { const QUrl destUrl = UrlChecker::destUrl(QUrl::fromLocalFile(folder), sourceUrl, suggestedFileName); newDest = check.checkExistingFile(sourceUrl, destUrl); + qDebug() << "newDest=" << newDest << ", destUrl=" << destUrl << ", folder=" << folder; if (!newDest.isEmpty()) { data << KGet::TransferData(sourceUrl, newDest, groupName); } urls.removeFirst(); } else if (((!groups.isEmpty() && !Settings::directoriesAsSuggestion()) || !Settings::askForDestination()) && (UrlChecker::checkFolder(QUrl::fromLocalFile(defaultFolder)) == UrlChecker::NoError)) { const QUrl destUrl = UrlChecker::destUrl(QUrl::fromLocalFile(defaultFolder), sourceUrl, suggestedFileName); + qDebug() << "destUrl=" << destUrl << ", defaultFolder=" << defaultFolder; newDest = check.checkExistingFile(sourceUrl, destUrl); if (!newDest.isEmpty()) { data << KGet::TransferData(sourceUrl, newDest, groupName); } urls.removeFirst(); } +qDebug() << "defaultFolder=" << defaultFolder; } ///A valid folder has been defined, use that for downloading @@ -716,6 +729,7 @@ } const QUrl folderUrl = QUrl::fromLocalFile(group->defaultFolder()); +qDebug() << "folderUrl=" << folderUrl << ", group->defaultFolder=" << group->defaultFolder(); if (UrlChecker::checkFolder(folderUrl) != UrlChecker::NoError) { continue; } @@ -749,6 +763,7 @@ void NewTransferDialogHandler::handleUrls(const int jobId) while (it != urls.end()) { const QUrl sourceUrl = *it; const QUrl destUrl = UrlChecker::destUrl(QUrl::fromLocalFile(dir), sourceUrl); +qDebug() << "dir=" << dir << ", destUrl=" << destUrl; newDest = check.checkExistingFile(sourceUrl, destUrl); if (!newDest.isEmpty()) { data << KGet::TransferData(sourceUrl, newDest); diff --git a/transfer-plugins/metalink/metalinkxml.cpp b/transfer-plugins/metalink/metalinkxml.cpp index 87cccbe8..dc4fcece 100644 --- a/transfer-plugins/metalink/metalinkxml.cpp +++ b/transfer-plugins/metalink/metalinkxml.cpp @@ -95,7 +95,7 @@ bool MetalinkXml::metalinkInit(const QUrl &src, const QByteArray &data) //try to parse the locally stored metalink-file if (!m_metalink.isValid() && m_localMetalinkLocation.isValid()) { - KGetMetalink::HandleMetalink::load(m_localMetalinkLocation.toLocalFile(), &m_metalink); + KGetMetalink::HandleMetalink::load(m_localMetalinkLocation.toLocalFile(), &m_metalink); qDebug() << "metalinkInit(), m_localMetalinkLocation=" << m_localMetalinkLocation; } if (!m_metalink.isValid()) { diff --git a/ui/metalinkcreator/metalinker.cpp b/ui/metalinkcreator/metalinker.cpp index 377d11ae..520c60bc 100644 --- a/ui/metalinkcreator/metalinker.cpp +++ b/ui/metalinkcreator/metalinker.cpp @@ -295,7 +295,7 @@ void KGetMetalink::Metaurl::clear() bool KGetMetalink::Url::operator<(const KGetMetalink::Url &other) const { bool smaller = (this->priority > other.priority) || ((this->priority == 0) && (other.priority != 0)); - +qDebug() << "KGetMetalink::Url::operator<() called"; if (!smaller && (this->priority == other.priority)) { QString countryCode;// = KLocale::global()->country();//TODO: Port if (!countryCode.isEmpty()) { @@ -1160,7 +1160,7 @@ QString KGetMetalink::Metalink_v3::dateConstructToString(const KGetMetalink::Dat bool KGetMetalink::HandleMetalink::load(const QUrl &destination, KGetMetalink::Metalink *metalink) { - QFile file(destination.toLocalFile()); + QFile file(destination.toLocalFile()); qDebug() << "KGetMetalink::HandleMetalink::load(), was" << destination.toString() << ", is now" << destination.toLocalFile(); if (!file.open(QIODevice::ReadOnly)) { return false; @@ -1224,7 +1224,7 @@ QString KGetMetalink::Metalink_v3::dateConstructToString(const KGetMetalink::Dat bool KGetMetalink::HandleMetalink::save(const QUrl &destination, KGetMetalink::Metalink *metalink) { - QFile file(destination.toLocalFile()); + QFile file(destination.toLocalFile()); qDebug() << "KGetMetalink::HandleMetalink::save(), was" << destination.toString() << ", is now" << destination.toLocalFile(); if (!file.open(QIODevice::WriteOnly)) { return false; } @@ -1389,7 +1389,7 @@ bool KGetMetalink::HttpLinkHeader::operator<(const HttpLinkHeader &other) const void KGetMetalink::HttpLinkHeader::parseHeaderLine(const QString &line) { - url = line.mid(line.indexOf("<") + 1,line.indexOf(">") -1).trimmed(); + url = line.mid(line.indexOf("<") + 1,line.indexOf(">") -1).trimmed(); qDebug() << "KGetMetalink::HttpLinkHeader::parseHeaderline(), line=" << line << ", url=" << url; //QUrl(line.mid(line.indexOf("<") + 1,line.indexOf(">") -1).trimmed()); const QList<QString> attribList = line.split(";"); foreach (const QString str, attribList) { diff --git a/ui/metalinkcreator/metalinkcreator.cpp b/ui/metalinkcreator/metalinkcreator.cpp index 71332b44..2d2d3d92 100644 --- a/ui/metalinkcreator/metalinkcreator.cpp +++ b/ui/metalinkcreator/metalinkcreator.cpp @@ -28,6 +28,7 @@ #include <QSortFilterProxyModel> #include <QStandardItemModel> #include <QTimer> +#include <QDebug> #include <KLocalizedString> #include <KMessageBox> @@ -388,6 +389,7 @@ void MetalinkCreator::slotHandleDropped(const QStringList &types, bool createPar uiFiles.progressBar->setMaximum(0); uiFiles.dragDrop->show(); m_thread.setData(m_handler->takeFiles(), types, createPartial, m_tempResources, m_tempCommonData); + qDebug() << "Wolfi: MetalinkCreator::slotHandleDropped() called"; } void MetalinkCreator::slotThreadFinished() diff --git a/ui/metalinkcreator/filehandler.cpp b/ui/metalinkcreator/filehandler.cpp index b4dddf9f..313fc50c 100644 --- a/ui/metalinkcreator/filehandler.cpp +++ b/ui/metalinkcreator/filehandler.cpp @@ -21,6 +21,7 @@ #include "core/verifier.h" #include <QDir> +#include <QDebug> FileHandlerThread::FileHandlerThread(QObject *parent) : QThread(parent), @@ -76,7 +76,7 @@ void FileHandlerThread::run() foreach (const KGetMetalink::Url &metalinkUrl, tempResources.urls) { KGetMetalink::Url mirror = metalinkUrl; mirror.url.setPath(mirror.url.toString() + "/" + file.name); - +mirror = metalinkUrl; mirror.url.setPath(mirror.url.adjusted(QUrl::StripTrailingSlash).path() + '/' + file.name); qDebug() << "FileHandlerThread::run(): mirror.url=" << mirror.url << ", metalinkUrl.url=" << metalinkUrl.url << ", metalinkUrl.url.path()=" << metalinkUrl.url.path(); //if the url has already been added, remove it and readd it for (int i = 0; i < file.resources.urls.count(); ++i) { if (file.resources.urls[i].url == mirror.url) { @@ -175,6 +176,7 @@ void DirectoryHandler::slotFiles(const QList<QUrl> &files) void DirectoryHandler::slotDirEntries(KIO::Job *j, const KIO::UDSEntryList &entries) { + qDebug() << "DirectoryHandler::slotDirEntries() called"; KJob *job = j; if (!m_jobs.contains(job)) { return; @@ -182,7 +184,7 @@ void DirectoryHandler::slotDirEntries(KIO::Job *j, const KIO::UDSEntryList &entr const QUrl baseUrl = m_jobs[job]; const QString baseDir = baseUrl.fileName() + '/'; - + qDebug() << "baseUrl=" << baseUrl << ", baseDir=" << baseDir; foreach (const KIO::UDSEntry &entry, entries) { //skip all found dirs if (!entry.isDir()) { @@ -191,7 +193,7 @@ void DirectoryHandler::slotDirEntries(KIO::Job *j, const KIO::UDSEntryList &entr data.url.setPath(baseUrl.toString() + "/" + name);//FIXME: Does this work? data.file.name = baseDir + name; data.file.size = entry.numberValue(KIO::UDSEntry::UDS_SIZE, -1); - +data.url=baseUrl; data.url.setPath(baseUrl.path() + '/' + name); qDebug() << "data.url=" << data.url << ", data.file.name=" << data.file.name << ", data.file.size=" << data.file.size; m_files.append(data); } } diff --git a/core/urlchecker.cpp b/core/urlchecker.cpp index e0989ea5..a85541b5 100644 --- a/core/urlchecker.cpp +++ b/core/urlchecker.cpp @@ -205,7 +205,7 @@ UrlChecker::UrlError UrlChecker::checkFolder(const QUrl &folder, bool showNotifi { UrlError error = NoError; - const QString destDir = folder.toLocalFile(); + const QString destDir = folder.toLocalFile(); qDebug() << "UrlChecker::checkFolder(" << folder << "), with original code destDir was: " << folder.toString() << ", now destDir=" << destDir; if (folder.isEmpty() || destDir.isEmpty()) { error = Empty; } diff --git a/core/kget.cpp b/core/kget.cpp index 67856022..bd751c97 100644 --- a/core/kget.cpp +++ b/core/kget.cpp @@ -178,6 +178,7 @@ QStringList KGet::transferGroupNames() TransferHandler * KGet::addTransfer(QUrl srcUrl, QString destDir, QString suggestedFileName, // krazy:exclude=passbyvalue QString groupName, bool start) { + qCDebug(KGET_DEBUG) << "KGet::addTransfer() srcUrl:" << srcUrl; srcUrl = mostLocalUrl(srcUrl); // Note: destDir may actually be a full path to a file :-( qCDebug(KGET_DEBUG) << "Source:" << srcUrl.url() << ", dest: " << destDir << ", sugg file: " << suggestedFileName << endl; @@ -212,6 +212,7 @@ TransferHandler * KGet::addTransfer(QUrl srcUrl, QString destDir, QString sugges QUrl targetUrl = QUrl::fromLocalFile(destDir); QString directory = targetUrl.adjusted(QUrl::RemoveFilename).path(); QString fileName = targetUrl.fileName(QUrl::PrettyDecoded); + qDebug() << "Wolfi: targetUrl=" << targetUrl << ", directory=" << directory << ", fileName=" << fileName; if (QFileInfo(directory).isDir() && !fileName.isEmpty()) { destDir = directory; suggestedFileName = fileName; @@ -239,11 +240,14 @@ TransferHandler * KGet::addTransfer(QUrl srcUrl, QString destDir, QString sugges return nullptr; destDir = destUrl.adjusted(QUrl::RemoveFilename).path(); + qDebug() << "Wolfi: destDir=" << destDir << ", destUrl=" << destUrl; } while (!isValidDestDirectory(destDir)); } else { destUrl = QUrl::fromLocalFile(destDir + suggestedFileName); + qDebug() << "Wolfi: destUrl=" << destUrl << ", destDir=" << destDir << ", suggestedFileName=" << suggestedFileName; } destUrl = getValidDestUrl(destUrl, srcUrl); + qDebug() << "finally, destUrl=" << destUrl; if (destUrl == QUrl()) return nullptr; @@ -279,6 +279,7 @@ QList<TransferHandler*> KGet::addTransfers(const QList<QDomElement> &elements, c const QList<TransferHandler *> KGet::addTransfer(QList<QUrl> srcUrls, QString destDir, QString groupName, bool start) { +qDebug() << "KGet::addTransfer(" << srcUrls << "," << destDir << "," << groupName << "," << start << ")"; QList<QUrl> urlsToDownload; QList<QUrl>::iterator it = srcUrls.begin(); @@ -288,6 +289,7 @@ const QList<TransferHandler *> KGet::addTransfer(QList<QUrl> srcUrls, QString de for(; it!=itEnd ; ++it) { +qDebug() << "calling mostLocalUrl(" << *it << ")"; *it = mostLocalUrl(*it); if ( isValidSource( *it ) ) urlsToDownload.append( *it ); @@ -329,6 +329,7 @@ const QList<TransferHandler *> KGet::addTransfer(QList<QUrl> srcUrls, QString de } } destUrl = getValidDestUrl(QUrl::fromLocalFile(destDir), *it); + qDebug() << "destUrl=" << destUrl << ", original" << QUrl(destDir); if (destUrl == QUrl()) continue; @@ -408,6 +411,7 @@ void KGet::moveTransfer(TransferHandler * transfer, const QString& groupName) QString dest = transfer->dest().toLocalFile(); QString destFile = transfer->dest().fileName(); + qDebug() << "KGet::redownloadTransfer(), group=" << group << " src" << src << " dest" << dest << " destFile" << destFile; KGet::delTransfer(transfer); KGet::addTransfer(src, dest, destFile, group, true); } @@ -971,6 +975,7 @@ QUrl KGet::urlInputDialog() QString KGet::destDirInputDialog() { + qDebug() << "destDirInputDialog(), generalDestDir()=" << generalDestDir(); QString destDir = QFileDialog::getExistingDirectory(nullptr, i18nc("@title:window", "Choose Directory"), generalDestDir(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); Settings::setLastDirectory(destDir); @@ -993,8 +998,9 @@ QUrl KGet::destFileInputDialog(QString destDir, const QString& suggestedFileName } QUrl destUrl = QFileDialog::getSaveFileUrl(m_mainWindow, i18nc("@title:window", "Save As"), startLocation, QString()); +qDebug() << "KGet::destFileInputDialog(), destDir=" << destDir << ", startLocation=" << startLocation << ", destUrl=" << destUrl; if (!destUrl.isEmpty()) { - Settings::setLastDirectory(destUrl.adjusted(QUrl::RemoveFilename).path()); + Settings::setLastDirectory(destUrl.adjusted(QUrl::RemoveFilename).path()); qDebug() << "KGet::destFileInputDialog(" << destDir << ", " << suggestedFileName << "), original" << destUrl.adjusted(QUrl::RemoveFilename).toString() << ", now" << destUrl.adjusted(QUrl::RemoveFilename).path(); } return destUrl; @@ -1051,7 +1051,7 @@ bool KGet::isValidDestDirectory(const QString & destDir) { - qCDebug(KGET_DEBUG) << destDir; + qCDebug(KGET_DEBUG) << "KGet::isValidDestDirectory(): " << destDir; if (!QFileInfo(destDir).isDir()) { if (QFileInfo(QUrl(destDir).adjusted(QUrl::RemoveFilename).toString()).isWritable()) diff --git a/core/transfer.h b/core/transfer.h index 891b9766..0809a7bf 100644 --- a/core/transfer.h +++ b/core/transfer.h @@ -18,6 +18,7 @@ #include <QPixmap> #include <QTime> #include <QUrl> +#include <QDebug> #include <KIO/Global> @@ -156,7 +156,7 @@ class KGET_EXPORT Transfer : public Job /** * @returns the directory the Transfer will be stored to */ - virtual QUrl directory() const {return KIO::upUrl(m_dest);} + virtual QUrl directory() const {QUrl dir=KIO::upUrl(m_dest); qDebug() << "Wolfi: Transfer::directory()=" << dir << "m_dest=" << m_dest; return dir;} //FIXME: Does this work? /** * Move the download to the new destination diff --git a/extensions/konqueror/kget_plug_in.cpp b/extensions/konqueror/kget_plug_in.cpp index f6cc8ead..24356162 100644 --- a/extensions/konqueror/kget_plug_in.cpp +++ b/extensions/konqueror/kget_plug_in.cpp @@ -206,7 +206,7 @@ void KGetPlugin::getLinks(bool selectedOnly) attr = QL1S("src"); else if (element.hasAttribute(QL1S("data"))) attr = QL1S("data"); - const QUrl resolvedUrl (baseUrl.resolved(element.attribute(attr))); + const QUrl resolvedUrl (baseUrl.resolved(element.attribute(attr))); qDebug() << "KGetPLugin::getLinks() resolvedUrl=" << resolvedUrl; //fixed(?): const QUrl resolvedUrl (baseUrl.resolved(QUrl::fromUserInput(element.attribute(attr)))); // Only select valid and non-local links for download... if (resolvedUrl.isValid() && !resolvedUrl.isLocalFile() && !resolvedUrl.host().isEmpty()) { if (element.hasAttribute(QL1S("type"))) diff --git a/core/transfer.cpp b/core/transfer.cpp index c4dccaf8..e23010a3 100644 --- a/core/transfer.cpp +++ b/core/transfer.cpp @@ -51,6 +51,7 @@ Transfer::Transfer(TransferGroup * parent, TransferFactory * factory, m_capabilities(0), m_visibleUploadLimit(0), m_visibleDownloadLimit(0), m_ratio(0), m_handler(nullptr), m_factory(factory) { + qDebug() << "Transfer::Transfer(), dest=" << dest; Q_UNUSED(e) } diff --git a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp index 949cca52..747e5965 100644 --- a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp +++ b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp @@ -42,10 +42,12 @@ TransferMultiSegKio::TransferMultiSegKio(TransferGroup *parent, TransferFactory m_dataSourceFactory(nullptr), m_fileModel(nullptr) { + qDebug() << "TransferMultiSegKio::TransferMultiSegKio() called, dest=" << dest; } void TransferMultiSegKio::init() { + qDebug() << "TransferMultiSegKio::init() called"; Transfer::init(); if (!m_dataSourceFactory) { @@ -64,6 +65,7 @@ void TransferMultiSegKio::init() void TransferMultiSegKio::deinit(Transfer::DeleteOptions options) { + qDebug() << "TransferMultiSegKio::deinit(" << options << ")"; if (options & Transfer::DeleteFiles)//if the transfer is not finished, we delete the *.part-file { m_dataSourceFactory->deinit(); @@ -96,7 +98,7 @@ void TransferMultiSegKio::start() void TransferMultiSegKio::stop() { - qCDebug(KGET_DEBUG); + qCDebug(KGET_DEBUG) << "TransferMultiSegKio::stop()"; if ((status() == Stopped) || (status() == Finished)) { return; @@ -110,6 +112,7 @@ void TransferMultiSegKio::stop() bool TransferMultiSegKio::repair(const QUrl &file) { + qDebug() << "TransferMultiSegKio::repair(" << file << ")"; if (!file.isValid() || (m_dest == file)) { if (m_dataSourceFactory && (m_dataSourceFactory->verifier()->status() == Verifier::NotVerified)) @@ -124,7 +124,9 @@ bool TransferMultiSegKio::repair(const QUrl &file) bool TransferMultiSegKio::setDirectory(const QUrl& newDirectory) { QUrl newDest = newDirectory; + qDebug() << "Wolfi: TransferMultiSegKio::setDirectory(), setting path to" << newDest.toString() + "/" + m_dest.fileName(); newDest.setPath(newDest.path() + "/" + m_dest.fileName()); + qDebug() << "newDest is now" << newDest << ", toString()=" << newDest.toString(); return setNewDestination(newDest); } @@ -155,7 +158,7 @@ bool TransferMultiSegKio::setNewDestination(const QUrl &newDestination) void TransferMultiSegKio::load(const QDomElement *element) { - qCDebug(KGET_DEBUG); + qCDebug(KGET_DEBUG) << "TransferMultiSegKio::load()"; Transfer::load(element); m_dataSourceFactory->load(element); @@ -163,13 +166,14 @@ void TransferMultiSegKio::load(const QDomElement *element) void TransferMultiSegKio::save(const QDomElement &element) { - qCDebug(KGET_DEBUG); + qCDebug(KGET_DEBUG) << "TransferMultiSegKio::save()"; Transfer::save(element); m_dataSourceFactory->save(element); } void TransferMultiSegKio::slotDataSourceFactoryChange(Transfer::ChangesFlags change) { + qDebug() << "TransferMultiSegKio::slotDataSourceFactoryChange(" << change << ")"; if (change & Tc_FileName) { QList<QUrl> urls = m_dataSourceFactory->mirrors().keys(); QString filename = urls.first().fileName(); @@ -247,6 +251,7 @@ void TransferMultiSegKio::slotDataSourceFactoryChange(Transfer::ChangesFlags cha void TransferMultiSegKio::slotVerified(bool isVerified) { + qDebug() << "TransferMultiSegKio::slotVerified(" << isVerified << ")"; if (m_fileModel) { QModelIndex checksumVerified = m_fileModel->index(m_dest, FileItem::ChecksumVerified); m_fileModel->setData(checksumVerified, verifier()->status()); @@ -268,6 +273,7 @@ void TransferMultiSegKio::slotVerified(bool isVerified) void TransferMultiSegKio::slotStatResult(KJob* kioJob) { + qDebug() << "TransferMultiSegKio::slotStatResult()"; KIO::StatJob * statJob = qobject_cast<KIO::StatJob *>(kioJob); if (!statJob->error()) { @@ -295,12 +301,14 @@ void TransferMultiSegKio::slotSearchUrls(const QList<QUrl> &urls) void TransferMultiSegKio::slotChecksumFound(QString type, QString checksum) { + qDebug() << "TransferMultiSegKio::slotChecksumFound(" << type << "," << checksum << ")"; m_dataSourceFactory->verifier()->addChecksum(type, checksum); } QHash<QUrl, QPair<bool, int> > TransferMultiSegKio::availableMirrors(const QUrl &file) const { Q_UNUSED(file) + qDebug() << "TransferMultiSegKio::availableMirrors(" << file << ")"; return m_dataSourceFactory->mirrors(); } @@ -309,6 +317,7 @@ QHash<QUrl, QPair<bool, int> > TransferMultiSegKio::availableMirrors(const QUrl void TransferMultiSegKio::setAvailableMirrors(const QUrl &file, const QHash<QUrl, QPair<bool, int> > &mirrors) { Q_UNUSED(file) + qDebug() << "TransferMultiSegKio::setAvailableMirrors(" << file << "," << mirrors << ")"; m_dataSourceFactory->setMirrors(mirrors); @@ -327,6 +336,7 @@ void TransferMultiSegKio::setAvailableMirrors(const QUrl &file, const QHash<QUrl Verifier *TransferMultiSegKio::verifier(const QUrl &file) { Q_UNUSED(file) + qDebug() << "TransferMultiSegKio::verifier(" << file << " )"; return m_dataSourceFactory->verifier(); } @@ -340,6 +350,7 @@ Signature *TransferMultiSegKio::signature(const QUrl &file) FileModel *TransferMultiSegKio::fileModel() { + qDebug() << "TransferMultiSegKio::fileModel(), m_dest=" << m_dest << "m_dest.upUrl()=" << m_dest.adjusted(QUrl::RemoveFilename); if (!m_fileModel) { m_fileModel = new FileModel(QList<QUrl>() << m_dest, m_dest.adjusted(QUrl::RemoveFilename), this); @@ -361,6 +372,7 @@ FileModel *TransferMultiSegKio::fileModel() void TransferMultiSegKio::slotRename(const QUrl &oldUrl, const QUrl &newUrl) { Q_UNUSED(oldUrl) + qDebug() << "TransferMultiSegKio::slotRename(" << oldUrl << "," << newUrl << " )"; if (newUrl.isValid() && (newUrl != dest()) && m_dataSourceFactory) { @@ -376,6 +388,7 @@ void TransferMultiSegKio::slotRename(const QUrl &oldUrl, const QUrl &newUrl) void TransferMultiSegKio::slotUpdateCapabilities() { + qDebug() << "TransferMultiSegKio::slotUpdateCapabilities()"; setCapabilities(m_dataSourceFactory->capabilities()); } diff --git a/transfer-plugins/bittorrent/bttransfer.cpp b/transfer-plugins/bittorrent/bttransfer.cpp index b5f804bd..98aa071c 100644 --- a/transfer-plugins/bittorrent/bttransfer.cpp +++ b/transfer-plugins/bittorrent/bttransfer.cpp @@ -136,6 +136,7 @@ void BTTransfer::start() QString tmpDirName = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QStringLiteral("/tmp/"); m_tmpTorrentFile = tmpDirName + m_dest.fileName(); Download *download = new Download(m_source, QUrl::fromLocalFile(m_tmpTorrentFile)); + qDebug() << "BTTransfer::start(), url=" << QUrl::fromLocalFile(m_tmpTorrentFile) << ", was" << QUrl(m_tmpTorrentFile); setStatus(Job::Stopped, i18n("Downloading Torrent File...."), SmallIcon("document-save")); setTransferChange(Tc_Status, true); @@ -459,6 +459,7 @@ void BTTransfer::btTransferInit(const QUrl &src, const QByteArray &data) torrent->init(nullptr, file.readAll(), m_tmp + m_source.fileName().remove(".torrent"), QUrl::fromLocalFile(m_dest.adjusted(QUrl::RemoveFilename).path()).toLocalFile()); m_dest = QUrl::fromLocalFile(torrent->getStats().output_path); + qDebug() << "BTTransfer::btTransferInit(), output_path=" << QUrl::fromLocalFile(torrent->getStats().output_path) << ", was" << QUrl(torrent->getStats().output_path); if (!torrent->getStats().multi_file_torrent && (m_dest.fileName() != torrent->getStats().torrent_name))//TODO check if this is needed, so if that case is true at some point { m_dest = m_dest.adjusted(QUrl::StripTrailingSlash); diff --git a/transfer-plugins/checksumsearch/checksumsearch.cpp b/transfer-plugins/checksumsearch/checksumsearch.cpp index 8ebd04da..2d678adf 100644 --- a/transfer-plugins/checksumsearch/checksumsearch.cpp +++ b/transfer-plugins/checksumsearch/checksumsearch.cpp @@ -179,7 +179,7 @@ else if (mode == kg_ReplaceFile) { QUrl temp = src.adjusted(QUrl::RemoveFilename); - temp.setPath(temp.path() + change); + qDebug() << "src=" << src << ", temp=" << temp; QUrl temp2=temp; temp.setPath(temp.path() + change); temp2.setPath(temp.toString() + "/" + change);qDebug() << "ChecksumSearch::createUrl(mode == kg_ReplaceFile), new temp=" << temp << ", was" << temp2; url = temp; } else if (mode == kg_ReplaceEnding) @@ -190,7 +190,7 @@ { fileName = fileName.left(index) + change; QUrl temp = src.adjusted(QUrl::RemoveFilename); - temp.setPath(temp.path() + fileName); + qDebug() << "src=" << src << ", temp=" << temp; QUrl temp2=temp; temp.setPath(temp.path() + fileName); temp2.setPath(temp.toString() + "/" + change);qDebug() << "ChecksumSearch::createUrl(mode == kg_ReplaceEnding), new temp=" << temp << ", was" << temp2; url = temp; } } diff --git a/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp b/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp index 8ebd04da..2d678adf 100644 --- a/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp +++ b/transfer-plugins/checksumsearch/checksumsearchtransferdatasource.cpp @@ -60,7 +60,7 @@ qCDebug(KGET_DEBUG) << "Creating download for" << baseUrl; static int files = 0; - const QUrl dest = QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QStringLiteral("/checksumsearch/") + QString::number(files++)); + const QUrl dest = QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QStringLiteral("/checksumsearch/") + QString::number(files++)); if (QFile::exists(dest.toLocalFile())) { KIO::Job *del = KIO::del(dest, KIO::HideProgressInfo); if (!del->exec()) {
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