PXI: Return proper "not found" error for titles that may not be present

This allows us to drop the ugly placeholder title workaround.

Author: neobrain

source/gui-sdl/main.cpp

@@ -310,15 +310,6 @@ if (bootstrap_nand) // Experimental system bootstrapper
         std::filesystem::copy(  settings.get<Settings::PathImmutableDataDir>() + "/nand/title", content_dir,
                                 std::filesystem::copy_options::skip_existing | std::filesystem::copy_options::recursive);
 
-        // Initial system setup requires title 0004001000022400 to be present.
-        // Normally, this is the Camera app, which isn't bundled in game update
-        // partitions. Since the setup only reads the ExeFS icon that aren't
-        // specific to the Camera app (likely to perform general checks), we
-        // use the Download Play app as a drop-in replacement if needed.
-        if (!std::filesystem::exists(content_dir / "00040010/00022400")) {
-            std::filesystem::copy(content_dir / "00040010/00022100", content_dir / "00040010/00022400", std::filesystem::copy_options::recursive);
-        }
-
         std::filesystem::create_directories(content_dir / "ro/sys");
         std::filesystem::create_directories(content_dir / "rw/sys");
         std::filesystem::create_directories(content_dir / "twlp");

source/processes/pxi_fs.cpp

@@ -605,8 +605,25 @@ class ArchiveProgramDataFromTitleId : public Archive {
             throw Mikage::Exceptions::Invalid("Invalid sub file type {}", sub_file_type);
         }
 
-        auto sub_file = OpenNCCHSubFile(thread, program_info, content_id, sub_file_type, std::basic_string_view<uint8_t> { path.data() + 0xc, 8 }, gamecard);
-        return std::make_pair(RESULT_OK, std::move(sub_file));
+        try {
+            auto sub_file = OpenNCCHSubFile(thread, program_info, content_id, sub_file_type, std::basic_string_view<uint8_t> { path.data() + 0xc, 8 }, gamecard);
+            return std::make_pair(RESULT_OK, std::move(sub_file));
+        } catch (const std::runtime_error& err) {
+            if (std::string_view { err.what() }.starts_with("Tried to access non-existing title")) {
+                // Report "not found" for some specific titles that may be
+                // probed by system titles but which won't be present after
+                // NAND bootstrap from gamecard update partitions.
+                // 0x4001000022400: Camera app, probed during initial system setup
+                // 0x4003000009d02: Internet Browser, probed by HOME Menu on system version 9.2.0
+                // 0x400300000ba02: In-app Miiverse posting applet, probed by HOME Menu on system versions >= 10.5.0
+                if (program_info.program_id == 0x4001000022400 ||
+                    program_info.program_id == 0x4003000009d02 ||
+                    program_info.program_id == 0x400300000ba02) {
+                    return std::make_pair(0xc8804478, std::unique_ptr<File> { });
+                }
+            }
+            throw;
+        }
     }
 
 public:
@@ -676,8 +693,7 @@ static std::tuple<Result, uint64_t> OpenFile(FakeThread& thread, Context& contex
     std::unique_ptr<File> file;
     std::tie(result,file) = archive->OpenFile(thread, common_path);
     if (result != RESULT_OK) {
-        thread.GetLogger()->error("Failed to get file open handler");
-        thread.CallSVC(&OSImpl::SVCBreak, OSImpl::BreakReason::Panic);
+        return std::make_tuple(result, 0);
     }
 
     // TODO: Respect flags & ~0x4 ... in particular, write/read-only!