zealdocs/zeal
1
1
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2024-11-30 03:13:56 +03:00
Code Issues Projects Releases Wiki Activity

Do not download docsets if bsdtar is not available

Browse Source
This commit is contained in:
Boris Egorov 2014-11-18 10:47:00 +06:00
parent ed4e07589e
commit 1ae8a1badd
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
zeal/zealsettingsdialog.cpp
View File

@ -335,6 +335,16 @@ void ZealSettingsDialog::downloadDocsetList()
reply->deleteLater();
}
const QString ZealSettingsDialog::getTarPath() const
{
#ifdef WIN32
QDir tardir(QCoreApplication::applicationDirPath());
return tardir.filePath("bsdtar.exe");
#else
return "bsdtar";
#endif
}
void ZealSettingsDialog::extractDocset()
{
QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
@ -403,12 +413,7 @@ void ZealSettingsDialog::extractDocset()
QString("'%1' directory not found").arg(docsets->docsetsDir()));
endTasks();
} else {
#ifdef WIN32
QDir tardir(QCoreApplication::applicationDirPath());
const QString program = tardir.filePath("bsdtar.exe");
#else
const QString program = "bsdtar";
#endif
const QString program = getTarPath();
QTemporaryFile *tmp = new QTemporaryFile;
tmp->open();
tmp->write(reply->readAll());
@ -425,15 +430,6 @@ void ZealSettingsDialog::extractDocset()
args.append(tmp->fileName());
args.append("*docset");
tar->start(program, args);
// TODO: check if bsdtar exists earlier (on startup or
// before archive downloading)
if (!tar->waitForStarted()) {
QMessageBox::critical(this, "bsdtar executable not found",
(QString("'%1' executable not found. It is required to allow extracting docsets. ") + QString(
"Please install it if you want to extract docsets from within Zeal.")).arg(program));
endTasks();
}
tar->waitForFinished();
auto line_buf = tar->readLine();
auto outDir = QString::fromLocal8Bit(line_buf).split("/")[0];
@ -612,6 +608,18 @@ void ZealSettingsDialog::on_downloadDocsetButton_clicked()
return;
}
// Idle run of bsdtar to check if it is available
const QString program = getTarPath();
QProcess *tar = new QProcess();
tar->start(program);
if (!tar->waitForStarted()) {
QMessageBox::critical(this, "bsdtar executable not found",
(QString("'%1' executable not found. It is required to allow extracting docsets. ")
+ QString("Please install it if you want to extract docsets from within Zeal.")).arg(program));
stopDownloads();
return;
}
// Find each checked item, and create a NetworkRequest for it.
for (int i = 0; i < ui->docsetsList->count(); ++i) {
QListWidgetItem *tmp = ui->docsetsList->item(i);

1
zeal/zealsettingsdialog.h
View File

@ -51,6 +51,7 @@ private:
QNetworkReply *startDownload(const ZealDocsetMetadata &meta, qint8 retries = 0);
void stopDownloads();
void saveSettings();
const QString getTarPath() const;
enum DocsetProgressRoles {
ZealDocsetDoneInstalling = Qt::UserRole + 20,