mirror of
https://github.com/zealdocs/zeal.git
synced 2024-11-30 03:13:56 +03:00
Moved majority of settingsDialog logic into settingsDialog.cpp
This commit is contained in:
MichaelBeeu
parent
ac0c27eb0b
commit
5677545060
@ -52,7 +52,8 @@ const QString serverName = "zeal_process_running";
|
||||
MainWindow::MainWindow(QWidget *parent) :
|
||||
QMainWindow(parent),
|
||||
ui(new Ui::MainWindow),
|
||||
settings("Zeal", "Zeal")
|
||||
settings("Zeal", "Zeal"),
|
||||
settingsDialog(zealList)
|
||||
{
|
||||
trayIcon = nullptr;
|
||||
trayIconMenu = nullptr;
|
||||
@ -141,315 +142,14 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
auto settingsAction = editMenu->addAction("&Options");
|
||||
ui->menuBar->addMenu(editMenu);
|
||||
|
||||
auto progressCb = [=](quint64 recv, quint64 total) {
|
||||
if(recv > 10240) { // don't show progress for non-docset pages (like Google Drive first request)
|
||||
settingsDialog.ui->docsetsProgress->setMaximum(total);
|
||||
settingsDialog.ui->docsetsProgress->setValue(recv);
|
||||
}
|
||||
};
|
||||
connect(&naManager, &QNetworkAccessManager::finished, [=](QNetworkReply* reply) {
|
||||
++naCount;
|
||||
if(naCount <= 2) { // 1st and 2nd requests are for github and kapeli.com
|
||||
if(reply->request().url().host() == "kapeli.com") {
|
||||
QWebView view;
|
||||
view.settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
|
||||
view.setContent(reply->readAll());
|
||||
auto collection = view.page()->mainFrame()->findAllElements(".drowx");
|
||||
for(auto drowx : collection) {
|
||||
auto anchor = drowx.findFirst("a");
|
||||
auto url = anchor.attribute("href");
|
||||
auto name_list = url.split("/");
|
||||
auto name = name_list[name_list.count()-1].replace(".tgz", "");
|
||||
name = name.replace(".tar.bz2", "");
|
||||
if(name != "" && !docsets->names().contains(name)) {
|
||||
urls[name] = url;
|
||||
auto url_list = url.split("/");
|
||||
auto iconfile = url_list[url_list.count()-1].replace(".tgz", ".png");
|
||||
iconfile = iconfile.replace(".tar.bz2", ".png");
|
||||
#ifdef WIN32
|
||||
QDir icondir(QCoreApplication::applicationDirPath());
|
||||
icondir.cd("icons");
|
||||
#else
|
||||
QDir icondir("/usr/share/pixmaps/zeal");
|
||||
#endif
|
||||
auto *lwi = new QListWidgetItem(QIcon(icondir.filePath(iconfile)), name);
|
||||
settingsDialog.ui->docsetsList->addItem(lwi);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
QString list = reply->readAll();
|
||||
if(reply->error() != QNetworkReply::NoError) {
|
||||
QMessageBox::warning(&settingsDialog, "No docsets found", "Failed retrieving list of docsets: " + reply->errorString());
|
||||
settingsDialog.ui->downloadButton->show();
|
||||
} else {
|
||||
for(auto item : list.split("\n")) {
|
||||
QStringList docset = item.split(" ");
|
||||
if(docset.size() < 2) break;
|
||||
if(!docsets->names().contains(docset[0])) {
|
||||
if(!docset[1].startsWith("http")) {
|
||||
urls.clear();
|
||||
QMessageBox::warning(&settingsDialog, "No docsets found", "Failed retrieving https://raw.github.com/jkozera/zeal/master/docsets.txt: " + QString(docset[1]));
|
||||
break;
|
||||
}
|
||||
urls[docset[0]] = docset[1];
|
||||
settingsDialog.ui->docsetsList->addItem(docset[0]);
|
||||
}
|
||||
}
|
||||
if(urls.size() > 0) {
|
||||
settingsDialog.ui->downloadableGroup->show();
|
||||
} else {
|
||||
QMessageBox::warning(&settingsDialog, "No docsets found", QString("No downloadable docsets found."));
|
||||
settingsDialog.ui->downloadButton->show();
|
||||
}
|
||||
}
|
||||
}
|
||||
if(naCount == 2) {
|
||||
settingsDialog.ui->docsetsProgress->hide();
|
||||
}
|
||||
} else {
|
||||
if(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 302) {
|
||||
auto reply3 = naManager.get(QNetworkRequest(QUrl(reply->rawHeader("Location"))));
|
||||
connect(reply3, &QNetworkReply::downloadProgress, progressCb);
|
||||
} else {
|
||||
if(reply->request().url().path().endsWith("tgz") || reply->request().url().path().endsWith("tar.bz2")) {
|
||||
auto dataDir = QDir(docsets->docsetsDir());
|
||||
if(!dataDir.exists()) {
|
||||
QMessageBox::critical(&settingsDialog, "No docsets directory found",
|
||||
QString("'%s' directory not found").arg(docsets->docsetsDir()));
|
||||
} else {
|
||||
#ifdef WIN32
|
||||
QDir tardir(QCoreApplication::applicationDirPath());
|
||||
QString program = tardir.filePath("bsdtar.exe");
|
||||
#else
|
||||
QString program = "bsdtar";
|
||||
#endif
|
||||
QTemporaryFile *tmp = new QTemporaryFile;
|
||||
tmp->open();
|
||||
tmp->write(reply->readAll());
|
||||
tmp->flush();
|
||||
|
||||
QProcess *tar = new QProcess();
|
||||
tar->setWorkingDirectory(dataDir.absolutePath());
|
||||
QStringList args;
|
||||
if(reply->request().url().path().endsWith("tar.bz2")) {
|
||||
args = QStringList("-jqtf");
|
||||
} else {
|
||||
args = QStringList("-zqtf");
|
||||
}
|
||||
args.append(tmp->fileName());
|
||||
args.append("*docset");
|
||||
tar->start(program, args);
|
||||
tar->waitForFinished();
|
||||
auto line_buf = tar->readLine();
|
||||
auto outDir = QString::fromLocal8Bit(line_buf).split("/")[0];
|
||||
|
||||
if(reply->request().url().path().endsWith("tar.bz2")) {
|
||||
args = QStringList("-jxf");
|
||||
} else {
|
||||
args = QStringList("-zxf");
|
||||
}
|
||||
args.append(tmp->fileName());
|
||||
connect(tar, (void (QProcess::*)(int,QProcess::ExitStatus))&QProcess::finished, [=](int a, QProcess::ExitStatus b) {
|
||||
auto path = reply->request().url().path().split("/");
|
||||
auto fileName = path[path.count()-1];
|
||||
auto docsetName = fileName.replace(".tgz", ".docset");
|
||||
docsetName = docsetName.replace(".tar.bz2", ".docset");
|
||||
|
||||
if(outDir != docsetName) {
|
||||
QDir dataDir2(dataDir);
|
||||
dataDir2.rename(outDir, docsetName);
|
||||
}
|
||||
|
||||
// FIXME C&P (see "FIXME C&P" below)
|
||||
QMetaObject::invokeMethod(docsets, "addDocset", Qt::BlockingQueuedConnection,
|
||||
Q_ARG(QString, dataDir.absoluteFilePath(docsetName)));
|
||||
zealList.resetModulesCounts();
|
||||
ui->treeView->reset();
|
||||
settingsDialog.ui->listView->reset();
|
||||
for(int i = 0; i < settingsDialog.ui->docsetsList->count(); ++i) {
|
||||
if(settingsDialog.ui->docsetsList->item(i)->text()+".docset" == docsetName) {
|
||||
settingsDialog.ui->docsetsList->takeItem(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
settingsDialog.ui->docsetsList->setEnabled(true);
|
||||
settingsDialog.ui->downloadDocsetButton->setText("Download");
|
||||
settingsDialog.ui->docsetsProgress->hide();
|
||||
});
|
||||
settingsDialog.ui->docsetsProgress->setRange(0, 0);
|
||||
tar->start(program, args);
|
||||
}
|
||||
} else {
|
||||
QTemporaryFile *tmp = new QTemporaryFile;
|
||||
tmp->open();
|
||||
tmp->write(reply->readAll());
|
||||
tmp->seek(0);
|
||||
QuaZip zipfile(tmp);
|
||||
if(zipfile.open(QuaZip::mdUnzip)) {
|
||||
tmp->close();
|
||||
auto dataDir = QDir(docsets->docsetsDir());
|
||||
if(!dataDir.exists()) {
|
||||
QMessageBox::critical(&settingsDialog, "No docsets directory found",
|
||||
QString("'%1' directory not found").arg(docsets->docsetsDir()));
|
||||
} else {
|
||||
QStringList *files = new QStringList;
|
||||
settingsDialog.ui->docsetsProgress->setRange(0, 0);
|
||||
auto future = QtConcurrent::run([=] {
|
||||
*files = JlCompress::extractDir(tmp->fileName(), dataDir.absolutePath());
|
||||
delete tmp;
|
||||
});
|
||||
QFutureWatcher<void> *watcher = new QFutureWatcher<void>;
|
||||
watcher->setFuture(future);
|
||||
connect(watcher, &QFutureWatcher<void>::finished, [=] {
|
||||
// extract finished - add docset
|
||||
QDir next((*files)[0]), root = next;
|
||||
delete files;
|
||||
next.cdUp();
|
||||
while(next.absolutePath() != dataDir.absolutePath()) {
|
||||
root = next;
|
||||
next.cdUp();
|
||||
}
|
||||
// FIXME C&P (see "FIXME C&P" above)
|
||||
QMetaObject::invokeMethod(docsets, "addDocset", Qt::BlockingQueuedConnection,
|
||||
Q_ARG(QString, root.absolutePath()));
|
||||
zealList.resetModulesCounts();
|
||||
ui->treeView->reset();
|
||||
settingsDialog.ui->listView->reset();
|
||||
for(int i = 0; i < settingsDialog.ui->docsetsList->count(); ++i) {
|
||||
if(settingsDialog.ui->docsetsList->item(i)->text() == root.dirName() ||
|
||||
settingsDialog.ui->docsetsList->item(i)->text()+".docset" == root.dirName()) {
|
||||
settingsDialog.ui->docsetsList->takeItem(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
settingsDialog.ui->docsetsList->setEnabled(true);
|
||||
settingsDialog.ui->downloadDocsetButton->setText("Download");
|
||||
settingsDialog.ui->docsetsProgress->hide();
|
||||
|
||||
});
|
||||
}
|
||||
} else if(naCount == 3) { // 3rd request - retry once for Google Drive
|
||||
QFile file(tmp->fileName());
|
||||
file.open(QIODevice::ReadOnly);
|
||||
QWebView view;
|
||||
view.setContent(file.readAll());
|
||||
tmp->close();
|
||||
delete tmp;
|
||||
|
||||
QString href = view.page()->mainFrame()->findFirstElement("#uc-download-link").attribute("href");
|
||||
QString path = href.split("?")[0], query = href.split("?")[1];
|
||||
QUrl url = reply->url();
|
||||
url.setPath(path);
|
||||
url.setQuery(query);
|
||||
// retry with #uc-download-link - "Google Drive can't scan this file for viruses."
|
||||
auto reply2 = naManager.get(QNetworkRequest(url));
|
||||
connect(reply2, &QNetworkReply::downloadProgress, progressCb);
|
||||
} else {
|
||||
tmp->close();
|
||||
delete tmp;
|
||||
QMessageBox::warning(&settingsDialog, "Error", "Download failed: invalid ZIP file.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
void (QSpinBox:: *signal)(int) = &QSpinBox::valueChanged;
|
||||
connect(settingsDialog.ui->minFontSize, signal, [=](int val) {
|
||||
ui->webView->settings()->setFontSize(QWebSettings::MinimumFontSize, val);
|
||||
});
|
||||
settingsDialog.setListModel( &zealList );
|
||||
connect(settingsDialog.ui->listView, &QListView::clicked, [=](const QModelIndex& index) {
|
||||
settingsDialog.ui->deleteButton->setEnabled(true);
|
||||
});
|
||||
connect(settingsDialog.ui->deleteButton, &QPushButton::clicked, [=] {
|
||||
auto answer = QMessageBox::question(&settingsDialog, "Are you sure",
|
||||
QString("Are you sure you want to permanently delete the '%1' docest? "
|
||||
"Clicking 'Cancel' in this dialog box will not revert the deletion.").arg(
|
||||
settingsDialog.ui->listView->currentIndex().data().toString()));
|
||||
if(answer == QMessageBox::Yes) {
|
||||
auto dataDir = QDir(docsets->docsetsDir());
|
||||
auto docsetName = settingsDialog.ui->listView->currentIndex().data().toString();
|
||||
zealList.removeRow(settingsDialog.ui->listView->currentIndex().row());
|
||||
if(dataDir.exists()) {
|
||||
settingsDialog.ui->docsetsProgress->show();
|
||||
settingsDialog.ui->deleteButton->hide();
|
||||
settingsDialog.ui->docsetsProgress->setRange(0, 0);
|
||||
auto future = QtConcurrent::run([=] {
|
||||
QDir docsetDir(dataDir);
|
||||
if(docsetDir.cd(docsetName)) {
|
||||
docsetDir.removeRecursively();
|
||||
} else if(docsetDir.cd(docsetName + ".docset")) {
|
||||
docsetDir.removeRecursively();
|
||||
}
|
||||
});
|
||||
QFutureWatcher<void> *watcher = new QFutureWatcher<void>;
|
||||
watcher->setFuture(future);
|
||||
connect(watcher, &QFutureWatcher<void>::finished, [=]() {
|
||||
settingsDialog.ui->docsetsProgress->hide();
|
||||
settingsDialog.ui->deleteButton->show();
|
||||
watcher->deleteLater();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
connect(settingsDialog.ui->downloadButton, &QPushButton::clicked, [=] {
|
||||
naCount = 0;
|
||||
settingsDialog.ui->downloadButton->hide();
|
||||
settingsDialog.ui->docsetsProgress->show();
|
||||
QNetworkRequest listRequest(QUrl("https://raw.github.com/jkozera/zeal/master/docsets.txt"));
|
||||
QNetworkRequest listRequest2(QUrl("http://kapeli.com/docset_links"));
|
||||
naManager.get(listRequest);
|
||||
naManager.get(listRequest2);
|
||||
|
||||
});
|
||||
connect(settingsDialog.ui->docsetsList, &QListWidget::clicked, [=](const QModelIndex& index) {
|
||||
settingsDialog.ui->downloadDocsetButton->setEnabled(true);
|
||||
});
|
||||
connect(settingsDialog.ui->downloadDocsetButton, &QPushButton::clicked, [=]() {
|
||||
settingsDialog.ui->docsetsList->setEnabled(false);
|
||||
settingsDialog.ui->downloadDocsetButton->setEnabled(false);
|
||||
settingsDialog.ui->downloadDocsetButton->setText("Downloading, please wait...");
|
||||
QUrl url(urls[settingsDialog.ui->docsetsList->currentItem()->text()]);
|
||||
naCount = 2;
|
||||
auto reply = naManager.get(QNetworkRequest(url));
|
||||
if(url.path().endsWith((".tgz")) || url.path().endsWith((".tar.bz2"))) {
|
||||
// Dash's docsets don't redirect, so we can start showing progress instantly
|
||||
connect(reply, &QNetworkReply::downloadProgress, progressCb);
|
||||
}
|
||||
settingsDialog.ui->docsetsProgress->show();
|
||||
settingsDialog.ui->docsetsProgress->setRange(0, 0);
|
||||
});
|
||||
connect(settingsDialog.ui->storageButton, &QPushButton::clicked, [=]() {
|
||||
QString dir = QFileDialog::getExistingDirectory(0, "Open Directory");
|
||||
if(!dir.isEmpty()) {
|
||||
settingsDialog.ui->storageEdit->setText(dir);
|
||||
}
|
||||
});
|
||||
connect(settingsAction, &QAction::triggered, [=]() {
|
||||
settingsDialog.setHotKey(hotKey);
|
||||
settingsDialog.ui->minFontSize->setValue(settings.value("minFontSize").toInt());
|
||||
QString hiding = settings.value("hidingBehavior", "systray").toString();
|
||||
if(hiding == "systray") {
|
||||
settingsDialog.ui->radioSysTray->setChecked(true);
|
||||
} else {
|
||||
settingsDialog.ui->radioMinimize->setChecked(true);
|
||||
}
|
||||
settingsDialog.ui->storageEdit->setText(docsets->docsetsDir());
|
||||
nativeFilter.setEnabled(false);
|
||||
if(settingsDialog.exec()) {
|
||||
if(settingsDialog.ui->storageEdit->text() != docsets->docsetsDir()) {
|
||||
// set new docsets dir
|
||||
settings.setValue("docsetsDir", settingsDialog.ui->storageEdit->text());
|
||||
// reload docsets:
|
||||
docsets->initialiseDocsets();
|
||||
}
|
||||
setHotKey(settingsDialog.hotKey());
|
||||
settings.setValue("minFontSize", QVariant(ui->webView->settings()->fontSize(QWebSettings::MinimumFontSize)));
|
||||
settings.setValue("hidingBehavior",
|
||||
settingsDialog.ui->radioSysTray->isChecked() ?
|
||||
"systray" : "minimize");
|
||||
if(settings.value("hidingBehavior").toString() == "systray") {
|
||||
createTrayIcon();
|
||||
} else if(trayIcon) {
|
||||
@ -463,6 +163,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
ui->webView->settings()->setFontSize(QWebSettings::MinimumFontSize, settings.value("minFontSize").toInt());
|
||||
}
|
||||
nativeFilter.setEnabled(true);
|
||||
ui->treeView->reset();
|
||||
});
|
||||
auto helpMenu = new QMenu("&Help");
|
||||
auto aboutAction = helpMenu->addAction("&About");
|
||||
|
||||
@ -1,13 +1,254 @@
|
||||
#include "zealsettingsdialog.h"
|
||||
#include <QNetworkRequest>
|
||||
#include <QNetworkReply>
|
||||
#include <QWebView>
|
||||
#include <QWebSettings>
|
||||
#include <QWebFrame>
|
||||
#include <QWebElementCollection>
|
||||
#include <QDir>
|
||||
#include <QUrl>
|
||||
#include <QTemporaryFile>
|
||||
#include <QProcess>
|
||||
#include <QMessageBox>
|
||||
#include <QtConcurrent/QtConcurrent>
|
||||
#include <QFutureWatcher>
|
||||
#include <QFileDialog>
|
||||
#include "quazip/quazip.h"
|
||||
#include "JlCompress.h"
|
||||
|
||||
ZealSettingsDialog::ZealSettingsDialog(QWidget *parent) :
|
||||
ZealSettingsDialog::ZealSettingsDialog(ZealListModel &zList, QWidget *parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::ZealSettingsDialog)
|
||||
ui(new Ui::ZealSettingsDialog),
|
||||
zealList( zList ),
|
||||
settings("Zeal", "Zeal")
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
ui->downloadableGroup->hide();
|
||||
ui->docsetsProgress->hide();
|
||||
|
||||
ui->listView->setModel( &zealList );
|
||||
|
||||
ui->minFontSize->setValue(settings.value("minFontSize").toInt());
|
||||
QString hiding = settings.value("hidingBehavior", "systray").toString();
|
||||
if(hiding == "systray") {
|
||||
ui->radioSysTray->setChecked(true);
|
||||
} else {
|
||||
ui->radioMinimize->setChecked(true);
|
||||
}
|
||||
ui->storageEdit->setText(docsets->docsetsDir());
|
||||
|
||||
|
||||
connect(&naManager, &QNetworkAccessManager::finished, [=](QNetworkReply* reply) {
|
||||
++naCount;
|
||||
if(naCount <= 2) { // 1st and 2nd requests are for github and kapeli.com
|
||||
if(reply->request().url().host() == "kapeli.com") {
|
||||
QWebView view;
|
||||
view.settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
|
||||
view.setContent(reply->readAll());
|
||||
auto collection = view.page()->mainFrame()->findAllElements(".drowx");
|
||||
for(auto drowx : collection) {
|
||||
auto anchor = drowx.findFirst("a");
|
||||
auto url = anchor.attribute("href");
|
||||
auto name_list = url.split("/");
|
||||
auto name = name_list[name_list.count()-1].replace(".tgz", "");
|
||||
name = name.replace(".tar.bz2", "");
|
||||
if(name != "" && !docsets->names().contains(name)) {
|
||||
urls[name] = url;
|
||||
auto url_list = url.split("/");
|
||||
auto iconfile = url_list[url_list.count()-1].replace(".tgz", ".png");
|
||||
iconfile = iconfile.replace(".tar.bz2", ".png");
|
||||
#ifdef WIN32
|
||||
QDir icondir(QCoreApplication::applicationDirPath());
|
||||
icondir.cd("icons");
|
||||
#else
|
||||
QDir icondir("/usr/share/pixmaps/zeal");
|
||||
#endif
|
||||
auto *lwi = new QListWidgetItem(QIcon(icondir.filePath(iconfile)), name);
|
||||
ui->docsetsList->addItem(lwi);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
QString list = reply->readAll();
|
||||
if(reply->error() != QNetworkReply::NoError) {
|
||||
QMessageBox::warning(this, "No docsets found", "Failed retrieving list of docsets: " + reply->errorString());
|
||||
ui->downloadButton->show();
|
||||
} else {
|
||||
for(auto item : list.split("\n")) {
|
||||
QStringList docset = item.split(" ");
|
||||
if(docset.size() < 2) break;
|
||||
if(!docsets->names().contains(docset[0])) {
|
||||
if(!docset[1].startsWith("http")) {
|
||||
urls.clear();
|
||||
QMessageBox::warning(this, "No docsets found", "Failed retrieving https://raw.github.com/jkozera/zeal/master/docsets.txt: " + QString(docset[1]));
|
||||
break;
|
||||
}
|
||||
urls[docset[0]] = docset[1];
|
||||
ui->docsetsList->addItem(docset[0]);
|
||||
}
|
||||
}
|
||||
if(urls.size() > 0) {
|
||||
ui->downloadableGroup->show();
|
||||
} else {
|
||||
QMessageBox::warning(this, "No docsets found", QString("No downloadable docsets found."));
|
||||
ui->downloadButton->show();
|
||||
}
|
||||
}
|
||||
}
|
||||
if(naCount == 2) {
|
||||
ui->docsetsProgress->hide();
|
||||
}
|
||||
} else {
|
||||
if(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 302) {
|
||||
auto reply3 = naManager.get(QNetworkRequest(QUrl(reply->rawHeader("Location"))));
|
||||
connect(reply3, &QNetworkReply::downloadProgress, [this](quint64 recv, quint64 total){progressCb(recv, total);});
|
||||
} else {
|
||||
if(reply->request().url().path().endsWith("tgz") || reply->request().url().path().endsWith("tar.bz2")) {
|
||||
auto dataDir = QDir(docsets->docsetsDir());
|
||||
if(!dataDir.exists()) {
|
||||
QMessageBox::critical(this, "No docsets directory found",
|
||||
QString("'%s' directory not found").arg(docsets->docsetsDir()));
|
||||
} else {
|
||||
#ifdef WIN32
|
||||
QDir tardir(QCoreApplication::applicationDirPath());
|
||||
QString program = tardir.filePath("bsdtar.exe");
|
||||
#else
|
||||
QString program = "bsdtar";
|
||||
#endif
|
||||
QTemporaryFile *tmp = new QTemporaryFile;
|
||||
tmp->open();
|
||||
tmp->write(reply->readAll());
|
||||
tmp->flush();
|
||||
|
||||
QProcess *tar = new QProcess();
|
||||
tar->setWorkingDirectory(dataDir.absolutePath());
|
||||
QStringList args;
|
||||
if(reply->request().url().path().endsWith("tar.bz2")) {
|
||||
args = QStringList("-jqtf");
|
||||
} else {
|
||||
args = QStringList("-zqtf");
|
||||
}
|
||||
args.append(tmp->fileName());
|
||||
args.append("*docset");
|
||||
tar->start(program, args);
|
||||
tar->waitForFinished();
|
||||
auto line_buf = tar->readLine();
|
||||
auto outDir = QString::fromLocal8Bit(line_buf).split("/")[0];
|
||||
|
||||
if(reply->request().url().path().endsWith("tar.bz2")) {
|
||||
args = QStringList("-jxf");
|
||||
} else {
|
||||
args = QStringList("-zxf");
|
||||
}
|
||||
args.append(tmp->fileName());
|
||||
connect(tar, (void (QProcess::*)(int,QProcess::ExitStatus))&QProcess::finished, [=](int a, QProcess::ExitStatus b) {
|
||||
auto path = reply->request().url().path().split("/");
|
||||
auto fileName = path[path.count()-1];
|
||||
auto docsetName = fileName.replace(".tgz", ".docset");
|
||||
docsetName = docsetName.replace(".tar.bz2", ".docset");
|
||||
|
||||
if(outDir != docsetName) {
|
||||
QDir dataDir2(dataDir);
|
||||
dataDir2.rename(outDir, docsetName);
|
||||
}
|
||||
|
||||
// FIXME C&P (see "FIXME C&P" below)
|
||||
QMetaObject::invokeMethod(docsets, "addDocset", Qt::BlockingQueuedConnection,
|
||||
Q_ARG(QString, dataDir.absoluteFilePath(docsetName)));
|
||||
zealList.resetModulesCounts();
|
||||
// TODO: Signal mainwindow
|
||||
//ui->treeView->reset();
|
||||
ui->listView->reset();
|
||||
for(int i = 0; i < ui->docsetsList->count(); ++i) {
|
||||
if(ui->docsetsList->item(i)->text()+".docset" == docsetName) {
|
||||
ui->docsetsList->takeItem(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ui->docsetsList->setEnabled(true);
|
||||
ui->downloadDocsetButton->setText("Download");
|
||||
ui->docsetsProgress->hide();
|
||||
});
|
||||
ui->docsetsProgress->setRange(0, 0);
|
||||
tar->start(program, args);
|
||||
}
|
||||
} else {
|
||||
QTemporaryFile *tmp = new QTemporaryFile;
|
||||
tmp->open();
|
||||
tmp->write(reply->readAll());
|
||||
tmp->seek(0);
|
||||
QuaZip zipfile(tmp);
|
||||
if(zipfile.open(QuaZip::mdUnzip)) {
|
||||
tmp->close();
|
||||
auto dataDir = QDir(docsets->docsetsDir());
|
||||
if(!dataDir.exists()) {
|
||||
QMessageBox::critical(this, "No docsets directory found",
|
||||
QString("'%1' directory not found").arg(docsets->docsetsDir()));
|
||||
} else {
|
||||
QStringList *files = new QStringList;
|
||||
ui->docsetsProgress->setRange(0, 0);
|
||||
auto future = QtConcurrent::run([=] {
|
||||
*files = JlCompress::extractDir(tmp->fileName(), dataDir.absolutePath());
|
||||
delete tmp;
|
||||
});
|
||||
QFutureWatcher<void> *watcher = new QFutureWatcher<void>;
|
||||
watcher->setFuture(future);
|
||||
connect(watcher, &QFutureWatcher<void>::finished, [=] {
|
||||
// extract finished - add docset
|
||||
QDir next((*files)[0]), root = next;
|
||||
delete files;
|
||||
next.cdUp();
|
||||
while(next.absolutePath() != dataDir.absolutePath()) {
|
||||
root = next;
|
||||
next.cdUp();
|
||||
}
|
||||
// FIXME C&P (see "FIXME C&P" above)
|
||||
QMetaObject::invokeMethod(docsets, "addDocset", Qt::BlockingQueuedConnection,
|
||||
Q_ARG(QString, root.absolutePath()));
|
||||
zealList.resetModulesCounts();
|
||||
// TODO: Signal mainwindow
|
||||
//ui->treeView->reset();
|
||||
ui->listView->reset();
|
||||
for(int i = 0; i < ui->docsetsList->count(); ++i) {
|
||||
if(ui->docsetsList->item(i)->text() == root.dirName() ||
|
||||
ui->docsetsList->item(i)->text()+".docset" == root.dirName()) {
|
||||
ui->docsetsList->takeItem(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ui->docsetsList->setEnabled(true);
|
||||
ui->downloadDocsetButton->setText("Download");
|
||||
ui->docsetsProgress->hide();
|
||||
|
||||
});
|
||||
}
|
||||
} else if(naCount == 3) { // 3rd request - retry once for Google Drive
|
||||
QFile file(tmp->fileName());
|
||||
file.open(QIODevice::ReadOnly);
|
||||
QWebView view;
|
||||
view.setContent(file.readAll());
|
||||
tmp->close();
|
||||
delete tmp;
|
||||
|
||||
QString href = view.page()->mainFrame()->findFirstElement("#uc-download-link").attribute("href");
|
||||
QString path = href.split("?")[0], query = href.split("?")[1];
|
||||
QUrl url = reply->url();
|
||||
url.setPath(path);
|
||||
url.setQuery(query);
|
||||
// retry with #uc-download-link - "Google Drive can't scan this file for viruses."
|
||||
auto reply2 = naManager.get(QNetworkRequest(url));
|
||||
connect(reply2, &QNetworkReply::downloadProgress, [this](quint64 recv, quint64 total){progressCb(recv, total);});
|
||||
} else {
|
||||
tmp->close();
|
||||
delete tmp;
|
||||
QMessageBox::warning(this, "Error", "Download failed: invalid ZIP file.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
ZealSettingsDialog::~ZealSettingsDialog()
|
||||
@ -24,3 +265,113 @@ QKeySequence ZealSettingsDialog::hotKey()
|
||||
{
|
||||
return ui->toolButton->keySequence();
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::progressCb(quint64 recv, quint64 total){
|
||||
if(recv > 10240) { // don't show progress for non-docset pages (like Google Drive first request)
|
||||
ui->docsetsProgress->setMaximum(total);
|
||||
ui->docsetsProgress->setValue(recv);
|
||||
}
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_downloadButton_clicked()
|
||||
{
|
||||
naCount = 0;
|
||||
ui->downloadButton->hide();
|
||||
ui->docsetsProgress->show();
|
||||
QNetworkRequest listRequest(QUrl("https://raw.github.com/jkozera/zeal/master/docsets.txt"));
|
||||
QNetworkRequest listRequest2(QUrl("http://kapeli.com/docset_links"));
|
||||
naManager.get(listRequest);
|
||||
naManager.get(listRequest2);
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_docsetsList_clicked(const QModelIndex &index)
|
||||
{
|
||||
|
||||
ui->downloadDocsetButton->setEnabled(true);
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_downloadDocsetButton_clicked()
|
||||
{
|
||||
ui->docsetsList->setEnabled(false);
|
||||
ui->downloadDocsetButton->setEnabled(false);
|
||||
ui->downloadDocsetButton->setText("Downloading, please wait...");
|
||||
QUrl url(urls[ui->docsetsList->currentItem()->text()]);
|
||||
naCount = 2;
|
||||
auto reply = naManager.get(QNetworkRequest(url));
|
||||
if(url.path().endsWith((".tgz")) || url.path().endsWith((".tar.bz2"))) {
|
||||
// Dash's docsets don't redirect, so we can start showing progress instantly
|
||||
connect(reply, &QNetworkReply::downloadProgress, [this](quint64 recv, quint64 total){progressCb(recv, total);});
|
||||
}
|
||||
ui->docsetsProgress->show();
|
||||
ui->docsetsProgress->setRange(0, 0);
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_storageButton_clicked()
|
||||
{
|
||||
QString dir = QFileDialog::getExistingDirectory(0, "Open Directory");
|
||||
if(!dir.isEmpty()) {
|
||||
ui->storageEdit->setText(dir);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_deleteButton_clicked()
|
||||
{
|
||||
auto answer = QMessageBox::question(this, "Are you sure",
|
||||
QString("Are you sure you want to permanently delete the '%1' docest? "
|
||||
"Clicking 'Cancel' in this dialog box will not revert the deletion.").arg(
|
||||
ui->listView->currentIndex().data().toString()));
|
||||
if(answer == QMessageBox::Yes) {
|
||||
auto dataDir = QDir(docsets->docsetsDir());
|
||||
auto docsetName = ui->listView->currentIndex().data().toString();
|
||||
zealList.removeRow(ui->listView->currentIndex().row());
|
||||
if(dataDir.exists()) {
|
||||
ui->docsetsProgress->show();
|
||||
ui->deleteButton->hide();
|
||||
ui->docsetsProgress->setRange(0, 0);
|
||||
auto future = QtConcurrent::run([=] {
|
||||
QDir docsetDir(dataDir);
|
||||
if(docsetDir.cd(docsetName)) {
|
||||
docsetDir.removeRecursively();
|
||||
} else if(docsetDir.cd(docsetName + ".docset")) {
|
||||
docsetDir.removeRecursively();
|
||||
}
|
||||
});
|
||||
QFutureWatcher<void> *watcher = new QFutureWatcher<void>;
|
||||
watcher->setFuture(future);
|
||||
connect(watcher, &QFutureWatcher<void>::finished, [=]() {
|
||||
ui->docsetsProgress->hide();
|
||||
ui->deleteButton->show();
|
||||
watcher->deleteLater();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_listView_clicked(const QModelIndex &index)
|
||||
{
|
||||
|
||||
ui->deleteButton->setEnabled(true);
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_tabWidget_currentChanged(int index)
|
||||
{
|
||||
// This is needed so the docset list is up to date when the user views it
|
||||
ui->listView->reset();
|
||||
}
|
||||
|
||||
void ZealSettingsDialog::on_buttonBox_accepted()
|
||||
{
|
||||
if(ui->storageEdit->text() != docsets->docsetsDir()) {
|
||||
// set new docsets dir
|
||||
settings.setValue("docsetsDir", ui->storageEdit->text());
|
||||
// reload docsets:
|
||||
docsets->initialiseDocsets();
|
||||
}
|
||||
setHotKey(hotKey());
|
||||
settings.setValue("minFontSize", ui->minFontSize->text());
|
||||
settings.setValue("hidingBehavior",
|
||||
ui->radioSysTray->isChecked() ?
|
||||
"systray" : "minimize");
|
||||
}
|
||||
|
||||
@ -2,28 +2,52 @@
|
||||
#define ZEALSETTINGSDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QSettings>
|
||||
|
||||
#include "ui_zealsettingsdialog.h"
|
||||
#include "zeallistmodel.h"
|
||||
#include "zealdocsetsregistry.h"
|
||||
|
||||
class ZealSettingsDialog : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ZealSettingsDialog(QWidget *parent = 0);
|
||||
explicit ZealSettingsDialog(ZealListModel &zlist, QWidget *parent = 0);
|
||||
~ZealSettingsDialog();
|
||||
void setHotKey(const QKeySequence &keySequence);
|
||||
QKeySequence hotKey();
|
||||
|
||||
Ui::ZealSettingsDialog *ui;
|
||||
|
||||
void setListModel(ZealListModel *model){
|
||||
zealList = model;
|
||||
ui->listView->setModel( zealList );
|
||||
}
|
||||
public:
|
||||
void progressCb(quint64 recv, quint64 total);
|
||||
|
||||
private slots:
|
||||
void on_downloadButton_clicked();
|
||||
|
||||
void on_docsetsList_clicked(const QModelIndex &index);
|
||||
|
||||
void on_downloadDocsetButton_clicked();
|
||||
|
||||
void on_storageButton_clicked();
|
||||
|
||||
void on_deleteButton_clicked();
|
||||
|
||||
void on_listView_clicked(const QModelIndex &index);
|
||||
|
||||
void on_tabWidget_currentChanged(int index);
|
||||
|
||||
void on_buttonBox_accepted();
|
||||
|
||||
private:
|
||||
ZealListModel *zealList;
|
||||
ZealListModel &zealList;
|
||||
QNetworkAccessManager naManager;
|
||||
QSettings settings;
|
||||
int naCount;
|
||||
QMap<QString, QString> urls;
|
||||
|
||||
};
|
||||
|
||||
#endif // ZEALSETTINGSDIALOG_H
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab_3">
|
||||
<attribute name="title">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user