Skip to content

Play your Steam library's Windows games on a jailbroken PS5.

C++

Find imported games on every USB drive slot

Leonardo Lobato147cd1da6467
diff --git a/src/homebrew/simulation.cpp b/src/homebrew/simulation.cpp
index 16d88d3..3f569dc 100644
--- a/src/homebrew/simulation.cpp
+++ b/src/homebrew/simulation.cpp
@@ -749,9 +749,10 @@ void replay_organization_delta(playden::OrganizationSnapshot& base,
}
// The Import sheet's drive groups, in the order it lists them (ImportRoots' volume ids).
-constexpr std::array<std::pair<const char*, const char*>, 5> kImportGroups = {{
- {"usb0", "USB drive"}, {"usb1", "USB drive 2"}, {"m2", "M.2 SSD"}, {"extended", "Extended storage"},
- {"internal", "Console drop folder"}}};
+constexpr std::array<std::pair<const char*, const char*>, 11> kImportGroups = {{
+ {"usb0", "USB drive"}, {"usb1", "USB drive 2"}, {"usb2", "USB drive 3"}, {"usb3", "USB drive 4"},
+ {"usb4", "USB drive 5"}, {"usb5", "USB drive 6"}, {"usb6", "USB drive 7"}, {"usb7", "USB drive 8"},
+ {"m2", "M.2 SSD"}, {"extended", "Extended storage"}, {"internal", "Console drop folder"}}};
constexpr const char* kImportEmptyText =
"Copy game folders into playden/import on an exFAT drive, or into /data/playden-import over FTP, then choose "
"Look for games.";
diff --git a/src/homebrew/view.cpp b/src/homebrew/view.cpp
index 762ac0b..3056759 100644
--- a/src/homebrew/view.cpp
+++ b/src/homebrew/view.cpp
@@ -3385,8 +3385,9 @@ class Render::Impl
if (installation == nullptr && external != state.external_games.end())
{
static const std::map<std::string, std::string> drives = {
- {"usb0", "USB drive"}, {"usb1", "USB drive 2"}, {"m2", "M.2 SSD"}, {"extended", "Extended storage"},
- {"internal", "Console drop folder"}};
+ {"usb0", "USB drive"}, {"usb1", "USB drive 2"}, {"usb2", "USB drive 3"}, {"usb3", "USB drive 4"},
+ {"usb4", "USB drive 5"}, {"usb5", "USB drive 6"}, {"usb6", "USB drive 7"}, {"usb7", "USB drive 8"},
+ {"m2", "M.2 SSD"}, {"extended", "Extended storage"}, {"internal", "Console drop folder"}};
const auto drive = drives.find(external->volume_id);
location = drive == drives.end() ? external->volume_id : drive->second;
if (!external->available)
diff --git a/src/installs/install_service.h b/src/installs/install_service.h
index f912e78..29aa00c 100644
--- a/src/installs/install_service.h
+++ b/src/installs/install_service.h
@@ -41,7 +41,7 @@ struct InstallRequest {
// move <local game> move an imported game from the drop folder into Playden
// move <app id> <volume> move an installed Steam game to another drive (an install volume id)
// import <volume> <folder> <program> add a game playing in place (volume: internal, m2, extended,
-// usb0, usb1; folder: a name in that drive's import folder, or a
+// usb0 to usb7; folder: a name in that drive's import folder, or a
// path from the drive's root; program: inside the folder)
// <game> is a Steam app ID (strict decimal) or "local-<uuid>". Words are separated by spaces or tabs;
// a word with spaces goes in double quotes ("Old School Rally"), which can't hold a quote themselves.
diff --git a/src/runtime/writable_folders.cpp b/src/runtime/writable_folders.cpp
index d1e355a..27bdc07 100644
--- a/src/runtime/writable_folders.cpp
+++ b/src/runtime/writable_folders.cpp
@@ -37,7 +37,7 @@ mode_t RepairMode(const std::filesystem::path& folder, const std::filesystem::pa
const auto relative = folder.lexically_relative(namespace_root).generic_string();
if (relative == "data/playden" || relative == "data/homebrew") return 01777;
if (relative == "data/playden-games" || relative == "data/playden-import") return 0777;
- for (const auto* volume : {"ext0", "ext1", "usb0", "usb1"})
+ for (const auto* volume : {"ext0", "ext1", "usb0", "usb1", "usb2", "usb3", "usb4", "usb5", "usb6", "usb7"})
for (const auto* folder : {"/playden/games", "/playden/import"})
if (relative == std::string("mnt/") + volume + folder) return 0777;
return 0;
diff --git a/src/steam/install_volumes.cpp b/src/steam/install_volumes.cpp
index 356b33f..e2e4a1a 100644
--- a/src/steam/install_volumes.cpp
+++ b/src/steam/install_volumes.cpp
@@ -20,7 +20,8 @@ namespace playden::steam {
namespace {
std::string ExternalRoot(const std::string& path) {
- for (const auto* root : {"/mnt/ext0", "/mnt/ext1", "/mnt/usb0", "/mnt/usb1"}) {
+ for (const auto* root : {"/mnt/ext0", "/mnt/ext1", "/mnt/usb0", "/mnt/usb1", "/mnt/usb2", "/mnt/usb3", "/mnt/usb4",
+ "/mnt/usb5", "/mnt/usb6", "/mnt/usb7"}) {
const std::size_t length = std::strlen(root);
if (path.compare(0, length, root) == 0 &&
(path.size() == length || path[length] == '/')) return root;
@@ -171,6 +172,12 @@ std::vector<VolumeCandidate> ConsoleVolumeCandidates(const std::string& title_ro
{"extended", "Extended storage", "/mnt/ext0", "/mnt/ext0/playden/games", true},
{"usb0", "USB drive", "/mnt/usb0", "/mnt/usb0/playden/games", true},
{"usb1", "USB drive 2", "/mnt/usb1", "/mnt/usb1/playden/games", true},
+ {"usb2", "USB drive 3", "/mnt/usb2", "/mnt/usb2/playden/games", true},
+ {"usb3", "USB drive 4", "/mnt/usb3", "/mnt/usb3/playden/games", true},
+ {"usb4", "USB drive 5", "/mnt/usb4", "/mnt/usb4/playden/games", true},
+ {"usb5", "USB drive 6", "/mnt/usb5", "/mnt/usb5/playden/games", true},
+ {"usb6", "USB drive 7", "/mnt/usb6", "/mnt/usb6/playden/games", true},
+ {"usb7", "USB drive 8", "/mnt/usb7", "/mnt/usb7/playden/games", true},
};
}
diff --git a/src/stores/local/import_store.h b/src/stores/local/import_store.h
index 7801c22..425a09c 100644
--- a/src/stores/local/import_store.h
+++ b/src/stores/local/import_store.h
@@ -2,7 +2,7 @@
// imports.json: the Windows games the player added from a drive or the drop folder, and the ones
// they removed (so adding the same folder again brings back its ID, bottle and settings).
//
-// A game is named by `volume` (an install volume ID: internal, m2, extended, usb0, usb1) and
+// A game is named by `volume` (an install volume ID: internal, m2, extended, usb0 to usb7) and
// `folder`, relative to that volume's mount (scanner.h ImportRoots): "playden/import/Delores" on
// usb0 is /mnt/usb0/playden/import/Delores; the drop folder's games are volume "internal",
// folder "playden-import/<name>" (/data/playden-import/<name>). The store never touches the game
diff --git a/src/stores/local/scanner.cpp b/src/stores/local/scanner.cpp
index f1724ab..615743a 100644
--- a/src/stores/local/scanner.cpp
+++ b/src/stores/local/scanner.cpp
@@ -287,6 +287,12 @@ const std::vector<ImportRoot>& ImportRoots() {
{"extended", "/mnt/ext0", "playden/import"},
{"usb0", "/mnt/usb0", "playden/import"},
{"usb1", "/mnt/usb1", "playden/import"},
+ {"usb2", "/mnt/usb2", "playden/import"},
+ {"usb3", "/mnt/usb3", "playden/import"},
+ {"usb4", "/mnt/usb4", "playden/import"},
+ {"usb5", "/mnt/usb5", "playden/import"},
+ {"usb6", "/mnt/usb6", "playden/import"},
+ {"usb7", "/mnt/usb7", "playden/import"},
};
return roots;
}
diff --git a/tests/local_scanner_test.cpp b/tests/local_scanner_test.cpp
index d02f866..cb9a467 100644
--- a/tests/local_scanner_test.cpp
+++ b/tests/local_scanner_test.cpp
@@ -256,7 +256,9 @@ void ImportRootListsChildFolders() {
CHECK(scan.folders == (std::vector<std::string>{"A Game", "B Game"}));
CHECK(ScanImportRoot("relative").status == ScanStatus::kUnsupported);
CHECK(ScanImportRoot((import / "loose.exe").string()).status == ScanStatus::kNotFolder);
- CHECK(ImportRoots().size() == 5 && std::string(ImportRoots()[0].volume) == "internal");
+ CHECK(ImportRoots().size() == 11 && std::string(ImportRoots()[0].volume) == "internal");
+ // A drive with an EFI partition takes a slot for it, so a game partition can land past usb1.
+ CHECK(std::string(ImportRoots().back().volume) == "usb7" && std::string(ImportRoots().back().mount) == "/mnt/usb7");
}
void HelperRules() {