FileSystemWatcher added

engine/includes/adapters/handlers/defaultfilehandler.h

@@ -46,7 +46,11 @@ class DefaultFileHandler : public FileHandler {
 
     bool remove(const char *path) override {
         try {
-            return std::filesystem::remove(path);
+            if(isDir(path)) {
+                return std::filesystem::remove_all(path);
+            } else {
+                return std::filesystem::remove(path);
+            }
         } catch (const std::filesystem::filesystem_error &) {
             return false;
         }

engine/includes/editor/baseassetprovider.h

@@ -1,40 +1,37 @@
 #ifndef BASEASSETPROVIDER_H
 #define BASEASSETPROVIDER_H
 
-#include <QObject>
-
 #include <engine.h>
 
-class QFileSystemWatcher;
+class FileSystemWatcher;
+
+class ENGINE_EXPORT BaseAssetProvider : public Object {
+    A_OBJECT(BaseAssetProvider, Object, Core)
+
+    A_METHODS(
+        A_SLOT(BaseAssetProvider::onFileChanged),
+        A_SLOT(BaseAssetProvider::onDirectoryChanged)
+    )
 
-class ENGINE_EXPORT BaseAssetProvider : public QObject {
-    Q_OBJECT
 public:
     BaseAssetProvider();
-
     ~BaseAssetProvider();
 
-    void init();
+    void init(bool force);
 
     void renameResource(const TString &source, const TString &destination);
     void removeResource(const TString &source);
     void duplicateResource(const TString &source);
 
-    void cleanupBundle();
-
-protected:
-    bool copyRecursively(const TString &sourceFolder, const TString &destFolder);
-
-public slots:
-    void onFileChanged(const QString &path);
-    void onFileChangedForce(const QString &path, bool force = false);
+public: // slots
+    void onFileChanged(const TString &path);
+    void onFileChangedForce(const TString &path, bool force = false);
 
-    void onDirectoryChanged(const QString &path);
-    void onDirectoryChangedForce(const QString &path, bool force = false);
+    void onDirectoryChanged(const TString &path);
+    void onDirectoryChangedForce(const TString &path, bool force = false);
 
 private:
-    QFileSystemWatcher *m_dirWatcher;
-    QFileSystemWatcher *m_fileWatcher;
+    FileSystemWatcher *m_dirWatcher;
 
 };
 

engine/src/editor/assetmanager.cpp

@@ -119,7 +119,6 @@ void AssetManager::rescan() {
 
     TString target = m_projectManager->targetPath();
     if(target.isEmpty()) {
-
         bool update = m_projectManager->projectSdk() != SDK_VERSION;
         if(update) {
             getChangedUUIDs();
@@ -128,24 +127,11 @@ void AssetManager::rescan() {
         Engine::resourceSystem()->unloadBundle(TString());
         m_force |= !Engine::resourceSystem()->loadBundle(TString());
         m_force |= update;
-
-        m_assetProvider->init();
     } else {
         m_force = true;
     }
 
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/materials").data(),m_force);
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/textures").data(), m_force);
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/meshes").data(),   m_force);
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/pipelines").data(),m_force);
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/engine/fonts").data(),    m_force);
-#ifndef BUILDER
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/materials").data(),m_force);
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/gizmos").data(),   m_force);
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/meshes").data(),   m_force);
-    m_assetProvider->onDirectoryChangedForce((m_projectManager->resourcePath() + "/editor/textures").data(), m_force);
-#endif
-    m_assetProvider->onDirectoryChangedForce(m_projectManager->contentPath().data(), m_force);
+    m_assetProvider->init(m_force);
 
     Engine::resourceSystem()->setCleanImport(m_force);
 
@@ -175,7 +161,7 @@ TString AssetManager::assetTypeName(const TString &source) {
 }
 
 bool AssetManager::pushToImport(const TString &source) {
-    m_assetProvider->onFileChangedForce(source.data(), true);
+    m_assetProvider->onFileChangedForce(source, true);
     return true;
 }
 
@@ -601,7 +587,13 @@ void AssetManager::onPerform() {
             }
         }
 
-        m_assetProvider->cleanupBundle();
+        // Cleanup bundle
+        for(auto &path : File::list(ProjectSettings::instance()->importPath())) {
+            TString fileName(Url(path).name());
+            if(!File::isDir(path) && fileName != gIndex && uuidToPath(fileName).isEmpty()) {
+                File::remove(path);
+            }
+        }
 
         auto tmp = m_indices;
         for(auto &index : tmp) {