[filemanager] Add errorType property to the file manager's model. Con…

…tributes to JB#44462
sailfishos · Jan 26, 2021 · dc1478e · dc1478e
1 parent 9f3bb82
commit dc1478e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/plugin/filemodel.cpp b/src/plugin/filemodel.cpp
@@ -324,6 +324,15 @@ void FileModel::setActive(bool active)
                             : ActiveChanged);
 }
 
+void FileModel::setErrorType(Error errorType)
+{
+    if (m_errorType == errorType)
+        return;
+
+    m_errorType = errorType;
+    emit errorTypeChanged();
+}
+
 QString FileModel::appendPath(QString pathName)
 {
     return QDir::cleanPath(QDir(m_path).absoluteFilePath(pathName));
@@ -469,15 +478,17 @@ void FileModel::readAllEntries()
     QDir dir(directory());
     if (!dir.exists()) {
         qmlInfo(this) << "Path " << dir.path() << " not found";
+        setErrorType(ErrorNotExist);
         return;
     }
 
     if (euidaccess(dir.path(), R_OK) == -1) {
         qmlInfo(this) << "No permissions to access " << dir.path();
-        emit error(ErrorReadNoPermissions, dir.path());
+        setErrorType(ErrorReadNoPermissions);
         return;
     }
 
+    setErrorType(NoError);
     m_absolutePath = dir.absolutePath();
     m_directory = dir.isRoot() ? QStringLiteral("/") : dir.dirName();
     m_parentPath = dir.isRoot() ? QString() : QDir::cleanPath(dir.absoluteFilePath(QStringLiteral("..")));
@@ -494,15 +505,15 @@ void FileModel::refreshEntries()
         QDir dir(directory());
         if (!dir.exists()) {
             clearModel();
-
+            setErrorType(ErrorNotExist);
             qmlInfo(this) << "Path " << dir.path() << " not found";
             return;
         }
 
         if (euidaccess(dir.path(), R_OK) == -1) {
             clearModel();
             qmlInfo(this) << "No permissions to access " << dir.path();
-            emit error(ErrorReadNoPermissions, dir.path());
+            setErrorType(ErrorReadNoPermissions);
             return;
         }
 
@@ -515,6 +526,7 @@ void FileModel::refreshEntries()
 #endif
     }
 
+    setErrorType(NoError);
     recountSelectedFiles();
 
     if (m_files.count() != oldCount) {

diff --git a/src/plugin/filemodel.h b/src/plugin/filemodel.h
@@ -60,6 +60,7 @@ class FileModel : public QAbstractListModel
     Q_PROPERTY(QString absolutePath READ absolutePath NOTIFY pathChanged)
     Q_PROPERTY(QString directoryName READ directoryName NOTIFY pathChanged)
     Q_PROPERTY(QString parentDirectoryName READ parentDirectoryName NOTIFY pathChanged)
+    Q_PROPERTY(Error errorType READ errorType NOTIFY errorTypeChanged)
     Q_PROPERTY(Sort sortBy READ sortBy WRITE setSortBy NOTIFY sortByChanged)
     Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder NOTIFY sortOrderChanged)
     Q_PROPERTY(Qt::CaseSensitivity caseSensitivity READ caseSensitivity WRITE setCaseSensitivity NOTIFY caseSensitivityChanged)
@@ -82,7 +83,8 @@ class FileModel : public QAbstractListModel
 public:
     enum Error {
         NoError,
-        ErrorReadNoPermissions
+        ErrorReadNoPermissions,
+        ErrorNotExist
     };
 
     enum Sort {
@@ -114,6 +116,9 @@ class FileModel : public QAbstractListModel
     QString directoryName() const { return m_directory; }
     QString parentDirectoryName() const { return m_parentPath; }
 
+    Error errorType() const { return m_errorType; }
+    void setErrorType(Error type);
+
     Sort sortBy() const { return m_sortBy; }
     void setSortBy(Sort sortBy);
 
@@ -189,7 +194,7 @@ public slots:
     void countChanged();
     void activeChanged();
     void selectedCountChanged();
-    void error(Error error, QString fileName);
+    void errorTypeChanged();
 
 private slots:
     void readDirectory();
@@ -232,6 +237,7 @@ private slots:
     QString m_absolutePath;
     QString m_directory;
     QString m_parentPath;
+    Error m_errorType;
     Sort m_sortBy;
     DirectorySort m_directorySort;
     Qt::SortOrder m_sortOrder;