#1717 backlinks: fix duplicate item issue

Signed-off-by: Patrizio Bekerle <[email protected]>

Author: pbek

CHANGELOG.md

@@ -1,5 +1,8 @@
 # QOwnNotes Changelog
 
+## 24.9.4
+- An issue with the **backlink widget** showing duplicate items panel was fixed
+  (for [#1717](https://github.com/pbek/QOwnNotes/issues/1717))
 ## 24.9.3
 - In the **backlink widget** and the automatic link transformation, when notes are
   renamed, now relative links with `/` and urlencoded `/` (as `%2F`) are both supported

src/entities/note.cpp

@@ -3144,9 +3144,9 @@ BacklinkHit Note::findAndReturnBacklinkHit(const QString &text, const QString &p
     return text.contains(pattern) ? BacklinkHit(pattern, pattern) : BacklinkHit("", "");
 }
 
-QList<BacklinkHit> Note::findAndReturnBacklinkHit(const QString &text,
-                                                  const QRegularExpression &regex) {
-    QList<BacklinkHit> backlinkHits;
+QSet<BacklinkHit> Note::findAndReturnBacklinkHit(const QString &text,
+                                                 const QRegularExpression &regex) {
+    QSet<BacklinkHit> backlinkHits;
     QRegularExpressionMatchIterator iterator = regex.globalMatch(text);
 
     while (iterator.hasNext()) {
@@ -3155,7 +3155,7 @@ QList<BacklinkHit> Note::findAndReturnBacklinkHit(const QString &text,
         QString linkUrl = match.captured(2);
         // Do something with the link text and URL
 
-        backlinkHits.append(BacklinkHit(match.captured(0), match.captured(1)));
+        backlinkHits.insert(BacklinkHit(match.captured(0), match.captured(1)));
     }
 
     return backlinkHits;
@@ -3180,12 +3180,12 @@ void Note::addTextToBacklinkNoteHashIfFound(const Note &note, const QRegularExpr
         if (!_backlinkNoteHash.contains(note)) {
             _backlinkNoteHash.insert(note, backlinkHits);
         } else {
-            _backlinkNoteHash[note] << backlinkHits;
+            _backlinkNoteHash[note] = backlinkHits;
         }
     }
 }
 
-QHash<Note, QList<BacklinkHit>> Note::findReverseLinkNotes() {
+QHash<Note, QSet<BacklinkHit>> Note::findReverseLinkNotes() {
     const QVector<int> noteIdList = this->findLinkedNoteIds();
     const int noteCount = noteIdList.count();
 
@@ -3501,15 +3501,15 @@ bool Note::handleNoteMoving(const Note &oldNote) {
     return noteIdList.contains(_id);
 }
 
-QList<Note> Note::findBacklinks() const {
+QSet<Note> Note::findBacklinks() const {
     const QVector<int> noteIdList = this->findLinkedNoteIds();
     const int noteCount = noteIdList.count();
 
     if (noteCount == 0) {
         return {};
     }
 
-    QList<Note> notes;
+    QSet<Note> notes;
 
     for (const int noteId : noteIdList) {
         const Note linkedNote = Note::fetch(noteId);

src/entities/note.h

@@ -4,6 +4,7 @@
 #include <utils/misc.h>
 
 #include <QDateTime>
+#include <QSet>
 
 class Bookmark;
 class CommandSnippet;
@@ -19,10 +20,20 @@ struct BacklinkHit {
 
     bool isEmpty() const noexcept { return markdown.isEmpty() && text.isEmpty(); }
 
+    // Add operator== for comparison
+    bool operator==(const BacklinkHit &other) const {
+        return markdown == other.markdown && text == other.text;
+    }
+
     QString markdown;
     QString text;
 };
 
+// Add hash function for BacklinkHit
+inline uint qHash(const BacklinkHit &hit, uint seed = 0) {
+    return qHash(hit.markdown, seed) ^ qHash(hit.text, seed);
+}
+
 #define NOTE_TEXT_ENCRYPTION_PRE_STRING "<!-- BEGIN ENCRYPTED TEXT --"
 #define NOTE_TEXT_ENCRYPTION_POST_STRING "-- END ENCRYPTED TEXT -->"
 #define BOTAN_SALT "Gj3%36/SmPoe12$snNAs-A-_.),?faQ1@!f32"
@@ -370,9 +381,9 @@ class Note {
 
     static bool applyIgnoredNotesSetting(QStringList &fileNames);
 
-    QList<Note> findBacklinks() const;
+    QSet<Note> findBacklinks() const;
 
-    QHash<Note, QList<BacklinkHit>> findReverseLinkNotes();
+    QHash<Note, QSet<BacklinkHit>> findReverseLinkNotes();
 
    protected:
     int _id;
@@ -394,7 +405,7 @@ class Note {
     int _shareId;
     unsigned int _sharePermissions;
     bool _hasDirtyData;
-    QHash<Note, QList<BacklinkHit>> _backlinkNoteHash;
+    QHash<Note, QSet<BacklinkHit>> _backlinkNoteHash;
 
     static QRegularExpression getEncryptedNoteTextRegularExpression();
     QString getEncryptedNoteText() const;
@@ -406,8 +417,8 @@ class Note {
     void restoreCreatedDate();
 
     static BacklinkHit findAndReturnBacklinkHit(const QString &text, const QString &pattern);
-    static QList<BacklinkHit> findAndReturnBacklinkHit(const QString &text,
-                                                       const QRegularExpression &regex);
+    static QSet<BacklinkHit> findAndReturnBacklinkHit(const QString &text,
+                                                      const QRegularExpression &regex);
 
     void addTextToBacklinkNoteHashIfFound(const Note &note, const QString &pattern);
     void addTextToBacklinkNoteHashIfFound(const Note &note, const QRegularExpression &pattern);

src/widgets/backlinkwidget.cpp

@@ -60,12 +60,12 @@ void BacklinkWidget::onItemClicked(QTreeWidgetItem *current, int column) {
  */
 void BacklinkWidget::findBacklinks(Note note) {
     clear();
-    QHash<Note, QList<BacklinkHit>> reverseLinkNotes = note.findReverseLinkNotes();
+    auto reverseLinkNotes = note.findReverseLinkNotes();
 
     // Iterate over reverseLinkNotes
     for (auto it = reverseLinkNotes.begin(); it != reverseLinkNotes.end(); ++it) {
         const Note &backlinkNote = it.key();
-        const QList<BacklinkHit> &linkTextList = it.value();
+        const QSet<BacklinkHit> &linkTextList = it.value();
 
         auto *topItem = new QTreeWidgetItem();