From 6bf4c7a04fc0a7148300e9af24c16a3e11b394b6 Mon Sep 17 00:00:00 2001 From: Project579 Date: Mon, 20 Jun 2022 20:48:06 +0200 Subject: [PATCH] Upgraded "input-file" command line option to Files::MaybeQuotedPath from std::string to allow unicode characters on Windows. --- apps/bsatool/bsatool.cpp | 25 ++++++++++++++----------- apps/esmtool/esmtool.cpp | 8 +++++--- apps/niftest/niftest.cpp | 15 +++++++-------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/apps/bsatool/bsatool.cpp b/apps/bsatool/bsatool.cpp index ad4556ddc6..16c25594c6 100644 --- a/apps/bsatool/bsatool.cpp +++ b/apps/bsatool/bsatool.cpp @@ -8,6 +8,7 @@ #include #include +#include #define BSATOOL_VERSION 1.1 @@ -112,37 +113,39 @@ bool parseOptions (int argc, char** argv, Arguments &info) << desc << std::endl; return false; } - info.filename = variables["input-file"].as< std::vector >()[0]; //TODO(Project579): This will probably break in windows with unicode paths + auto inputFiles = variables["input-file"].as< std::vector >(); + + info.filename = inputFiles[0]; // Default output to the working directory info.outdir = "."; if (info.mode == "extract") { - if (variables["input-file"].as< std::vector >().size() < 2) + if (inputFiles.size() < 2) { std::cout << "\nERROR: file to extract unspecified\n\n" << desc << std::endl; return false; } - if (variables["input-file"].as< std::vector >().size() > 1) - info.extractfile = variables["input-file"].as< std::vector >()[1]; - if (variables["input-file"].as< std::vector >().size() > 2) - info.outdir = variables["input-file"].as< std::vector >()[2]; + if (inputFiles.size() > 1) + info.extractfile = inputFiles[1]; + if (inputFiles.size() > 2) + info.outdir = inputFiles[2]; } else if (info.mode == "add") { - if (variables["input-file"].as< std::vector >().size() < 1) + if (inputFiles.empty()) { std::cout << "\nERROR: file to add unspecified\n\n" << desc << std::endl; return false; } - if (variables["input-file"].as< std::vector >().size() > 1) - info.addfile = variables["input-file"].as< std::vector >()[1]; + if (inputFiles.size() > 1) + info.addfile = inputFiles[1]; } - else if (variables["input-file"].as< std::vector >().size() > 1) - info.outdir = variables["input-file"].as< std::vector >()[1]; + else if (inputFiles.size() > 1) + info.outdir = inputFiles[1]; info.longformat = variables.count("long") != 0; info.fullpath = variables.count("full-path") != 0; diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp index a9971c1867..fa46b4d910 100644 --- a/apps/esmtool/esmtool.cpp +++ b/apps/esmtool/esmtool.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include "record.hpp" #include "labels.hpp" @@ -154,9 +155,10 @@ bool parseOptions (int argc, char** argv, Arguments &info) return false; }*/ - info.filename = variables["input-file"].as< std::vector >()[0]; - if (variables["input-file"].as< std::vector >().size() > 1) - info.outname = variables["input-file"].as< std::vector >()[1]; + const auto inputFiles = variables["input-file"].as< std::vector >(); + info.filename = inputFiles[0]; + if (inputFiles.size() > 1) + info.outname = inputFiles[1]; if (const auto it = variables.find("raw"); it != variables.end()) info.mRawFormat = ESM::parseFormat(it->second.as()); diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp index 60b13ae266..68d5a0f898 100644 --- a/apps/niftest/niftest.cpp +++ b/apps/niftest/niftest.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -66,7 +67,7 @@ void readVFS(std::unique_ptr&& anArchive, const std::filesystem::p } } -bool parseOptions (int argc, char** argv, std::vector& files) +bool parseOptions (int argc, char** argv, std::vector &files) { bpo::options_description desc("Ensure that OpenMW can use the provided NIF and BSA files\n\n" "Usages:\n" @@ -75,7 +76,7 @@ bool parseOptions (int argc, char** argv, std::vector& files) "Allowed options"); desc.add_options() ("help,h", "print help message.") - ("input-file", bpo::value< std::vector >(), "input file") + ("input-file", bpo::value< std::vector >(), "input file") ; //Default option if none provided @@ -96,7 +97,7 @@ bool parseOptions (int argc, char** argv, std::vector& files) } if (variables.count("input-file")) { - files = variables["input-file"].as< std::vector >(); + files = variables["input-file"].as< std::vector >(); return true; } } @@ -114,18 +115,16 @@ bool parseOptions (int argc, char** argv, std::vector& files) int main(int argc, char **argv) { - std::vector files; + std::vector files; if(!parseOptions (argc, argv, files)) return 1; Nif::NIFFile::setLoadUnsupportedFiles(true); // std::cout << "Reading Files" << std::endl; - for(const auto& name : files) + for(const auto& path : files) { try { - const std::filesystem::path path(name); //TODO(Project579): This will probably break in windows with unicode paths - if(isNIF(path)) { //std::cout << "Decoding: " << name << std::endl; @@ -143,7 +142,7 @@ int main(int argc, char **argv) } else { - std::cerr << "ERROR: \"" << path << "\" is not a nif file, bsa file, or directory!" << std::endl; + std::cerr << "ERROR: \"" << path << "\" is not a nif file, bsa file, or directory!" << std::endl; //TODO(Project579): This will probably break in windows with unicode paths } } catch (std::exception& e)