mo2/modorganizer-plugin_python
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-plugin_python.git synced 2026-07-27 14:03:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from Holt59/moddatachecker

Browse Source 
Minor updates following changes in uibase.
This commit is contained in:
Al
2020-05-23 14:07:30 -07:00
committed by GitHub
parent bfad575467 a3b593f714
commit 65003ef4ad
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runner/pythonrunner.cpp
+6 -8
View File
@@ -301,13 +301,11 @@ BOOST_PYTHON_MODULE(mobase)
// .def("getTree", static_cast<std::shared_ptr<IFileTree>(FileTreeEntry::*)()>(&FileTreeEntry::astree))
.def("name", &FileTreeEntry::name)
.def("suffix", &FileTreeEntry::suffix)
.def("time", &FileTreeEntry::time)
.def("parent", static_cast<std::shared_ptr<IFileTree>(FileTreeEntry::*)()>(&FileTreeEntry::parent), "[optional]")
.def("path", &FileTreeEntry::path, bpy::arg("sep") = "\\")
.def("pathFrom", &FileTreeEntry::pathFrom, bpy::arg("sep") = "\\")
// Mutable operation:
.def("setTime", &FileTreeEntry::setTime)
.def("detach", &FileTreeEntry::detach)
.def("moveTo", &FileTreeEntry::moveTo)
@@ -361,13 +359,13 @@ BOOST_PYTHON_MODULE(mobase)
// addFile() and addDirectory throws exception instead of returning null pointer in order
// to have better traces.
.def("addFile", +[](IFileTree* w, QString name, QDateTime time) {
auto result = w->addFile(name, time);
.def("addFile", +[](IFileTree* w, QString name) {
auto result = w->addFile(name);
if (result == nullptr) {
throw std::logic_error("addFile failed");
}
return result;
}, bpy::arg("time") = QDateTime())
})
.def("addDirectory", +[](IFileTree* w, QString name) {
auto result = w->addDirectory(name);
if (result == nullptr) {
@@ -887,11 +885,11 @@ BOOST_PYTHON_MODULE(moprivate)
FileTree(std::shared_ptr<const IFileTree> parent, QString name, callback_t callback) :
FileTreeEntry(parent, name), IFileTree(), m_Callback(callback){ }
std::shared_ptr<FileTreeEntry> addFile(QString name, QDateTime time) override {
std::shared_ptr<FileTreeEntry> addFile(QString name) override {
if (m_Callback && !m_Callback(name, false)) {
throw UnsupportedOperationException("File rejected by callback.");
}
return IFileTree::addFile(name, time);
return IFileTree::addFile(name);
}
std::shared_ptr<IFileTree> addDirectory(QString name) override {
@@ -907,7 +905,7 @@ BOOST_PYTHON_MODULE(moprivate)
return std::make_shared<FileTree>(parent, name, m_Callback);
}
void doPopulate(std::shared_ptr<const IFileTree> parent, std::vector<std::shared_ptr<FileTreeEntry>>& entries) const override { }
bool doPopulate(std::shared_ptr<const IFileTree> parent, std::vector<std::shared_ptr<FileTreeEntry>>& entries) const override { return true; }
std::shared_ptr<IFileTree> doClone() const override { return std::make_shared<FileTree>(nullptr, name(), m_Callback); }
private: