Fix file tag fetching for files in sync folders that have non-root remote target

src/gui/filedetails/filedetails.cpp

@@ -12,7 +12,7 @@
  * for more details.
  */
 
 #include <QDateTime>
 
 #include "accountstate.h"
 #include "filedetails.h"
@@ -61,25 +61,26 @@
     _fileWatcher.addPath(localPath);
     connect(&_fileWatcher, &QFileSystemWatcher::fileChanged, this, &FileDetails::refreshFileDetails);
 
-    const auto folder = FolderMan::instance()->folderForPath(_localPath);
-    if (!folder) {
+    _folder = FolderMan::instance()->folderForPath(_localPath);
+    if (!_folder) {
         qCWarning(lcFileDetails) << "No folder found for path:" << _localPath << "will not load file details.";
         return;
     }
 
-    const auto file = _localPath.mid(folder->cleanPath().length() + 1);
+    const auto file = _localPath.mid(_folder->cleanPath().length() + 1);
 
-    if (!folder->journalDb()->getFileRecord(file, &_fileRecord)) {
+    if (!_folder->journalDb()->getFileRecord(file, &_fileRecord)) {
         qCWarning(lcFileDetails) << "Invalid file record for path:"
                                  << _localPath
                                  << "will not load file details.";
     }
 
     _filelockState = _fileRecord._lockstate;
     updateLockExpireString();
-    updateFileTagModel(folder);
 
-    _sharingAvailable = folder->accountState()->account()->capabilities().shareAPI();
+    const auto account = _folder->accountState()->account();
+    _sharingAvailable = account->capabilities().shareAPI();
+    updateFileTagModel(account);
 
     Q_EMIT fileChanged();
 }
@@ -167,16 +168,10 @@
     return _fileTagModel.get();
 }
 
-void FileDetails::updateFileTagModel(const Folder * const folder)
+void FileDetails::updateFileTagModel(const AccountPtr &account)
 {
-    Q_ASSERT(folder);
-    const auto account = folder->accountState()->account();
-    Q_ASSERT(account);
-
-    const auto serverRelPath = QString(folder->remotePathTrailingSlash() + name());
-
-    _fileTagModel = std::make_unique<FileTagModel>(serverRelPath, account);
+    _fileTagModel = std::make_unique<FileTagModel>(_fileRecord, _folder, account);
     Q_EMIT fileTagModelChanged();
 }
 
 bool FileDetails::sharingAvailable() const

src/gui/filedetails/filedetails.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
 #include <QFileInfo>
 #include <QFileSystemWatcher>
 #include <QLocale>
 #include <QTimer>
@@ -66,13 +66,14 @@
 private slots:
     void refreshFileDetails();
     void updateLockExpireString();
-    void updateFileTagModel(const OCC::Folder * const folder);
+    void updateFileTagModel(const OCC::AccountPtr &account);
 
 private:
     QString _localPath;
 
     QFileInfo _fileInfo;
     QFileSystemWatcher _fileWatcher;
+    Folder *_folder = nullptr;
     SyncJournalFileRecord _fileRecord;
     SyncJournalFileLockInfo _filelockState;
     QByteArray _numericFileId;

src/gui/filetagmodel.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) 2023 by Claudio Cambra <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,13 +20,21 @@
 
 namespace OCC {
 
-FileTagModel::FileTagModel(const QString &serverRelativePath,
+FileTagModel::FileTagModel(const SyncJournalFileRecord &fileRecord,
+                           const Folder * const syncFolder,
                            const AccountPtr &account,
                            QObject * const parent)
     : QAbstractListModel(parent)
-    , _serverRelativePath(serverRelativePath)
     , _account(account)
 {
+    _serverRelativePath = syncFolder->remotePathTrailingSlash() + fileRecord.path();
+
+    if (const auto vfsMode = syncFolder->vfs().mode(); fileRecord.isVirtualFile() && vfsMode == Vfs::WithSuffix) {
+        if (const auto suffix = syncFolder->vfs().fileSuffix(); !suffix.isEmpty() && _serverRelativePath.endsWith(suffix)) {
+            _serverRelativePath.chop(suffix.length());
+        }
+    }
+
     fetchFileTags();
 }
 

src/gui/filetagmodel.h

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) 2023 by Claudio Cambra <[email protected]>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -14,8 +14,10 @@
 
 #pragma once
 
 #include <QAbstractListModel>
 
+#include "common/syncjournalfilerecord.h"
+#include "gui/folder.h"
 #include "libsync/account.h"
 
 namespace OCC {
@@ -31,7 +33,10 @@
     Q_PROPERTY(QString overflowTagsString READ overflowTagsString NOTIFY overflowTagsStringChanged)
 
 public:
-    explicit FileTagModel(const QString &serverRelativePath, const AccountPtr &account, QObject * const parent = nullptr);
+    explicit FileTagModel(const SyncJournalFileRecord &fileRecord,
+                          const Folder *const syncFolder,
+                          const AccountPtr &account,
+                          QObject *const parent = nullptr);
 
     [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

src/gui/folder.h

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Duncan Mac-Vicar P. <[email protected]>
  * Copyright (C) by Daniel Molkentin <[email protected]>
  * Copyright (C) by Klaas Freitag <[email protected]>
@@ -17,7 +17,7 @@
 #ifndef MIRALL_FOLDER_H
 #define MIRALL_FOLDER_H
 
 #include "syncresult.h"
 #include "progressdispatcher.h"
 #include "common/syncjournaldb.h"
 #include "networkjobs.h"
@@ -223,11 +223,11 @@
     void setIgnoreHiddenFiles(bool ignore);
 
     // Used by the Socket API
-    SyncJournalDb *journalDb() { return &_journal; }
-    SyncEngine &syncEngine() { return *_engine; }
-    Vfs &vfs() { return *_vfs; }
+    SyncJournalDb *journalDb() const { return &_journal; }
+    SyncEngine &syncEngine() const { return *_engine; }
+    Vfs &vfs() const { return *_vfs; }
 
-    RequestEtagJob *etagJob() { return _requestEtagJob; }
+    RequestEtagJob *etagJob() const { return _requestEtagJob; }
     std::chrono::milliseconds msecSinceLastSync() const { return std::chrono::milliseconds(_timeSinceLastSyncDone.elapsed()); }
     std::chrono::milliseconds msecLastSyncDuration() const { return _lastSyncDuration; }
     int consecutiveFollowUpSyncs() const { return _consecutiveFollowUpSyncs; }