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
kget.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File kget.patch of Package kget5
diff --git a/core/datasourcefactory.cpp b/core/datasourcefactory.cpp index 07e0faaa..6baa3f8e 100644 --- a/core/datasourcefactory.cpp +++ b/core/datasourcefactory.cpp @@ -217,8 +217,11 @@ void DataSourceFactory::start() //create all dirs needed QDir dir; + qDebug() << "m_dest=" << m_dest << "; Original: QDir::mkpath(" << m_dest.adjusted(QUrl::RemoveFilename).toString() << "), my fix:" << m_dest.adjusted(QUrl::RemoveFilename).toLocalFile(); + qDebug() << "other option: QDir::mkpath(" << m_dest.adjusted(QUrl::RemoveFilename).toString(QUrl::PreferLocalFile) << ")"; dir.mkpath(m_dest.adjusted(QUrl::RemoveFilename).toLocalFile()); if (checkLocalFile()) { + qDebug() << "checkLocalFile() is true"; if (!m_putJob) { m_putJob = KIO::open(m_dest, QIODevice::WriteOnly | QIODevice::ReadOnly); connect(m_putJob, SIGNAL(open(KIO::Job*)), this, SLOT(slotOpen(KIO::Job*))); @@ -227,6 +230,7 @@ void DataSourceFactory::start() return; } } else { + qDebug() << "checkLocalFile() is false, abort"; //could not create file, maybe device not mounted so abort m_startTried = true; changeStatus(Job::Aborted); @@ -1134,6 +1138,7 @@ void DataSourceFactory::save(const QDomElement &element) QDomElement factory = doc.createElement("factory"); factory.setAttribute("dest", m_dest.url()); + qDebug() << "DataSourceFactory::save(), setting dest to" << m_dest.toLocalFile() << ", originally" << m_dest.url(); if (!m_finishedChunks || m_sizeFoundOnFinish) { factory.setAttribute("processedSize", m_downloadedSize); diff --git a/core/filemodel.cpp b/core/filemodel.cpp index 087a8b86..2f04a2ea 100644 --- a/core/filemodel.cpp +++ b/core/filemodel.cpp @@ -292,11 +292,12 @@ FileModel::~FileModel() void FileModel::setupModelData(const QList<QUrl> &files) { QString destDirectory = m_destDirectory.toLocalFile(); - +qDebug() << "FileModel::setupModelData(" << files << "), destDirectory=" << destDirectory << "originally" << m_destDirectory.toString(); foreach (const QUrl &file, files) { FileItem *parent = m_rootItem; QStringList directories = file.toLocalFile().remove(destDirectory).split('/', QString::SkipEmptyParts); + qDebug() << "file=" << file << ", directories=" << directories; FileItem *child = nullptr; while (directories.count()) { @@ -557,7 +558,7 @@ QUrl FileModel::getUrl(FileItem *item) const QString name = item->data(FileItem::File, Qt::DisplayRole).toString(); QUrl url = m_destDirectory; url.setPath(m_destDirectory.path() + path + name); - +qDebug() << "FileModel::getUrl(), m_destDirectory=" << m_destDirectory << ", path=" << path << ", name=" << name << ", url=" << url; return url; } @@ -569,6 +572,7 @@ QUrl FileModel::getItem(FileItem *item) while (parent && parent->parent()) { path = parent->data(FileItem::File, Qt::DisplayRole).toString() + '/' + path; + qDebug() << "FileModel::getPath(), path=" << path; parent = parent->parent(); } @@ -583,9 +587,10 @@ QUrl FileModel::getPath(FileItem *item) } QString destDirectory = m_destDirectory.toLocalFile(); - + qDebug() << "FileModel::getItem(), destDirectory=" << destDirectory << ", originally" << m_destDirectory.toString(); FileItem *item = m_rootItem; QStringList directories = file.toLocalFile().remove(destDirectory).split('/', QString::SkipEmptyParts); + qDebug() << "FileModel::getItem(), directories:" << directories; while (directories.count()) { QString part = directories.takeFirst(); @@ -667,7 +672,7 @@ void FileModel::rename(const QModelIndex &file, const QString &newName) oldUrl.setPath(m_destDirectory.path() + path + oldName); QUrl newUrl = m_destDirectory; newUrl.setPath(m_destDirectory.path() + path + newName); - +qDebug() << "FileModel::rename(), newName=" << newName << ", m_destDirectory=" << m_destDirectory << ", oldUrl=" << oldUrl << ", newUrl=" << newUrl; m_itemCache.remove(oldUrl); setData(file, newName); diff --git a/core/mostlocalurl.cpp b/core/mostlocalurl.cpp index 057d5ad4..aa56a509 100644 --- a/core/mostlocalurl.cpp +++ b/core/mostlocalurl.cpp @@ -27,7 +27,7 @@ QUrl mostLocalUrl(const QUrl &url) { - qCDebug(KGET_DEBUG); + qCDebug(KGET_DEBUG) << "mostLocalUrl(" << url << ")"; const QString protocol = url.scheme(); foreach (TransferFactory *factory, KGet::factories()) { if (factory->addsProtocols().contains(protocol)) { @@ -38,8 +38,10 @@ qCDebug(KGET_DEBUG) << "Trying to find the most local URL for:" << url; KIO::StatJob* job = KIO::mostLocalUrl(url, KIO::HideProgressInfo); if (job->exec()) { - return job->mostLocalUrl(); + QUrl new_url= job->mostLocalUrl(); qDebug() << "result:" << new_url; + return new_url; }; + qDebug() << "KIO::mostLocalUrl() failed, returning" << url; return url; } diff --git a/core/transfer.cpp b/core/transfer.cpp index acdb04af..b43d7e1a 100644 --- a/core/transfer.cpp +++ b/core/transfer.cpp @@ -218,6 +218,7 @@ void Transfer::save(const QDomElement &element) QDomElement e = element; e.setAttribute("Source", m_source.url()); e.setAttribute("Dest", m_dest.url()); + qDebug() << "Transfer::save(), setting Dest to" << m_dest.toLocalFile() << ", originally" << m_dest.url(); e.setAttribute("TotalSize", m_totalSize); e.setAttribute("DownloadedSize", m_downloadedSize); e.setAttribute("UploadedSize", m_uploadedSize); diff --git a/core/urlchecker.cpp b/core/urlchecker.cpp index a81d8fa9..637c0854 100644 --- a/core/urlchecker.cpp +++ b/core/urlchecker.cpp @@ -233,18 +233,22 @@ UrlChecker::UrlError UrlChecker::checkFolder(const QUrl &folder, bool showNotifi QUrl UrlChecker::destUrl(const QUrl &destOrFolder, const QUrl &source, const QString &fileName) { +qDebug() << "UrlChecker::destUrl(" << destOrFolder << "," << source << "," << fileName <<")"; QUrl dest = destOrFolder; if (QFileInfo(dest.toLocalFile()).isDir()) { QString usedFileName = (fileName.isEmpty() ? source.fileName() : fileName); if (usedFileName.isEmpty()) { usedFileName = QUrl::toPercentEncoding(source.toString(), "/"); } +qDebug() << "isDir(), originally dest=" << QUrl(dest.adjusted(QUrl::RemoveFilename).path() + usedFileName);; if (!dest.path().endsWith('/')) dest.setPath(dest.path() + '/'); dest.setPath(dest.adjusted(QUrl::RemoveFilename).path() + usedFileName); +qDebug() << "now dest=" << dest; } else if (!fileName.isEmpty()) { dest.setPath(dest.adjusted(QUrl::RemoveFilename).path() + fileName); +qDebug() << "!filename.isEmpty(), dest=" << dest; } - +qDebug() << "UrlChecker::destUrl()=" << dest; return dest; } @@ -278,6 +281,7 @@ TransferHandler *UrlChecker::existingSource(const QUrl &source, UrlChecker::UrlW TransferHandler *UrlChecker::existingDestination(const QUrl &url, UrlChecker::UrlWarning &warning) { + qDebug() << "UrlChecker::existingDestination(" << url << "," << warning << ")"; Transfer *transfer = KGet::m_transferTreeModel->findTransferByDestination(url); if (transfer) { if (transfer->status() == Job::Finished) { @@ -288,8 +290,10 @@ TransferHandler *UrlChecker::existingDestination(const QUrl &url, UrlChecker::Ur warning = ExistingTransfer; } } else if (QFile::exists(url.toString())) { + qDebug() << "FIXME!? QFile::exists(" << url.toString() << ")"; warning = ExistingFile; } + qDebug() << "warning:" << warning; return (transfer ? transfer->handler() : nullptr); } @@ -595,6 +590,7 @@ QList<QUrl> UrlChecker::hasExistingTransferMessages(const QList<QUrl> &urls, con } else { result = hasExistingDialog(it->first, type, warning); } + qDebug() << "UrlChecker::hasExistingDialog(), result=" << result; switch (result) { case ExistingTransferDialog::ExistingDialogReturn::YesAll: isYesAll = true; diff --git a/transfer-plugins/bittorrent/bttransfer.cpp b/transfer-plugins/bittorrent/bttransfer.cpp index 38409796..00bbfacb 100644 --- a/transfer-plugins/bittorrent/bttransfer.cpp +++ b/transfer-plugins/bittorrent/bttransfer.cpp @@ -149,6 +149,7 @@ bool BTTransfer::setDirectory(const QUrl &newDirectory) QUrl temp = newDirectory; temp = temp.adjusted(QUrl::StripTrailingSlash); temp.setPath(temp.path() + '/' + (torrent->getStats().torrent_name)); + qDebug() << "BTTransfer::setDirectory(" << newDirectory << ")"; if (newDirectory.isValid() && (newDirectory != dest()) && (temp != dest())) { if (torrent->changeOutputDir(newDirectory.url(QUrl::PreferLocalFile), bt::TorrentInterface::MOVE_FILES)) @@ -159,7 +160,7 @@ bool BTTransfer::setDirectory(const QUrl &newDirectory) m_dest = m_directory; m_dest = m_dest.adjusted(QUrl::StripTrailingSlash); m_dest.setPath(m_dest.path() + '/' + (torrent->getStats().torrent_name)); - +qDebug() << "set m_dest to " << m_dest; setStatus(Job::Stopped, i18nc("changing the destination of the file", "Changing destination"), SmallIcon("media-playback-pause")); setTransferChange(Tc_Status, true); return true; diff --git a/transfer-plugins/kio/transferKio.cpp b/transfer-plugins/kio/transferKio.cpp index b1455ad7..da934797 100644 --- a/transfer-plugins/kio/transferKio.cpp +++ b/transfer-plugins/kio/transferKio.cpp @@ -46,14 +46,17 @@ bool TransferKio::setDirectory(const QUrl& newDirectory) { QUrl newDest = newDirectory; newDest.setPath(newDest.adjusted(QUrl::RemoveFilename).toString() + m_dest.fileName()); + qDebug() << "TransferKio::setDirectory(" << newDirectory << "), newDest=" << newDest; return setNewDestination(newDest); } bool TransferKio::setNewDestination(const QUrl &newDestination) { + qDebug() << "TransferKio::setNewDestination(" << newDestination << ")"; if (newDestination.isValid() && (newDestination != dest())) { QUrl oldPath = QUrl(m_dest.path() + ".part"); - if (oldPath.isValid() && QFile::exists(oldPath.toString())) { +qDebug() << "FIXME!?! oldPath=" << oldPath << ", valid:" << oldPath.isValid() << ", oldPath.toString()=" << oldPath.toString(); + if (oldPath.isValid() && QFile::exists(oldPath.toLocalFile())) { m_movingFile = true; stop(); setStatus(Job::Moving); @@ -67,7 +70,7 @@ bool TransferKio::setNewDestination(const QUrl &newDestination) if (m_signature) { m_signature->setDestination(newDestination); } - +qDebug() << "moving from" << oldPath << " to " << QUrl(newDestination.path() + ".part"); KIO::Job *move = KIO::file_move(oldPath, QUrl(newDestination.path() + ".part"), -1, KIO::HideProgressInfo); connect(move, SIGNAL(result(KJob*)), this, SLOT(newDestResult(KJob*))); connect(move, SIGNAL(infoMessage(KJob*,QString)), this, SLOT(slotInfoMessage(KJob*,QString))); @@ -124,6 +127,7 @@ void TransferKio::deinit(Transfer::DeleteOptions options) { if (options & DeleteFiles)//if the transfer is not finished, we delete the *.part-file { + qDebug() << "TransferKio::deinit(), deleting " << QUrl::fromLocalFile(m_dest.path() + ".part") << ", multiseg.patch:" << QUrl::fromLocalFile(m_dest.path() + ".part"); KIO::Job *del = KIO::del(QString(m_dest.path() + ".part"), KIO::HideProgressInfo); if (!del->exec()) { qCDebug(KGET_DEBUG) << "Could not delete part " << QString(m_dest.path() + ".part"); diff --git a/transfer-plugins/metalink/abstractmetalink.cpp b/transfer-plugins/metalink/abstractmetalink.cpp index f27a28b8..9a5861f7 100644 --- a/transfer-plugins/metalink/abstractmetalink.cpp +++ b/transfer-plugins/metalink/abstractmetalink.cpp @@ -368,6 +368,7 @@ bool AbstractMetalink::setDirectory(const QUrl &new_directory) const QString fileName = m_dest.fileName(); m_dest = new_directory; m_dest.setPath(m_dest.adjusted(QUrl::RemoveFilename).toString() + fileName); + qDebug() << "AbstractMetalink::setDirectory(" << new_directory << "), oldDirectory=" << oldDirectory << ", newDirectory=" << newDirectory << ", fileName=" << fileName << ", m_dest is now " << m_dest; QHash<QUrl, DataSourceFactory*> newStorage; foreach (DataSourceFactory *factory, m_dataSourceFactory) { diff --git a/transfer-plugins/metalink/metalinkxml.cpp b/transfer-plugins/metalink/metalinkxml.cpp index dc4fcece..838d4311 100644 --- a/transfer-plugins/metalink/metalinkxml.cpp +++ b/transfer-plugins/metalink/metalinkxml.cpp @@ -132,7 +132,7 @@ bool MetalinkXml::metalinkInit(const QUrl &src, const QByteArray &data) { dest = tempDest; dest.setPath(tempDest.path() + (*it).name); - +qDebug() << "MetalinkXml::metalinkInit(), tempDest" << tempDest << ", dest=" << dest << ", original path:" << tempDest.path() + "/" + (*it).name; QList<KGetMetalink::Url> urlList = (*it).resources.urls; //sort the urls according to their priority (highest first) std::sort(urlList.begin(), urlList.end(), [](const KGetMetalink::Url &a, const KGetMetalink::Url &b) { return b < a; }); @@ -185,6 +185,7 @@ bool MetalinkXml::metalinkInit(const QUrl &src, const QByteArray &data) if ((m_metalink.files.files.size() == 1) && m_dataSourceFactory.size()) { m_dest = dest; + qDebug() << "setting m_dest to " << m_dest; } if (!m_dataSourceFactory.size()) { diff --git a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp index 3c3d6175..7e38e66a 100644 --- a/transfer-plugins/multisegmentkio/transfermultisegkio.cpp +++ b/transfer-plugins/multisegmentkio/transfermultisegkio.cpp @@ -184,6 +184,10 @@ void TransferMultiSegKio::slotDataSourceFactoryChange(Transfer::ChangesFlags cha } QUrl path = m_dest.adjusted(QUrl::RemoveFilename); path.setPath(path.path() + filename); + qDebug() << "path=" << path; + QUrl path2 = m_dest.adjusted(QUrl::RemoveFilename); + path2.setPath(path.toString() + "/" + filename); + qDebug() << "Original: path=" << path2; setNewDestination(path); } if (change & Tc_Source) { diff --git a/ui/groupsettingsdialog.cpp b/ui/groupsettingsdialog.cpp index 424d6366..50ecfe2f 100644 --- a/ui/groupsettingsdialog.cpp +++ b/ui/groupsettingsdialog.cpp @@ -28,6 +28,7 @@ GroupSettingsDialog::GroupSettingsDialog(QWidget *parent, TransferGroupHandler * QString path = group->defaultFolder(); ui.defaultFolderRequester->setUrl(path); ui.defaultFolderRequester->setStartDir(QUrl(KGet::generalDestDir(true))); +qDebug() << "generalDestDir=" << KGet::generalDestDir(true); ui.regExpEdit->setText(group->regExp().pattern()); @@ -56,6 +57,7 @@ void GroupSettingsDialog::save() m_group->setDefaultFolder(QString()); } else { m_group->setDefaultFolder(ui.defaultFolderRequester->url().toLocalFile()); +qDebug() << "setting default group folder to" << ui.defaultFolderRequester->url().toString(QUrl::PreferLocalFile); } m_group->setDownloadLimit(ui.downloadBox->value(), Transfer::VisibleSpeedLimit); diff --git a/ui/newtransferdialog.cpp b/ui/newtransferdialog.cpp index 31b8b3a4..5f1e46b5 100644 --- a/ui/newtransferdialog.cpp +++ b/ui/newtransferdialog.cpp @@ -184,7 +184,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; + qDebug() << "NewTransferDialog::setDestinationFileName(), result=" << QString(ui.destRequester->url().adjusted(QUrl::RemoveFilename).toString() + filename); ui.destRequester->setUrl(QString(ui.destRequester->url().adjusted(QUrl::RemoveFilename).toString() + filename)); } @@ -246,6 +246,7 @@ void NewTransferDialog::setDefaultDestination() //set a file name if (!m_multiple) { const QUrl url(ui.urlRequester->text().trimmed()); + qDebug() << "NewTransferDialog::setDefaultDestination(), url=" << url << "url.fileName=" << url.fileName(); if ((UrlChecker::checkSource(url) == UrlChecker::NoError) && QFileInfo(ui.destRequester->url().toLocalFile()).isDir()) { setDestinationFileName(url.fileName()); @@ -282,10 +282,11 @@ void NewTransferDialog::checkInput() qDebug() << "Check input"; QUrl source = QUrl(ui.urlRequester->text().trimmed()); const QUrl dest = ui.destRequester->url(); - +qDebug() << "source=" << source << ", dest=" << dest; //check the destination folder UrlChecker::UrlError error = UrlChecker::checkFolder(dest); const bool folderValid = (error == UrlChecker::NoError); +qDebug() << "folderValid=" << folderValid; bool destinationValid = false; QString infoText; QString warningText; @@ -303,6 +303,7 @@ void NewTransferDialog::checkInput() //check the source if (!m_multiple) { + qDebug() << "calling mostLocalUrl(" << source << ")"; source = mostLocalUrl(source); } error = UrlChecker::checkSource(source); diff --git a/ui/renamefile.cpp b/ui/renamefile.cpp index 3dc749cf..1f136bef 100644 --- a/ui/renamefile.cpp +++ b/ui/renamefile.cpp @@ -36,6 +36,7 @@ RenameFile::RenameFile(FileModel *model, const QModelIndex &index, QWidget *pare const QString originalName = m_model->data(m_index, Qt::DisplayRole).toString(); m_dest = m_model->getUrl(m_index).adjusted(QUrl::RemoveFilename); + qDebug() << "RenameFile(), originalName=" << originalName << ", m_dest=" << m_dest << m_model->getUrl(m_index); ui.label->setText(i18n("Rename %1 to:", originalName)); ui.name->setText(originalName); @@ -55,6 +56,7 @@ void RenameFile::updateButton() const QString newName = ui.name->text(); QUrl dest = m_dest; dest.setPath(m_dest.path() + newName); + qDebug() << "RenameFile::updateButton(), newName=" << newName << ", dest=" << dest << ", m_dest=" << m_dest; //Wolfi: QFile::exists() in der nächsten Zeile ist falsch!!! const bool enabled = !newName.isEmpty() && !QFile::exists(dest.toString()); ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enabled); @@ -63,6 +65,7 @@ void RenameFile::updateButton() void RenameFile::rename() { const QString newName = ui.name->text(); + qDebug() << "RenameFile::rename(), newName=" << newName; m_model->rename(m_index, newName); } diff --git a/ui/transferdetails.cpp b/ui/transferdetails.cpp index 9063ce70..e15d6477 100644 --- a/ui/transferdetails.cpp +++ b/ui/transferdetails.cpp @@ -33,7 +33,7 @@ TransferDetails::TransferDetails(TransferHandler * transfer) setLayout(m_layout); frm.sourceContentEdit->setText(m_transfer->source().toString()); - frm.destContentEdit->setText(m_transfer->dest().toLocalFile()); + frm.destContentEdit->setText(m_transfer->dest().toLocalFile()); //This updates the widget with the right values slotTransferChanged(transfer, 0xFFFFFFFF); @@ -94,11 +94,11 @@ void TransferDetails::slotTransferChanged(TransferHandler * transfer, TransferHa } if(flags & Transfer::Tc_FileName) { - frm.destContentEdit->setText(m_transfer->dest().toLocalFile()); + frm.destContentEdit->setText(m_transfer->dest().toLocalFile()); } if (flags & Transfer::Tc_Source) { - frm.sourceContentEdit->setText(m_transfer->source().toString()); + frm.sourceContentEdit->setText(m_transfer->source().toString()); } frm.remainingTimeLabel->setText(KIO::convertSeconds(m_transfer->remainingTime())); diff --git a/ui/transfersettingsdialog.cpp b/ui/transfersettingsdialog.cpp index b20456ec..40c2d7f2 100644 --- a/ui/transfersettingsdialog.cpp +++ b/ui/transfersettingsdialog.cpp @@ -120,6 +120,7 @@ void TransferSettingsDialog::slotMirrors() void TransferSettingsDialog::slotRename() { const QModelIndex index = m_proxy->mapToSource(ui.treeView->selectionModel()->selectedIndexes().first()); + qDebug() << "TransferSettingsDialog::slotRename()"; RenameFile *renameDlg = new RenameFile(m_model, index, this); renameDlg->setAttribute(Qt::WA_DeleteOnClose); renameDlg->show();
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