mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-22 02:02:10 +02:00
Add preparations for handling Private mode setting
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
This commit is contained in:
parent
653e7aa429
commit
5e0a779d53
|
@ -342,7 +342,7 @@ SiteInfoPermissionItem* SiteInfo::addPermissionOption(SiteSettingsManager::Permi
|
||||||
|
|
||||||
void SiteInfo::addSiteSettings()
|
void SiteInfo::addSiteSettings()
|
||||||
{
|
{
|
||||||
auto siteSettings = mApp->siteSettingsManager()->getSiteSettings(m_baseUrl);
|
auto siteSettings = mApp->siteSettingsManager()->getSiteSettings(m_baseUrl, mApp->isPrivate());
|
||||||
// Attributes
|
// Attributes
|
||||||
for (const auto &attribute : mApp->siteSettingsManager()->getSupportedAttribute()) {
|
for (const auto &attribute : mApp->siteSettingsManager()->getSupportedAttribute()) {
|
||||||
SiteInfoPermissionItem *item = addPermissionOption(siteSettings.attributes[attribute]);
|
SiteInfoPermissionItem *item = addPermissionOption(siteSettings.attributes[attribute]);
|
||||||
|
|
|
@ -51,7 +51,7 @@ SiteSettingsManager::SiteSettingsManager ( QObject* parent )
|
||||||
attributesSql.append(webAttributeToSqlColumn(supportedAttribute[i]));
|
attributesSql.append(webAttributeToSqlColumn(supportedAttribute[i]));
|
||||||
}
|
}
|
||||||
|
|
||||||
attributesSql.append(QSL(" FROM site_settings WHERE server=?"));
|
attributesSql.append(QSL(" FROM %1 WHERE server=?").arg(sqlTable()));
|
||||||
|
|
||||||
|
|
||||||
supportedFeatures.append(QWebEnginePage::Notifications);
|
supportedFeatures.append(QWebEnginePage::Notifications);
|
||||||
|
@ -84,7 +84,7 @@ SiteSettingsManager::SiteSettingsManager ( QObject* parent )
|
||||||
everythingSql.append(QSL(", "));
|
everythingSql.append(QSL(", "));
|
||||||
everythingSql.append(optionToSqlColumn(poZoomLevel));
|
everythingSql.append(optionToSqlColumn(poZoomLevel));
|
||||||
|
|
||||||
everythingSql.append(QSL(" FROM site_settings WHERE server=?"));
|
everythingSql.append(QSL(" FROM %1 WHERE server=?"));
|
||||||
}
|
}
|
||||||
|
|
||||||
SiteSettingsManager::~SiteSettingsManager() noexcept
|
SiteSettingsManager::~SiteSettingsManager() noexcept
|
||||||
|
@ -192,12 +192,12 @@ void SiteSettingsManager::setOption(const QString& column, const QUrl& url, cons
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto job = new SqlQueryJob(QSL("UPDATE site_settings SET %1=? WHERE server=?").arg(column), this);
|
auto job = new SqlQueryJob(QSL("UPDATE %2 SET %1=? WHERE server=?").arg(column, sqlTable()), this);
|
||||||
job->addBindValue(value);
|
job->addBindValue(value);
|
||||||
job->addBindValue(url.host());
|
job->addBindValue(url.host());
|
||||||
connect(job, &SqlQueryJob::finished, this, [=]() {
|
connect(job, &SqlQueryJob::finished, this, [=]() {
|
||||||
if (job->numRowsAffected() == 0) {
|
if (job->numRowsAffected() == 0) {
|
||||||
auto job = new SqlQueryJob(QSL("INSERT INTO site_settings (server, %1) VALUES (?,?)").arg(column), this);
|
auto job = new SqlQueryJob(QSL("INSERT INTO %2 (server, %1) VALUES (?,?)").arg(column, sqlTable()), this);
|
||||||
job->addBindValue(url.host());
|
job->addBindValue(url.host());
|
||||||
job->addBindValue(value);
|
job->addBindValue(value);
|
||||||
job->start();
|
job->start();
|
||||||
|
@ -228,7 +228,7 @@ SiteSettingsManager::Permission SiteSettingsManager::getPermission(const QString
|
||||||
}
|
}
|
||||||
|
|
||||||
QSqlQuery query(SqlDatabase::instance()->database());
|
QSqlQuery query(SqlDatabase::instance()->database());
|
||||||
query.prepare(QSL("SELECT %1 FROM site_settings WHERE server=?").arg(column));
|
query.prepare(QSL("SELECT %1 FROM %2 WHERE server=?").arg(column, sqlTable()));
|
||||||
query.addBindValue(url.host());
|
query.addBindValue(url.host());
|
||||||
query.exec();
|
query.exec();
|
||||||
|
|
||||||
|
@ -526,13 +526,13 @@ QList<QWebEnginePage::Feature> SiteSettingsManager::getSupportedFeatures() const
|
||||||
return supportedFeatures;
|
return supportedFeatures;
|
||||||
}
|
}
|
||||||
|
|
||||||
SiteSettingsManager::SiteSettings SiteSettingsManager::getSiteSettings(QUrl& url)
|
SiteSettingsManager::SiteSettings SiteSettingsManager::getSiteSettings(QUrl& url, bool privateMode)
|
||||||
{
|
{
|
||||||
SiteSettings siteSettings;
|
SiteSettings siteSettings;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
QSqlQuery query(SqlDatabase::instance()->database());
|
QSqlQuery query(SqlDatabase::instance()->database());
|
||||||
query.prepare(everythingSql);
|
query.prepare(everythingSql.arg(sqlTable(privateMode)));
|
||||||
query.addBindValue(url.host());
|
query.addBindValue(url.host());
|
||||||
query.exec();
|
query.exec();
|
||||||
|
|
||||||
|
@ -553,3 +553,18 @@ SiteSettingsManager::SiteSettings SiteSettingsManager::getSiteSettings(QUrl& url
|
||||||
|
|
||||||
return siteSettings;
|
return siteSettings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString SiteSettingsManager::sqlTable(bool privateMode)
|
||||||
|
{
|
||||||
|
if (privateMode) {
|
||||||
|
return QSL("site_settings_private");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return QSL("site_settings");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString SiteSettingsManager::sqlTable()
|
||||||
|
{
|
||||||
|
return sqlTable(mApp->isPrivate());
|
||||||
|
}
|
||||||
|
|
|
@ -95,7 +95,9 @@ public:
|
||||||
QList<QWebEngineSettings::WebAttribute> getSupportedAttribute() const;
|
QList<QWebEngineSettings::WebAttribute> getSupportedAttribute() const;
|
||||||
QList<QWebEnginePage::Feature> getSupportedFeatures() const;
|
QList<QWebEnginePage::Feature> getSupportedFeatures() const;
|
||||||
|
|
||||||
SiteSettings getSiteSettings(QUrl &url);
|
SiteSettings getSiteSettings(QUrl &url, bool privateMode);
|
||||||
|
QString sqlTable(bool privateMode);
|
||||||
|
QString sqlTable();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user