6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Reinstates SDL error message; adds expansion of ~.

Browse Source
This commit is contained in:
Thomas Harte 2021-06-04 21:53:56 -04:00
parent 64931e476d
commit ccd82591aa
4 changed files with 117 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Machines/Utility/ROMCatalogue.cpp
View File

@ -96,6 +96,44 @@ bool Request::Node::validate(Map &map) const {
return (type == Type::Any && has_any) || (type == Type::All && has_all);
}
void Request::visit(
const std::function<void(ListType)> &enter_list,
const std::function<void(void)> &exit_list,
const std::function<void(ROM::Request::ListType, const ROM::Description &, bool, size_t)> &add_item
) const {
node.visit(enter_list, exit_list, add_item);
}
void Request::Node::visit(
const std::function<void(ListType)> &enter_list,
const std::function<void(void)> &exit_list,
const std::function<void(ROM::Request::ListType type, const ROM::Description &, bool is_optional, size_t remaining)> &add_item
) const {
switch(type) {
case Type::One:
enter_list(ListType::Single);
add_item(ROM::Request::ListType::Any, Description(name), is_optional, 0);
exit_list();
break;
case Type::Any:
case Type::All: {
const ListType list_type = type == Type::Any ? ListType::Any : ListType::All;
enter_list(list_type);
for(size_t index = 0; index < children.size(); index++) {
auto &child = children[index];
if(child.type == Type::One) {
add_item(list_type, Description(child.name), child.is_optional, children.size() - 1 - index);
} else {
child.visit(enter_list, exit_list, add_item);
}
}
exit_list();
} break;
}
}
std::optional<Description> Description::from_crc(uint32_t crc32) {
for(int name = 1; name <= SpectrumPlus3; name++) {
const Description candidate = Description(ROM::Name(name));

14
Machines/Utility/ROMCatalogue.hpp
View File

@ -163,6 +163,15 @@ struct Request {
std::vector<Description> all_descriptions() const;
enum class ListType {
Any, All, Single
};
void visit(
const std::function<void(ListType)> &enter_list,
const std::function<void(void)> &exit_list,
const std::function<void(ROM::Request::ListType type, const ROM::Description &, bool is_optional, size_t remaining)> &add_item
) const;
private:
struct Node {
enum class Type {
@ -178,6 +187,11 @@ struct Request {
void add_descriptions(std::vector<Description> &) const;
bool validate(Map &) const;
void visit(
const std::function<void(ListType)> &enter_list,
const std::function<void(void)> &exit_list,
const std::function<void(ROM::Request::ListType type, const ROM::Description &, bool is_optional, size_t remaining)> &add_item
) const;
};
Node node;

12
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
View File

@ -56,6 +56,14 @@
argument = "/Users/thomasharte/Downloads/test-dsk-for-rw-and-50-60-hz/TEST-RW-60Hz.DSK"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "--rompath=~/ROMs"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "--has-disk-drive"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Desktop/Soft/Macintosh/MusicWorks 0.42.image&quot;"
isEnabled = "NO">
@ -106,7 +114,7 @@
</CommandLineArgument>
<CommandLineArgument
argument = "--rompath=/Users/thomasharte/Projects/CLK/ROMImages"
isEnabled = "YES">
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "--help"
@ -117,7 +125,7 @@
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "--new=oric"
argument = "--new=msx"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>

67
OSBindings/SDL/main.cpp
View File

@ -707,11 +707,20 @@ int main(int argc, char *argv[]) {
const auto rompath = arguments.selections.find("rompath");
if(rompath != arguments.selections.end()) {
if(rompath->second.back() != '/') {
paths.push_back(rompath->second + "/");
} else {
paths.push_back(rompath->second);
std::string path = rompath->second;
// Ensure the path ends in a slash.
if(path.back() != '/') {
path += '/';
}
// If ~ is present, expand it to %HOME%.
const size_t tilde_position = path.find("~");
if(tilde_position != std::string::npos) {
path.replace(tilde_position, 1, getenv("HOME"));
}
paths.push_back(path);
}
ROM::Map results;
@ -764,11 +773,33 @@ int main(int argc, char *argv[]) {
if(!machine) {
switch(error) {
default: break;
case ::Machine::Error::MissingROM:
/* std::cerr << "Could not find system ROMs; please install to /usr/local/share/CLK/ or /usr/share/CLK/, or provide a --rompath." << std::endl;
std::cerr << "One or more of the following was needed but not found:" << std::endl;
for(const auto &rom: requested_roms) {
std::cerr << rom.machine_name << '/' << rom.file_name << " (";
case ::Machine::Error::MissingROM: {
std::cerr << "Could not find system ROMs; please install to /usr/local/share/CLK/ or /usr/share/CLK/, or provide a --rompath, e.g. --rompath=~/ROMs." << std::endl;
std::cerr << "Needed ";
int indentation_level = 0;
const auto indent = [&indentation_level] {
if(indentation_level) {
std::cerr << std::endl;
for(int c = 0; c < indentation_level; c++) std::cerr << '\t';
std::cerr << "* ";
}
};
requested_roms.visit([&indentation_level, indent] (ROM::Request::ListType type) {
indent();
switch(type) {
default:
case ROM::Request::ListType::All: std::cerr << "all of:"; break;
case ROM::Request::ListType::Any: std::cerr << "any of:"; break;
}
++indentation_level;
}, [&indentation_level] {
--indentation_level;
}, [&indentation_level, indent] (ROM::Request::ListType type, const ROM::Description &rom, bool is_optional, size_t remaining) {
indent();
if(is_optional) std::cerr << "optionally, ";
std::cerr << rom.machine_name << '/' << rom.file_names[0] << " (";
if(!rom.descriptive_name.empty()) {
std::cerr << rom.descriptive_name << "; ";
}
@ -779,17 +810,27 @@ int main(int argc, char *argv[]) {
is_first = false;
std::cerr << std::hex << std::setfill('0') << std::setw(8) << crc32;
}
std::cerr << ")" << std::endl;
std::cerr << ")";
if(remaining) {
std::cerr << ";";
if(remaining == 1) {
std::cerr << ((type == ROM::Request::ListType::All) ? " and" : " or");
}
std::cerr << std::endl << "Tried specifically: ";
} else {
std::cerr << ".";
}
});
std::cerr << std::endl << std::endl << "Searched unsuccessfully: ";
bool is_first = true;
for(const auto &path: checked_paths) {
if(!is_first) std::cerr << "; ";
std::cerr << path;
is_first = false;
}
std::cerr << std::endl;*/
break;
std::cerr << std::endl;
} break;
}
return EXIT_FAILURE;