ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check if a downloaded (solution) file is a symlink placeholder and put a copy of the original in its place

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-12-29 17:20:52 -05:00
parent 4d36a84738
commit 78a897c1bf
1 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
tools/lammps-gui/lammpsgui.cpp
View File

@ -1223,7 +1223,7 @@ void LammpsGui::do_run(bool use_buffer)
// define "gui_run" variable set to run_counter value // define "gui_run" variable set to run_counter value
lammps.command("variable gui_run delete"); lammps.command("variable gui_run delete");
lammps.command(std::string("variable gui_run index " + std::to_string(run_counter)).c_str()); lammps.command(std::string("variable gui_run index " + std::to_string(run_counter)));
if (use_buffer) { if (use_buffer) {
// always add final newline since the text edit widget does not do it // always add final newline since the text edit widget does not do it
char *input = mystrdup(ui->textEdit->toPlainText() + "\n"); char *input = mystrdup(ui->textEdit->toPlainText() + "\n");
@ -1311,7 +1311,7 @@ void LammpsGui::render_image()
selection += "\nrun 0 pre yes post no"; selection += "\nrun 0 pre yes post no";
ui->textEdit->setTextCursor(saved); ui->textEdit->setTextCursor(saved);
lammps.command("clear"); lammps.command("clear");
lammps.commands_string(selection.toStdString().c_str()); lammps.commands_string(selection);
// clear any possible error status // clear any possible error status
lammps.get_last_error_message(nullptr, 0); lammps.get_last_error_message(nullptr, 0);
} }
@ -2013,7 +2013,7 @@ void LammpsGui::setup_tutorial(int tutno, const QString &dir, bool purgedir, boo
start_lammps(); start_lammps();
lammps.command("clear"); lammps.command("clear");
lammps.command(QString("shell cd " + dir).toStdString().c_str()); lammps.command(QString("shell cd " + dir));
// download and process manifest for selected tutorial // download and process manifest for selected tutorial
// must check for error after download, e.g. when there is no network. // must check for error after download, e.g. when there is no network.
@ -2021,13 +2021,20 @@ void LammpsGui::setup_tutorial(int tutno, const QString &dir, bool purgedir, boo
lammps.command(geturl.arg(tutno).arg(".manifest")); lammps.command(geturl.arg(tutno).arg(".manifest"));
if (lammps.has_error()) { if (lammps.has_error()) {
lammps.get_last_error_message(errorbuf, BUFLEN); lammps.get_last_error_message(errorbuf, BUFLEN);
QMessageBox::critical(this, "LAMMPS-GUI tutorial files download error", QString(errorbuf)); QMessageBox::critical(this, "LAMMPS-GUI tutorial download error", QString(errorbuf));
return; return;
} }
QFile manifest(".manifest"); QFile manifest(".manifest");
QString line, first; QString line, first;
QList<QString> downloads; struct DownloadItem {
DownloadItem(int _n, const QString &_f) : ntutorial(_n), fname(_f) {}
int ntutorial;
QString fname;
};
QList<DownloadItem> downloads;
if (manifest.open(QIODevice::ReadOnly)) { if (manifest.open(QIODevice::ReadOnly)) {
while (!manifest.atEnd()) { while (!manifest.atEnd()) {
line = (const char *)manifest.readLine(); line = (const char *)manifest.readLine();
@ -2039,29 +2046,55 @@ void LammpsGui::setup_tutorial(int tutno, const QString &dir, bool purgedir, boo
// file in subfolder // file in subfolder
if (line.contains('/')) { if (line.contains('/')) {
if (getsolution && line.startsWith("solution")) { if (getsolution && line.startsWith("solution")) {
downloads.append(geturl.arg(tutno).arg(line)); downloads.append(DownloadItem(tutno, line));
} }
} else { } else {
// first file is the initial template // first file is the initial template
if (first.isEmpty()) first = line; if (first.isEmpty()) first = line;
downloads.append(geturl.arg(tutno).arg(line)); downloads.append(DownloadItem(tutno, line));
} }
} }
manifest.close(); manifest.close();
manifest.remove(); manifest.remove();
} }
int i = 0; int i = 0;
int num = downloads.size(); int num = downloads.size();
if (!num) num = 1; if (!num) num = 1;
progress->setValue(0); progress->setValue(0);
progress->show(); progress->show();
dirstatus->hide(); dirstatus->hide();
for (const auto &file : downloads) {
for (const auto &item : downloads) {
++i; ++i;
status->setText(QString("Downloading file %1 of %2").arg(i).arg(num)); status->setText(QString("Downloading file %1 of %2").arg(i).arg(num));
status->repaint();
lammps.command(file);
progress->setValue((int)((double)i / ((double)num) * 1000.0)); progress->setValue((int)((double)i / ((double)num) * 1000.0));
status->repaint();
lammps.command(geturl.arg(item.ntutorial).arg(item.fname));
// download failed. abort, restore status line, and launch error dialog
if (lammps.has_error()) {
status->setText("Error.");
progress->hide();
dirstatus->show();
status->repaint();
lammps.get_last_error_message(errorbuf, BUFLEN);
QMessageBox::critical(this, "LAMMPS-GUI tutorial download error", QString(errorbuf));
return;
}
// check if download is a placeholder for a symbolic link and make a copy instead.
QFile dlfile(item.fname);
QFileInfo dlpath(item.fname);
if (dlfile.open(QIODevice::ReadOnly)) {
line = (const char *)dlfile.readLine();
line = line.trimmed();
dlfile.close();
if (line == QString("../") + dlpath.fileName())
lammps.command(QString("shell cp %1 %2").arg(dlpath.fileName()).arg(item.fname));
}
} }
progress->setValue(1000); progress->setValue(1000);
status->setText("Ready."); status->setText("Ready.");