Work on Consoles (Added Console::summary())

Author: dirkwhoffmann

Core/FileSystems/FileSystem.cpp

@@ -479,7 +479,7 @@ FileSystem::numUnallocated() const noexcept
 std::vector<u32>
 FileSystem::serializeBitmap() const
 {
-    require_formatted();
+    if (!isFormatted()) return {};
 
     auto longwords = ((numBlocks() - 2) + 31) / 32;
     std::vector<u32> result;

Core/Misc/RetroShell/CommanderConsole.cpp

@@ -32,6 +32,25 @@ CommanderConsole::welcome()
     Console::welcome();
 }
 
+void
+CommanderConsole::summary()
+{
+    std::stringstream ss;
+
+    ss << "Model   Chip    Slow    Fast    Agnus   Denise  ROM" << std::endl;
+    ss << std::setw(8) << std::left << BankMapEnum::key(BankMap(amiga.get(Opt::MEM_BANKMAP)));
+    ss << std::setw(8) << std::left << (std::to_string(amiga.get(Opt::MEM_CHIP_RAM)) + " MB");
+    ss << std::setw(8) << std::left << (std::to_string(amiga.get(Opt::MEM_SLOW_RAM)) + " MB");
+    ss << std::setw(8) << std::left << (std::to_string(amiga.get(Opt::MEM_FAST_RAM)) + " MB");
+    ss << std::setw(8) << std::left << (agnus.isECS() ? "ECS" : "OCS");
+    ss << std::setw(8) << std::left << (denise.isECS() ? "ECS" : "OCS");
+    ss << mem.getRomTraits().title << std::endl;
+
+    *this << vspace{1};
+    *this << ss;
+    *this << vspace{1};
+}
+
 void
 CommanderConsole::printHelp(isize tab)
 {

Core/Misc/RetroShell/Console.h

@@ -215,6 +215,9 @@ class Console : public SubComponent {
     // Prints the welcome message
     virtual void welcome() = 0;
 
+    // Prints the status summary
+    virtual void summary() = 0;
+
     // Prints the help line
     virtual void printHelp(isize tab = 0);
 
@@ -364,6 +367,7 @@ class CommanderConsole final : public Console
     void _pause() override;
     string getPrompt() override;
     void welcome() override;
+    void summary() override;
     void printHelp(isize tab = 0) override;
     void pressReturn(bool shift) override;
 };
@@ -380,6 +384,7 @@ class DebuggerConsole final : public Console
     void _pause() override;
     string getPrompt() override;
     void welcome() override;
+    void summary() override;
     void printHelp(isize tab = 0) override;
     void pressReturn(bool shift) override;
 };
@@ -398,14 +403,12 @@ class NavigatorConsole final : public Console
     void _pause() override;
     string getPrompt() override;
     void welcome() override;
+    void summary() override;
     void printHelp(isize tab = 0) override;
     void pressReturn(bool shift) override;
     void autoComplete(Tokens &argv) override;
     void help(std::ostream &os, const string &argv, isize tabs) override;
     string autoCompleteFilename(const string &input) const;
-    // std::vector<string> autoCompleteFilename(const string &input) const;
-    // std::vector<string> autoCompleteFilename(const string &path, const string &input) const;
-    // std::vector<string> autoCompleteFilename(const FSBlock *root, const string &input) const;
 
     //
     // Parsing input
@@ -427,7 +430,6 @@ class NavigatorConsole final : public Console
     FSBlock &matchPath(const Arguments &argv, const string &token, Tokens &notFound);
     FSBlock &matchPath(const Arguments &argv, const string &token, Tokens &notFound, FSBlock &fallback);
     FSBlock &matchPath(const string &path, Tokens &notFound);
-
 };
 
 }

Core/Misc/RetroShell/DebuggerConsole.cpp

@@ -43,6 +43,18 @@ DebuggerConsole::welcome()
     Console::welcome();
 }
 
+void
+DebuggerConsole::summary()
+{
+    std::stringstream ss;
+
+    amiga.dump(Category::Current, ss);
+
+    *this << vspace{1};
+    *this << ss;
+    *this << vspace{1};
+}
+
 void
 DebuggerConsole::printHelp(isize tab)
 {

Core/Misc/RetroShell/NavigatorConsole.cpp

@@ -49,6 +49,18 @@ NavigatorConsole::welcome()
     Console::welcome();
 }
 
+void
+NavigatorConsole::summary()
+{
+    std::stringstream ss;
+
+    fs.dump(Category::Info, ss);
+
+    *this << vspace{1};
+    *this << ss;
+    *this << vspace{1};
+}
+
 void
 NavigatorConsole::printHelp(isize tab)
 {

Core/Misc/RetroShell/RetroShell.cpp

@@ -70,6 +70,9 @@ RetroShell::enterConsole(isize nr)
     // Print the welcome message if entered the first time
     if (current->isEmpty()) { current->exec("welcome"); *this << current->getPrompt(); }
 
+    // Print the summary message
+    current->summary();
+    
     // Update prompt
     *this << '\r' << current->getPrompt();