Folder import / export is working again

Author: dirkwhoffmann

Core/FileSystems/FSBlock.cpp

@@ -212,9 +212,9 @@ FSBlock::relName(const FSBlock &top) const
 
     for (auto &it : nodes) {
 
+        if (it == &top) break;
         auto name = it->pathName();
         result = name + "/" + result;
-        if (it == &top) break;
     }
 
     return util::trim(result, "/");
@@ -227,6 +227,9 @@ FSBlock::sanitizedPath() const
 
     auto nodes = fs->collect(*this, [](auto *node) { return node->getParentDirBlock(); });
 
+    // Delete the root node
+    if (!nodes.empty()) nodes.pop_back();
+
     for (auto &it : nodes) {
 
         auto name = it->getName().path();

Core/FileSystems/FSBlock.h

@@ -384,12 +384,12 @@ inline std::function<bool(const FSBlock &, const FSBlock &)> dafa = [](const FSB
 
     if ( b1.isDirectory() && !b2.isDirectory()) return true;
     if (!b1.isDirectory() &&  b2.isDirectory()) return false;
-    return b1.pathName() < b2.pathName();
+    return b1.getName() < b2.getName();
 };
 
 inline std::function<bool(const FSBlock &, const FSBlock &)> alpha = [](const FSBlock &b1, const FSBlock &b2) {
 
-    return b1.pathName() < b2.pathName();
+    return b1.getName() < b2.getName();
 };
 
 inline std::function<bool(const FSBlock &, const FSBlock &)> none = nullptr;

Core/FileSystems/FSStorage.cpp

@@ -51,8 +51,7 @@ FSStorage::_dump(Category category, std::ostream &os) const
 
         case Category::Blocks:
 
-            os << tab("Capacity") << numBlocks() << " blocks" << std::endl;
-            os << tab("Block size") << bsize << " bytes" << std::endl;
+            os << tab("Capacity") << numBlocks() << " blocks (x " << bsize << " bytes)" << std::endl;
             os << tab("Hashed blocks") << blocks.size() << std::endl;
             break;
 

Core/FileSystems/FSTree.h

@@ -35,6 +35,7 @@ struct FSTree {
 
     // Traverses the tree and applies a function at each node
     void bfsWalk(std::function<void(const FSTree &)>);
+    void bfsWalkRec(std::function<void(const FSTree &)>);
     void dfsWalk(std::function<void(const FSTree &)>);
 
     void sort(std::function<bool(const FSBlock &,const FSBlock &)>);
@@ -45,9 +46,6 @@ struct FSTree {
 
 private:
 
-
-    void bfsWalkRec(std::function<void(const FSTree &)>);
-
     void listRec(std::ostream &os, const FSOpt &opt) const;
     void listItems(std::ostream &os, const FSOpt &opt) const;
 };

Core/FileSystems/MutableFileSystem.cpp

@@ -55,7 +55,7 @@ MutableFileSystem::init(const FSDescriptor &layout, const fs::path &path)
     if (!path.empty()) {
 
         // Add all files
-        import(root(), path);
+        import(root(), path, true, true);
 
         // Assign device name
         setName(FSName(path.filename().string()));
@@ -862,7 +862,8 @@ MutableFileSystem::exportDirectory(const fs::path &path, bool createDir) const
     auto tree = FSTree(root(), { .recursive = true });
 
     // Export all items
-    tree.bfsWalk([&](const FSTree &t) {
+    tree.bfsWalkRec([&](const FSTree &t) {
+        printf("Node: %s\n", t.node->relName(root()).c_str());
         if (Fault error = t.node->exportBlock(path.c_str()); error != Fault::OK) {
             throw AppError(error);
         }

Core/FileSystems/MutableFileSystem.h

@@ -173,7 +173,7 @@ class MutableFileSystem : public FileSystem {
 
 public:
 
-    // Imports the volume from a buffer compatible with the ADF format
+    // Imports the volume from a buffer compatible with the ADF or HDF format
     void importVolume(const u8 *src, isize size) throws;
 
     // Imports files and folders from the host file system

Core/Misc/RetroShell/Console.h

@@ -90,7 +90,6 @@ class Console : public SubComponent {
 
     // History buffer storing old input strings and cursor positions
     std::vector<std::pair<string,isize>> history;
-
     // The currently active input string
     isize ipos = 0;
 

Core/Misc/RetroShell/DebuggerConsole.cpp

@@ -16,9 +16,12 @@ namespace vamiga {
 void
 DebuggerConsole::_pause()
 {
-    *this << '\n';
-    exec("state");
-    *this << getPrompt();
+    if (retroShell.inDebugShell()) {
+
+        *this << '\n';
+        exec("state");
+        *this << getPrompt();
+    }
 }
 
 string

Core/Misc/RetroShell/NavigatorConsole.cpp

@@ -89,9 +89,11 @@ NavigatorConsole::autoComplete(Tokens &argv)
         if (remaining.size() != 1 || !cmd->autoComplete(argv.back())) {
 
             // If that didn't work, try to auto-complete with a file name
-            auto prefix = autoCompleteFilename(argv.back());
+            try {
+                auto prefix = autoCompleteFilename(argv.back());
+                if (prefix.size() > argv.back().size()) argv.back() = prefix;
 
-            if (prefix.size() > argv.back().size()) argv.back() = prefix;
+            } catch (...) { }
         }
     }
 }
@@ -271,8 +273,11 @@ NavigatorConsole::matchPath(const string &path, Tokens &notFound)
     auto *p = &fs.pwd();
     while (!tokens.empty()) {
 
-        if (p = fs.seekPtr(p, FSName(tokens.front())); !p) { break; }
+        auto *next = fs.seekPtr(p, FSName(tokens.front()));
+        if (!next) break;
+
         tokens.erase(tokens.begin());
+        p = next;
     }
     notFound = tokens;
 
@@ -915,6 +920,7 @@ NavigatorConsole::initCommands(RSCommand &root)
         }
     });
 
+    /* TODO: IMPLEMENT IT! (DO NOT DELETE)
     root.add({
 
         .tokens = { "block", "import" },
@@ -942,6 +948,7 @@ NavigatorConsole::initCommands(RSCommand &root)
             os << "Not implemented, yet!" << '\n';
         }
     });
+    */
 
     RSCommand::currentGroup = "Modify";
 

Core/Misc/RetroShell/RetroShell.cpp

@@ -67,12 +67,17 @@ RetroShell::enterConsole(isize nr)
     // Enter Leave tracking mode
     nr == 1 ? emulator.trackOn(1) : emulator.trackOff(1);
 
-    // Print the welcome message if entered the first time
-    if (current->isEmpty()) { current->exec("welcome"); *this << current->getPrompt(); }
+    if (current->isEmpty()) {
+
+        // Print the welcome message if entered the first time
+        current->exec("welcome"); *this << current->getPrompt();
+
+    } else {
+
+        // Otherwise, print the summary message
+        current->summary();
+    }
 
-    // Print the summary message
-    current->summary();
-    
     // Update prompt
     *this << '\r' << current->getPrompt();
 
@@ -320,20 +325,6 @@ RetroShell::press(RSKey key, bool shift)
 
         switch(key) {
 
-            /*
-            case RSKey::UP:
-            case RSKey::PAGE_UP:
-
-                asyncExec("..");
-                return;
-
-            case RSKey::DOWN:
-            case RSKey::PAGE_DOWN:
-
-                asyncExec(".");
-                return;
-            */
-                
             case RSKey::TAB:
 
                 // asyncExec(".");