Differential D6781 Diff 17048 webenginepart/src/webenginepartdownloadmanager.cpp

Changeset View

Standalone View

View Options

webenginepart/src/webenginepartdownloadmanager.cpp

  • This file was added.
1​/*
2​ * This file is part of the KDE project.
3​ *
4​ * Copyright (C) 2017 Stefano Crocco <posta@stefanocrocco.it>
5​ *
6​ * This library is free software; you can redistribute it and/or modify it
7​ * under the terms of the GNU Lesser General Public License as published by the
8​ * Free Software Foundation; either version 2.1 of the License, or (at your
9​ * option) any later version.
10​ *
11​ * This library is distributed in the hope that it will be useful, but WITHOUT
12​ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13​ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
14​ * details.
15​ *
16​ * You should have received a copy of the GNU Lesser General Public
17​ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
18​ *
19​ */
20​
21​#include "webenginepartdownloadmanager.h"
22​
23​#include "webenginepage.h"
24​
25​#include <QWebEngineDownloadItem>
26​#include <QWebEngineView>
27​#include <QWebEngineProfile>
28​#include <QDebug>
29​
30​WebEnginePartDownloadManager::WebEnginePartDownloadManager(): QObject()
31​{
32​ connect(QWebEngineProfile::defaultProfile(), &QWebEngineProfile::downloadRequested, this, &WebEnginePartDownloadManager::performDownload);
33​}
34​
35​WebEnginePartDownloadManager::~WebEnginePartDownloadManager()
36​{
37​ m_requests.clear();
38​}
39​
40​WebEnginePartDownloadManager * WebEnginePartDownloadManager::instance()
41​{
42​ static WebEnginePartDownloadManager inst;
43​ return &inst;
dfaureUnsubmitted
Not Done

Leaked. Create it without new, i.e.

static WebEnginePartDownloadManager inst;
dfaure: Leaked. Create it without new, i.e. static WebEnginePartDownloadManager inst;
44​}
45​
46​void WebEnginePartDownloadManager::addPage(WebEnginePage* page)
47​{
48​ if (!m_pages.contains(page)) m_pages.append(page);
49​ connect(page, &WebEnginePage::navigationRequested, this, &WebEnginePartDownloadManager::recordNavigationRequest);
dfaureUnsubmitted
Not Done

(QT/KF5) coding style: add a space after if, for, etc.

dfaure: (QT/KF5) coding style: add a space after if, for, etc.
50​ connect(page, &QObject::destroyed, this, &WebEnginePartDownloadManager::removePage);
51​}
52​
53​void WebEnginePartDownloadManager::removePage(QObject* page)
54​{
55​ const QUrl url = m_requests.key(static_cast<WebEnginePage *>(page));
56​ m_requests.remove(url);
57​ m_pages.removeOne(static_cast<WebEnginePage*>(page));
dfaureUnsubmitted
Not Done

This whole loop could be simplified to

const QUrl url = m_requests.key(static_cast<WebEnginePage *>(page));
dfaure: This whole loop could be simplified to const QUrl url = m_requests.key…
58​}
59​
60​void WebEnginePartDownloadManager::performDownload(QWebEngineDownloadItem* it)
61​{
62​ WebEnginePage *page = m_requests.take(it->url());
63​ bool forceNew = false;
64​ if (!page && !m_pages.isEmpty()) {
dfaureUnsubmitted
Not Done

dynamic_cast sounds wrong given that the page is already partially destroyed down to the QObject level. But a static_cast should be fine.

dfaure: dynamic_cast sounds wrong given that the page is already partially destroyed down to the…
65​ qDebug() << "downloading" << it->url() << "in new window or tab";
66​ page = m_pages.first();
67​ forceNew = true;
68​ }
69​ else if (!page){
70​ qDebug() << "Couldn't find a part wanting to download" << it->url();
71​ return;
dfaureUnsubmitted
Not Done

using take() 2 lines above instead of value() would remove the need for this remove(), no?

dfaure: using take() 2 lines above instead of value() would remove the need for this remove(), no?
72​ }
73​ page->download(it->url(), forceNew);
74​}
75​
76​void WebEnginePartDownloadManager::recordNavigationRequest(WebEnginePage *page, const QUrl& url)
77​{
78​ qDebug() << "recordNavigatioRequest for" << url;
79​ m_requests.insert(url, page);
80​}
81​
82​
83​WebEnginePage* WebEnginePartDownloadManager::pageForDownload(QWebEngineDownloadItem* it)
84​{
85​ WebEnginePage *page = m_requests.value(it->url());
86​ if(!page && !m_pages.isEmpty()) page = m_pages.first();
87​ return page;
88​}