kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-17 19:34:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tell a second person who has a project open, and open it read-only

Browse Source 
Two people opening the same project on a shared drive could both edit it,
and the last save silently wiped the other's work. A project now has a
hidden lock file beside it (.~plant.qetz.lock, small JSON: user, host,
process, version, since, heartbeat). Opening a project another live session
holds shows who has it, since when and how long ago they were last active,
and offers Open read-only (default), Open anyway, or Cancel.

- The lock is made with an exclusive create, refreshed every minute and
  deleted when the project closes. It is not a QLockFile: that treats any
  lock from another machine as stale after 30 s. Here only a lock made on
  this machine by a process that no longer exists is taken silently.
- A folder the lock cannot be made in, or the setting turned off
  (Settings > General > Projects), opens as before.
- Save As and .qet saved as .qetz move the lock to the new file, and refuse
  a file someone else has open. A project opened read-only for another's
  lock does not save over that file.
- --resave and --set-titleblock refuse a file someone has open unless given
  --ignore-lock; the read-only verbs never look at locks and headless runs
  never take one. A script's qet.save() refuses the same way.

Checked: 17 new unit tests (5 go red when stale detection and the exclusive
create are broken), full ctest 107/107, the dialog and both choices in the
GUI under Xvfb, and --resave refused/allowed from the command line.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-16 13:01:54 +13:00
parent c4b5cf2f11
commit 3521c64ba3
17 changed files with 1012 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/scripting/qetscriptapi.cpp
+17
View File
@@ -42,6 +42,7 @@
#include "../dataBase/projectdatabase.h"
#include "../qetapp.h"
#include "../qetproject.h"
#include "../projectlock.h"
#include "../qetresult.h"
#include "../qetgraphicsitem/conductor.h"
#include "../qetgraphicsitem/conductortextitem.h"
@@ -269,6 +270,9 @@ bool QetScriptApi::runFlag(const QString &flag, const QStringList &args)
}
QStringList full_args;
full_args << flag << path << args;
//The project's own file, which this session has locked, is no conflict
if (m_project->lock() && m_project->lock()->isHeld() && args.value(0) == path)
full_args << QStringLiteral("--ignore-lock");
if (m_view)
{
@@ -420,6 +424,19 @@ bool QetScriptApi::save(const QString &output)
{
if (!m_project) return false;
//Not onto a file someone else has open (their lock beside it); the
//lock this project holds itself is no conflict
{
const QString target = output.isEmpty() ? m_project->filePath() : output;
const ProjectLock::Holder holder = target.isEmpty() ? ProjectLock::Holder()
: ProjectLock::liveHolder(target, m_project->lock() ? m_project->lock()->session() : QString());
if (holder.valid) {
log(QStringLiteral("qet.save: %1 is open by %2 on %3 (lock file %4); not written -- pass another output path")
.arg(target, holder.user, holder.host, ProjectLock::lockPathFor(target)));
return false;
}
}
if (output.isEmpty())
{
if (m_project->filePath().isEmpty()) {