w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that CALL3.TXT is not deleted while updating the file 

This is necessary so that symlinks that may be used to share CALL3.TXT
between WSJT-X  instances and with  and MAP65  do not get  broken when
adding new entries in either application.
This commit is contained in:
Bill Somerville 2021-09-20 17:38:09 +01:00
parent f884f77321
commit 917acbb97f
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 87 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
map65/mainwindow.cpp
View File

@ -1970,16 +1970,16 @@ void MainWindow::on_addButton_clicked() //Add button
<< endl
#endif
;
f1.close();
f1.open(QIODevice::ReadOnly | QIODevice::Text);
f1.seek (0);
}
QString tmpFile = m_appDir + "/CALL3.TMP";
QFile f2(tmpFile);
if(!f2.open(QIODevice::WriteOnly | QIODevice::Text)) {
if(!f2.open(QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text)) {
msgBox("Cannot open " + tmpFile);
return;
}
{
QTextStream in(&f1);
QTextStream out(&f2);
QString hc=hiscall;
@ -2012,16 +2012,19 @@ void MainWindow::on_addButton_clicked() //Add button
}
}
} while(!s.isNull());
f1.close();
if(hc>hc1 && !m_call3Modified) out << newEntry + "\n";
}
if(m_call3Modified) {
QFile f0(m_appDir + "/CALL3.OLD");
if(f0.exists()) f0.remove();
QFile f1(m_appDir + "/CALL3.TXT");
f1.rename(m_appDir + "/CALL3.OLD");
f2.rename(m_appDir + "/CALL3.TXT");
f2.close();
auto const& old_path = m_appDir + "/CALL3.OLD";
QFile f0 {old_path};
if (f0.exists ()) f0.remove ();
f1.copy (old_path); // copying as we want to preserve
// symlinks
f1.open (QFile::WriteOnly | QFile::Text); // truncates
f2.seek (0);
f1.write (f2.readAll ()); // copy contents
f2.remove ();
}
}

25
widgets/mainwindow.cpp
View File

@ -5670,16 +5670,16 @@ void MainWindow::on_addButton_clicked() //Add button
<< endl
#endif
;
f1.close();
f1.open(QIODevice::ReadOnly | QIODevice::Text);
f1.seek (0);
}
QFile f2 {m_config.writeable_data_dir ().absoluteFilePath ("CALL3.TMP")};
if(!f2.open(QIODevice::WriteOnly | QIODevice::Text)) {
if(!f2.open(QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text)) {
MessageBox::warning_message (this, tr ("Add to CALL3.TXT")
, tr ("Cannot open \"%1\" for writing: %2")
.arg (f2.fileName ()).arg (f2.errorString ()));
return;
}
{
QTextStream in(&f1); //Read from CALL3.TXT
QTextStream out(&f2); //Copy into CALL3.TMP
QString hc=hisCall;
@ -5711,16 +5711,19 @@ void MainWindow::on_addButton_clicked() //Add button
}
}
} while(!s.isNull());
f1.close();
if(hc>hc1 && !m_call3Modified) out << newEntry + QChar::LineFeed;
}
if(m_call3Modified) {
QFile f0 {m_config.writeable_data_dir ().absoluteFilePath ("CALL3.OLD")};
if(f0.exists()) f0.remove();
QFile f1 {m_config.writeable_data_dir ().absoluteFilePath ("CALL3.TXT")};
f1.rename(m_config.writeable_data_dir ().absoluteFilePath ("CALL3.OLD"));
f2.rename(m_config.writeable_data_dir ().absoluteFilePath ("CALL3.TXT"));
f2.close();
auto const& old_path = m_config.writeable_data_dir ().absoluteFilePath ("CALL3.OLD");
QFile f0 {old_path};
if (f0.exists ()) f0.remove ();
f1.copy (old_path); // copying as we want to
// preserve symlinks
f1.open (QFile::WriteOnly | QFile::Text); // truncates
f2.seek (0);
f1.write (f2.readAll ()); // copy contents
f2.remove ();
}
}