From 4c3d87e3f716667237bc1905afa0e558b642bdc4 Mon Sep 17 00:00:00 2001 From: ispyisail Date: Wed, 14 Oct 2026 09:47:08 +1300 Subject: [PATCH] .qetz: no columns for where a block sat; open a later format read-only The database held where each moved block sat among its parent's children (props_at, info_at, links_at), though reading only asked whether there was one: the marker the folio file keeps says that, and where it goes back. The columns are gone; format 2 files leave the same markers and still open. A .qetz of a later format whose min-reader allows this version was still refused by the database's own format check. It opens now, read-only, with a message: saving it here could lose what this version does not know. Save As writes a copy in this version's format. Co-Authored-By: Claude Opus 5.5 --- sources/container/qetcontainer.cpp | 16 ++++-- sources/container/qetcontainer.h | 10 +++- sources/container/qetcontainerdb.cpp | 86 ++++++++++++++-------------- sources/qetdiagrameditor.cpp | 10 ++++ sources/qetproject.cpp | 12 +++- sources/qetproject.h | 3 + tests/qttest/tst_qetcontainer.cpp | 41 ++++++++++++- 7 files changed, 123 insertions(+), 55 deletions(-) diff --git a/sources/container/qetcontainer.cpp b/sources/container/qetcontainer.cpp index 7f27789c4..89c464e22 100644 --- a/sources/container/qetcontainer.cpp +++ b/sources/container/qetcontainer.cpp @@ -153,15 +153,18 @@ bool QetContainer::isZip(const QByteArray &content) /** @brief QetContainer::readDocument The project document held in @p content: unzipped and joined for a - .qetz, parsed for a .qet. + .qetz, parsed for a .qet. @p format, if any: the .qetz's format, 0 + for a .qet. */ -bool QetContainer::readDocument(const QByteArray &content, QDomDocument *document, QString *error) +bool QetContainer::readDocument(const QByteArray &content, QDomDocument *document, QString *error, + int *format) { + if (format) *format = 0; if (!isZip(content)) return parse(content, document, error); QList entries; return QetZip::fromBytes(content, &entries, error) - && join(entries, document, error); + && join(entries, document, error, format); } /** @@ -264,8 +267,11 @@ QList QetContainer::split(const QDomDocument &project, const QStr Refused, with @p error set: not a .qetz, made for a later QElectroTech (the manifest's min-reader), or a part missing or unreadable. Entries nothing names are ignored, so a later format may add some. + @p format, if any: the format the file says it is, above Format for a + later one this may read (its min-reader allows it) */ -bool QetContainer::join(const QList &entries, QDomDocument *project, QString *error) +bool QetContainer::join(const QList &entries, QDomDocument *project, QString *error, + int *format) { QHash files; for (const QetZip::Entry &entry : entries) @@ -286,6 +292,8 @@ bool QetContainer::join(const QList &entries, QDomDocument *proje .arg(Format)); return false; } + if (format) + *format = manifest.documentElement().attribute(QStringLiteral("format")).toInt(); if (!parse(files.value(QStringLiteral("project.xml")), project, error)) return false; diff --git a/sources/container/qetcontainer.h b/sources/container/qetcontainer.h index 32da2223e..fb0623f7e 100644 --- a/sources/container/qetcontainer.h +++ b/sources/container/qetcontainer.h @@ -49,20 +49,24 @@ namespace QetContainer /// unless their min-reader allows this one. constexpr int Format = 3; /// 3: the database's rows keyed by the items' uuids, true/false as - /// 1/0, its PRAGMA user_version the format. Format 2 is still read. + /// 1/0, its PRAGMA user_version the format, the symbols' type left + /// in the folio files, no column for where a block sat. Format 2 is + /// still read; a later format whose min-reader allows this one is + /// read too, and said so through join()'s @p format. QList split(const QDomDocument &project, const QString &writer = QString(), QString *error = nullptr); bool join(const QList &entries, QDomDocument *project, - QString *error = nullptr); + QString *error = nullptr, int *format = nullptr); /// Parse @p xml as a .qet is read (QETProject::openFile) bool parse(const QByteArray &xml, QDomDocument *document, QString *error = nullptr); /// true if @p content is a zip, so a .qetz rather than a .qet bool isZip(const QByteArray &content); /// The project document in @p content, a .qet or a .qetz - bool readDocument(const QByteArray &content, QDomDocument *document, QString *error = nullptr); + bool readDocument(const QByteArray &content, QDomDocument *document, QString *error = nullptr, + int *format = nullptr); } #endif // QETCONTAINER_H diff --git a/sources/container/qetcontainerdb.cpp b/sources/container/qetcontainerdb.cpp index fd7b7bc4b..37ed07749 100644 --- a/sources/container/qetcontainerdb.cpp +++ b/sources/container/qetcontainerdb.cpp @@ -58,6 +58,15 @@ bool replaceMarker(QDomElement parent, const QDomElement &block) return false; } + //true if @p parent holds the marker of a block @p tag moved out: where + //the block goes back, and that it was there at all +bool hasMarker(const QDomElement &parent, const QString &tag) +{ + for (QDomElement m = parent.firstChildElement(MarkerTag) ; !m.isNull() ; m = m.nextSiblingElement(MarkerTag)) + if (m.attribute(MarkerBlock) == tag) return true; + return false; +} + const QStringList FolioData = { QStringLiteral("title"), QStringLiteral("author"), QStringLiteral("date"), QStringLiteral("folio"), QStringLiteral("indexrev"), QStringLiteral("filename"), @@ -114,11 +123,11 @@ QString schema() "CREATE TABLE meta (key TEXT PRIMARY KEY, value TEXT);" "CREATE TABLE project_property (ord INTEGER PRIMARY KEY, name TEXT, value TEXT, attrs TEXT);" "CREATE TABLE folio (uuid TEXT PRIMARY KEY, pos INTEGER NOT NULL UNIQUE, %1," - " props_at INTEGER, props_attrs TEXT);" + " props_attrs TEXT);" "CREATE TABLE folio_property (folio_uuid TEXT NOT NULL REFERENCES folio, ord INTEGER NOT NULL," " name TEXT, value TEXT, attrs TEXT, PRIMARY KEY (folio_uuid, ord));" "CREATE TABLE element (uuid TEXT PRIMARY KEY, folio_uuid TEXT NOT NULL REFERENCES folio, %2," - " info_at INTEGER, info_attrs TEXT, links_at INTEGER, links_attrs TEXT);" + " info_attrs TEXT, links_attrs TEXT);" "CREATE TABLE element_info (element_uuid TEXT NOT NULL REFERENCES element, ord INTEGER NOT NULL," " name TEXT, value TEXT, show INTEGER, attrs TEXT, PRIMARY KEY (element_uuid, ord));" "CREATE TABLE link (element_uuid TEXT NOT NULL REFERENCES element, ord INTEGER NOT NULL," @@ -291,15 +300,6 @@ bool listBlock(const QDomElement &block, const QString &entry) return true; } -int childIndex(const QDomNode &child) -{ - int i = 0; - for (QDomNode n = child.parentNode().firstChild() ; !n.isNull() ; n = n.nextSibling(), ++i) - if (n == child) return i; - return -1; -} - - //The attributes @p names of @p e, taken out of it; one that cannot be //stored stays, its value null QVariantList take(QDomElement e, const QStringList &names) @@ -511,9 +511,9 @@ QByteArray QetContainerDb::extract(QDomElement project, QString *error) Statement meta(db.m_db, QStringLiteral("INSERT INTO meta VALUES (?,?)")); Statement project_property(db.m_db, QStringLiteral("INSERT INTO project_property VALUES (?,?,?,?)")); - Statement folio(db.m_db, QStringLiteral("INSERT INTO folio VALUES (?,?,%1,?,?)").arg(placeholders(FolioData.size()))); + Statement folio(db.m_db, QStringLiteral("INSERT INTO folio VALUES (?,?,%1,?)").arg(placeholders(FolioData.size()))); Statement folio_property(db.m_db, QStringLiteral("INSERT INTO folio_property VALUES (?,?,?,?,?)")); - Statement element(db.m_db, QStringLiteral("INSERT INTO element VALUES (?,?,%1,?,?,?,?)").arg(placeholders(ElementData.size()))); + Statement element(db.m_db, QStringLiteral("INSERT INTO element VALUES (?,?,%1,?,?)").arg(placeholders(ElementData.size()))); Statement element_info(db.m_db, QStringLiteral("INSERT INTO element_info VALUES (?,?,?,?,?,?)")); Statement link(db.m_db, QStringLiteral("INSERT INTO link VALUES (?,?,?,?)")); Statement conductor(db.m_db, QStringLiteral("INSERT INTO conductor VALUES (?,?,%1)").arg(placeholders(ConductorData.size()))); @@ -538,7 +538,6 @@ QByteArray QetContainerDb::extract(QDomElement project, QString *error) //Project properties const QDomElement project_props = project.firstChildElement(QStringLiteral("properties")); if (!project_props.isNull() && listBlock(project_props, QStringLiteral("property"))) { - ok = ok && meta.run({QStringLiteral("props_at"), QString::number(childIndex(project_props))}); ok = ok && meta.run({QStringLiteral("props_attrs"), blockJson(project_props)}); int ord = 0; for (QDomElement p : children(project_props, QStringLiteral("property"))) { @@ -575,8 +574,7 @@ QByteArray QetContainerDb::extract(QDomElement project, QString *error) row += take(d, FolioData); QDomElement props = d.firstChildElement(QStringLiteral("properties")); const bool move_props = !props.isNull() && listBlock(props, QStringLiteral("property")); - row << (move_props ? QVariant(childIndex(props)) : QVariant()) - << (move_props ? blockJson(props) : QVariant()); + row << (move_props ? blockJson(props) : QVariant()); ok = ok && folio.run(row); if (move_props) { moveProperties(props, folio_property, {id}); @@ -594,14 +592,10 @@ QByteArray QetContainerDb::extract(QDomElement project, QString *error) QDomElement links = e.firstChildElement(QStringLiteral("links_uuids")); if (!info.isNull() && !listBlock(info, QStringLiteral("elementInformation"))) info = QDomElement(); if (!links.isNull() && !listBlock(links, QStringLiteral("link_uuid"))) links = QDomElement(); - const int info_at = info.isNull() ? -1 : childIndex(info); - const int links_at = links.isNull() ? -1 : childIndex(links); - erow << (info_at < 0 ? QVariant() : QVariant(info_at)) - << (info_at < 0 ? QVariant() : blockJson(info)) - << (links_at < 0 ? QVariant() : QVariant(links_at)) - << (links_at < 0 ? QVariant() : blockJson(links)); + erow << (info.isNull() ? QVariant() : blockJson(info)) + << (links.isNull() ? QVariant() : blockJson(links)); ok = ok && element.run(erow); - if (info_at >= 0) { + if (!info.isNull()) { int ord = 0; for (QDomElement i : children(info, QStringLiteral("elementInformation"))) { QVariant value; @@ -616,15 +610,15 @@ QByteArray QetContainerDb::extract(QDomElement project, QString *error) attributesJson(i, kept, QStringLiteral("elementInformation"))}); } } - if (links_at >= 0) { + if (!links.isNull()) { int ord = 0; for (QDomElement l : children(links, QStringLiteral("link_uuid"))) ok = ok && link.run({key, ord++, l.hasAttribute(QStringLiteral("uuid")) ? QVariant(l.attribute(QStringLiteral("uuid"))) : QVariant(), attributesJson(l, {QStringLiteral("uuid")}, QStringLiteral("link_uuid"))}); } - if (info_at >= 0) leaveMarker(info); - if (links_at >= 0) leaveMarker(links); + if (!info.isNull()) leaveMarker(info); + if (!links.isNull()) leaveMarker(links); if (!own_key) e.setAttribute(KeyAttribute, key); } } @@ -729,9 +723,11 @@ bool QetContainerDb::restore(QDomElement project, const QByteArray &database, QS //apart from the items' uuids: "f1", "e1", "c1" where an item had //none of its own, and every item's key in the folio file const int format = meta.value(QStringLiteral("format")).toString().toInt(); - if (format < 2 || format > QetContainer::Format) { - setError(error, QStringLiteral("the project database is of format %1, this reads 2 to %2") - .arg(meta.value(QStringLiteral("format")).toString()).arg(QetContainer::Format)); + //A later format is read when the manifest's min-reader allows it + //(QetContainer::join()): its writer kept what this reads + if (format < 2) { + setError(error, QStringLiteral("the project database is of format %1, this reads format 2 on") + .arg(meta.value(QStringLiteral("format")).toString())); return false; } const bool v2 = format == 2; @@ -754,7 +750,9 @@ bool QetContainerDb::restore(QDomElement project, const QByteArray &database, QS } return v2 ? QString() : e.attribute(QStringLiteral("uuid")); }; - if (meta.contains(QStringLiteral("props_at"))) { + //A moved block goes back where its marker is: the marker says it + //was there + if (hasMarker(project, QStringLiteral("properties"))) { QDomElement props = document.createElement(QStringLiteral("properties")); setAttributesJson(props, meta.value(QStringLiteral("props_attrs"))); Statement s(db.m_db, QStringLiteral("SELECT name, value, attrs FROM project_property ORDER BY ord")); @@ -804,22 +802,22 @@ bool QetContainerDb::restore(QDomElement project, const QByteArray &database, QS const QString id = keyOf(d, FolioAttribute); if (id.isEmpty()) continue; if (!use(folios_used, id, QStringLiteral("folio"))) return false; - Statement f(db.m_db, QStringLiteral("SELECT %1, props_at, props_attrs FROM folio WHERE %2 = ?") + Statement f(db.m_db, QStringLiteral("SELECT %1, props_attrs FROM folio WHERE %2 = ?") .arg(quoted(FolioData), folio_key)); f.bind({id}); if (!f.next()) { setError(error, QStringLiteral("folio %1 is not in the database").arg(id)); return false; } QVariantList values; - for (int i = 0 ; i < FolioData.size() + 2 ; ++i) values << f.value(i); + for (int i = 0 ; i < FolioData.size() + 1 ; ++i) values << f.value(i); put(d, FolioData, values, 0); - if (!values.at(FolioData.size()).isNull()) { + if (hasMarker(d, QStringLiteral("properties"))) { QDomElement props = document.createElement(QStringLiteral("properties")); - setAttributesJson(props, values.at(FolioData.size() + 1)); + setAttributesJson(props, values.at(FolioData.size())); Statement p(db.m_db, QStringLiteral("SELECT name, value, attrs FROM folio_property WHERE %1 = ? ORDER BY ord").arg(folio_ref)); p.bind({id}); while (p.next()) props.appendChild(entry(p.value(0), QStringLiteral("name"), p.value(1), p.value(2), QStringLiteral("property"))); - restoreWhitespace(props, values.at(FolioData.size() + 1)); + restoreWhitespace(props, values.at(FolioData.size())); if (!replaceMarker(d, props)) { setError(error, QStringLiteral("folio %1's properties have no place").arg(id)); return false; @@ -831,39 +829,39 @@ bool QetContainerDb::restore(QDomElement project, const QByteArray &database, QS const QString key = keyOf(e, KeyAttribute); if (key.isEmpty()) continue; if (!use(elements_used, key, QStringLiteral("symbol"))) return false; - Statement s(db.m_db, QStringLiteral("SELECT %1, info_at, info_attrs, links_at, links_attrs, %2 FROM element WHERE %3 = ?") + Statement s(db.m_db, QStringLiteral("SELECT %1, info_attrs, links_attrs, %2 FROM element WHERE %3 = ?") .arg(quoted(element_data), folio_ref, item_key)); s.bind({key}); if (!s.next()) { setError(error, QStringLiteral("symbol %1 is not in the database").arg(key)); return false; } - if (s.value(element_data.size() + 4).toString() != id) { + if (s.value(element_data.size() + 2).toString() != id) { setError(error, QStringLiteral("symbol %1 is on folio %2, the database says another").arg(key, id)); return false; } QVariantList v; - for (int i = 0 ; i < element_data.size() + 4 ; ++i) v << s.value(i); + for (int i = 0 ; i < element_data.size() + 2 ; ++i) v << s.value(i); put(e, element_data, v, 0); const int n = element_data.size(); QDomElement info, links; - if (!v.at(n).isNull()) { + if (hasMarker(e, QStringLiteral("elementInformations"))) { info = document.createElement(QStringLiteral("elementInformations")); - setAttributesJson(info, v.at(n + 1)); + setAttributesJson(info, v.at(n)); Statement i(db.m_db, QStringLiteral("SELECT name, value, attrs, %1 FROM element_info WHERE %2 = ? ORDER BY ord") .arg(show_column, element_ref)); i.bind({key}); while (i.next()) info.appendChild(entry(i.value(0), QStringLiteral("name"), i.value(1), i.value(2), QStringLiteral("elementInformation"), i.value(3))); - restoreWhitespace(info, v.at(n + 1)); + restoreWhitespace(info, v.at(n)); } - if (!v.at(n + 2).isNull()) { + if (hasMarker(e, QStringLiteral("links_uuids"))) { links = document.createElement(QStringLiteral("links_uuids")); - setAttributesJson(links, v.at(n + 3)); + setAttributesJson(links, v.at(n + 1)); Statement l(db.m_db, QStringLiteral("SELECT linked_uuid, attrs FROM link WHERE %1 = ? ORDER BY ord").arg(element_ref)); l.bind({key}); while (l.next()) links.appendChild(entry(l.value(0), QStringLiteral("uuid"), QVariant(), l.value(1), QStringLiteral("link_uuid"))); - restoreWhitespace(links, v.at(n + 3)); + restoreWhitespace(links, v.at(n + 1)); } if ((!info.isNull() && !replaceMarker(e, info)) || (!links.isNull() && !replaceMarker(e, links))) { diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 8c9924606..798f29e23 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -1969,6 +1969,16 @@ bool QETDiagramEditor::openAndAddProject( addProject(project); DialogWaiting::dropInstance(); + if (interactive && project->isFromLaterVersion()) { + QET::QetMessageBox::warning( + this, + tr("Opening the file read-only", "message box title"), + tr("This project was saved by a later version of QElectroTech. " + "It is opened read-only, so that saving it cannot lose what " + "this version does not know. Use Save As to keep a copy " + "in this version's format.")); + } + //Report font descriptions which could not be read as-is (written by //an incompatible Qt version or corrupted), so the user learns about //it from somewhere else than the console. See issue #553. diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp index 913bc9b77..fb96ab0e6 100644 --- a/sources/qetproject.cpp +++ b/sources/qetproject.cpp @@ -456,7 +456,8 @@ QETProject::ProjectState QETProject::openFile(QFile *file) // QetContainer::parse() does exactly that, for a .qet and for each part // of a .qetz alike. QString read_error; - if (!QetContainer::readDocument(content, &xml_project, &read_error)) + int container_format = 0; + if (!QetContainer::readDocument(content, &xml_project, &read_error, &container_format)) { qWarning().noquote() << "Unable to read" << fi.fileName() << ":" << read_error; if(opened_here) { @@ -489,9 +490,16 @@ QETProject::ProjectState QETProject::openFile(QFile *file) << xml_parse_ms / 1000.0 << ", content " << (total_ms - xml_parse_ms) / 1000.0 << ")"; - if (!fi.isWritable()) { + //Written by a later QElectroTech that lets this one read it: saving + //here would drop what this version does not know + m_from_later_version = container_format > QetContainer::Format; + if (!fi.isWritable() || m_from_later_version) { setReadOnly(true); } + if (m_from_later_version) { + qInfo().noquote() << QStringLiteral("Project %1 is of .qetz format %2 (this version writes %3): opened read-only") + .arg(fi.fileName()).arg(container_format).arg(QetContainer::Format); + } if(opened_here) { file->close(); } diff --git a/sources/qetproject.h b/sources/qetproject.h index 30da9d1a4..edf054a80 100644 --- a/sources/qetproject.h +++ b/sources/qetproject.h @@ -318,6 +318,8 @@ class QETProject : public QObject bool close(); QETResult write(); bool isReadOnly() const; + /// Opened from a .qetz of a later format (opened read-only) + bool isFromLaterVersion() const {return m_from_later_version;} void setReadOnly(bool); bool isEmpty() const; ElementsLocation importElement(ElementsLocation &location); @@ -462,6 +464,7 @@ class QETProject : public QObject bool m_modified = false; /// Whether the project is read only bool m_read_only = false; + bool m_from_later_version = false; /// Filepath for which this project is considered read only QString read_only_file_path_; /// Default dimensions and properties for new diagrams created within the project diff --git a/tests/qttest/tst_qetcontainer.cpp b/tests/qttest/tst_qetcontainer.cpp index 84e9db31c..a744bd2bc 100644 --- a/tests/qttest/tst_qetcontainer.cpp +++ b/tests/qttest/tst_qetcontainer.cpp @@ -294,6 +294,43 @@ private slots: } // A file whose manifest needs a later reader is refused, not half read + // A later format whose min-reader allows this one opens, and join() says + // it is later: QElectroTech opens it read-only + void laterFormatAllowedRead() + { + QDomDocument original; + QList entries = splitFile(QStringLiteral(QET_EXAMPLES_DIR "/industrial.qet"), &original); + QVERIFY(!entries.isEmpty()); + const int later = QetContainer::Format + 1; + for (QetZip::Entry &e : entries) + if (e.name == QLatin1String("manifest.xml")) + e.data = QString::fromUtf8(e.data).replace(QRegularExpression(QStringLiteral(" format=\"\\d+\"")), + QStringLiteral(" format=\"%1\"").arg(later)).toUtf8(); + alterDatabase(entries, QStringLiteral("UPDATE meta SET value = '%1' WHERE key = 'format'") + .arg(later).toUtf8().constData()); + QDomDocument back; + QString error; + int format = 0; + QVERIFY2(QetContainer::join(entries, &back, &error, &format), qPrintable(error)); + QCOMPARE(format, later); + const QString d = difference(original.documentElement(), back.documentElement(), QString()); + QVERIFY2(d.isEmpty(), qPrintable(d)); + } + + // The database holds data, not where a block sat in the XML: the folio + // file's marker says where it goes back + void noPositionColumns() + { + QDomDocument original; + const QList entries = splitFile(QStringLiteral(QET_EXAMPLES_DIR "/industrial.qet"), &original); + const QByteArray database = entry(entries, QStringLiteral("project.sqlite")); + QCOMPARE(query(database, "SELECT group_concat(name) FROM pragma_table_info('element')"), + QStringLiteral("uuid,folio_uuid,prefix,freezeLabel,info_attrs,links_attrs")); + QCOMPARE(query(database, "SELECT count(*) FROM pragma_table_info('folio') WHERE name LIKE '%_at'"), + QStringLiteral("0")); + QCOMPARE(query(database, "SELECT count(*) FROM meta WHERE key = 'props_at'"), QStringLiteral("0")); + } + void laterFormatRefused() { QDomDocument original; @@ -351,8 +388,8 @@ private slots: QTest::addColumn("sql"); QTest::addColumn("said"); QTest::newRow("symbol row of no symbol") - << QByteArray("INSERT INTO element SELECT 'x', folio_uuid, prefix, freezeLabel, info_at, info_attrs," - " links_at, links_attrs FROM element LIMIT 1") + << QByteArray("INSERT INTO element SELECT 'x', folio_uuid, prefix, freezeLabel, info_attrs," + " links_attrs FROM element LIMIT 1") << QStringLiteral("symbol rows"); QTest::newRow("wire row of no wire") << QByteArray("INSERT INTO conductor SELECT 'x', folio_uuid, element1, terminal1, element2, terminal2,"