From 949965009b9a35849aabc7bc14df83343efec4b8 Mon Sep 17 00:00:00 2001 From: maj00r Date: Mon, 19 Oct 2026 16:21:55 +0200 Subject: [PATCH] fix(editor): the templates looked for in the background from the start, the panels don't wait for them The include bank read every .inc of the scenery directory on the first use, on the main thread: opening the switch panel or selecting a switch stopped the editor until all of them were read, which on a large scenery directory under Windows takes long. The bank now starts looking as the editor starts, in the background, and the main thread only reads the descriptions once the files are read. - the switch drives, turntables and signals are read again from the bank when it changes; the panels show "Looking for the templates..." meanwhile, only the edits which need the templates wait for them - the sweep tool takes the templates from the bank instead of looking through the scenery directory again - a folder linked into one of its own subfolders no longer leads the walk in circles - the log tells how many templates were found and how long it took --- application/editormode.cpp | 6 + application/editormode.h | 14 +- application/editormodeselftestsignal.cpp | 1 + application/editormodesignal.cpp | 24 ++-- application/editormodesweep.cpp | 53 +++++--- application/editormodeswitchdrive.cpp | 31 +++-- application/editormodetrack.cpp | 7 +- application/editormodeturntable.cpp | 31 +++-- application/editoruipanels.cpp | 19 +-- editor/editorIncludeInfo.cpp | 162 +++++++++++++++++++---- editor/editorIncludeInfo.hpp | 18 ++- lang/editor_pl.po | 3 + 12 files changed, 275 insertions(+), 94 deletions(-) diff --git a/application/editormode.cpp b/application/editormode.cpp index 1e0c27ee..1e2eadc7 100644 --- a/application/editormode.cpp +++ b/application/editormode.cpp @@ -1286,6 +1286,12 @@ bool editor_mode::update() // bindings are matched with the objects by their locations, before anything gets moved if (false == m_bindings_loaded && simulation::is_ready) infra_load(); + // the templates are looked for in the background from the start, for the tools to have them at hand + if (simulation::is_ready) + { + EditorIncludes.start(); + EditorIncludes.poll(); + } auto const deltarealtime = Timer::GetDeltaRenderTime(); diff --git a/application/editormode.h b/application/editormode.h index 746c5cdf..0acdf196 100644 --- a/application/editormode.h +++ b/application/editormode.h @@ -1152,7 +1152,7 @@ class editor_mode : public application_mode, private editor_track::observer bool preferred{false}; }; std::vector drives; - bool drives_scanned{false}; + int drives_revision{-1}; // of the include bank the drives were read from int drive{-1}; int drive_side{0}; struct slide_state @@ -1231,7 +1231,8 @@ class editor_mode : public application_mode, private editor_track::observer void switch_slide_update(); void switch_slide_finish(); void draw_switch_slide() const; - void scan_switch_drives(); + // reads the drives from the include bank once it changes; Wait: for the templates being looked for. true if it read them + bool scan_switch_drives(bool Wait = true); std::string switch_name_for_new() const; bool place_switch_drive(TTrack &Switch); bool flip_switch_drive(TTrack &Switch); @@ -1264,7 +1265,7 @@ class editor_mode : public application_mode, private editor_track::observer struct turntable_tool { std::vector templates; - bool scanned{false}; + int revision{-1}; // of the include bank the templates were read from int chosen{-1}; char name[64]{}; bool placing{false}; @@ -1290,7 +1291,7 @@ class editor_mode : public application_mode, private editor_track::observer std::string error; }; turntable_tool m_turntable; - void scan_turntables(); + bool scan_turntables(bool Wait = true); std::string turntable_name_for_new() const; bool turntable_read(TTrack *Table); std::vector turntable_includes(TTrack const &Table); @@ -1833,7 +1834,7 @@ class editor_mode : public application_mode, private editor_track::observer int family{-1}; int index{0}; }; - std::optional find_switch_drive(TTrack const &Switch); + std::optional find_switch_drive(TTrack const &Switch, bool Wait = true); std::string missing_drive_variant(int const Family, bool const Rightswitch, bool const Driveright) const; bool replace_switch_drive(TTrack &Switch, int Family, bool Flip); void apply_switch_drive_choice(TTrack &Switch); @@ -2058,7 +2059,7 @@ class editor_mode : public application_mode, private editor_track::observer std::string status; }; signal_tool m_signal; - void signal_scan(); + bool signal_scan(bool Wait = true); signal_template const *signal_armed() const; signal_template const *signal_template_of(std::string const &File) const; bool signal_spot_at(TTrack &Track, int const Path, glm::dvec3 const &Point, glm::dvec3 const &Cursor, int const Facing, int const Side, signal_template const &Template, signal_spot &Spot) const; @@ -2091,6 +2092,7 @@ class editor_mode : public application_mode, private editor_track::observer char search[64]{}; std::vector models; bool scanned{false}; + int revision{-1}; // of the include bank the templates were taken from // parameters of a template laid along the track, with their names std::string parameters_for; std::vector> parameters; diff --git a/application/editormodeselftestsignal.cpp b/application/editormodeselftestsignal.cpp index 7d706ac9..dac9c63d 100644 --- a/application/editormodeselftestsignal.cpp +++ b/application/editormodeselftestsignal.cpp @@ -61,6 +61,7 @@ editor_mode::selftest_result editor_mode::selftest_signal(std::string const &com values[pair.substr(0, equals)] = pair.substr(equals + 1); } show_track_tab(track_tab::signals); + signal_scan(); signal_refresh(true); auto &tool{m_signal}; auto const standing_named = [&](std::string const &Name) -> signal_standing const * { diff --git a/application/editormodesignal.cpp b/application/editormodesignal.cpp index 91d1097f..1fb56425 100644 --- a/application/editormodesignal.cpp +++ b/application/editormodesignal.cpp @@ -214,13 +214,15 @@ void draw_signal_icon(ImDrawList *Draw, ImVec2 const Origin, ImVec2 const Size, } // namespace -void editor_mode::signal_scan() +bool editor_mode::signal_scan(bool const Wait) { auto &tool{m_signal}; - if (false == EditorIncludes.scanned()) - EditorIncludes.scan(); - if (tool.revision == EditorIncludes.revision()) - return; + if (Wait) + EditorIncludes.wait(); + else + EditorIncludes.start(); + if (false == EditorIncludes.scanned() || tool.revision == EditorIncludes.revision()) + return false; tool.revision = EditorIncludes.revision(); std::string chosen[kKindCount]; for (int i = 0; i < kKindCount; ++i) @@ -280,6 +282,7 @@ void editor_mode::signal_scan() } tool.chosen[i] = best; } + return true; } editor_mode::signal_template const *editor_mode::signal_armed() const @@ -346,9 +349,9 @@ std::string editor_mode::signal_intent_label(signal_template const &Template, si void editor_mode::signal_refresh(bool const Force) { auto &tool{m_signal}; - signal_scan(); + auto const scanned{signal_scan(false)}; auto const now{ImGui::GetTime()}; - if (false == Force && tool.standing_history == m_history.size() && tool.standing_redo == g_redo.size() && now - tool.standing_time < kRefreshPeriod) + if (false == Force && false == scanned && tool.standing_history == m_history.size() && tool.standing_redo == g_redo.size() && now - tool.standing_time < kRefreshPeriod) return; tool.standing_history = m_history.size(); tool.standing_redo = g_redo.size(); @@ -893,7 +896,12 @@ void editor_mode::render_signal_selected() void editor_mode::render_signal_ui() { auto &tool{m_signal}; - signal_scan(); + signal_scan(false); + if (tool.templates.empty() && EditorIncludes.searching()) + { + ImGui::TextDisabled("%s", STR_C("Looking for the templates...")); + return; + } if (tool.templates.empty()) { ImGui::TextWrapped("%s", STR_C("No signal templates: no template of the scenery directory is described with category: signal. tools/editor/signal_headers.py writes the descriptions into the signal templates.")); diff --git a/application/editormodesweep.cpp b/application/editormodesweep.cpp index 8b817798..f34f6c01 100644 --- a/application/editormodesweep.cpp +++ b/application/editormodesweep.cpp @@ -137,31 +137,40 @@ std::string lower(std::string Text) void editor_mode::sweep_scan_models() { auto &tool{m_sweep}; - if (tool.scanned) + EditorIncludes.start(); + auto changed{false}; + if (false == tool.scanned) + { + tool.scanned = true; + changed = true; + std::error_code error; + for (auto const &entry : std::filesystem::recursive_directory_iterator("models", std::filesystem::directory_options::skip_permission_denied, error)) + { + if (false == entry.is_regular_file(error)) + continue; + auto const extension{lower(entry.path().extension().string())}; + if (extension != ".e3d" && extension != ".t3d") + continue; + auto name{std::filesystem::relative(entry.path(), "models", error).generic_string()}; + name.erase(name.size() - extension.size()); + tool.models.push_back(name); + } + } + // the templates come from the include bank, which looks through the scenery directory in the background + if (EditorIncludes.scanned() && tool.revision != EditorIncludes.revision()) + { + tool.revision = EditorIncludes.revision(); + std::erase_if(tool.models, [](std::string const &Model) { return Model.ends_with(".inc"); }); + for (auto const &entry : EditorIncludes.entries()) + tool.models.push_back(entry.file); + changed = true; + } + if (false == changed) return; - tool.scanned = true; - std::error_code error; - std::set found; - for (auto const &entry : std::filesystem::recursive_directory_iterator("models", std::filesystem::directory_options::skip_permission_denied, error)) - { - if (false == entry.is_regular_file(error)) - continue; - auto const extension{lower(entry.path().extension().string())}; - if (extension != ".e3d" && extension != ".t3d") - continue; - auto name{std::filesystem::relative(entry.path(), "models", error).generic_string()}; - name.erase(name.size() - extension.size()); - found.insert(name); - } - for (auto const &entry : std::filesystem::recursive_directory_iterator("scenery", std::filesystem::directory_options::skip_permission_denied, error)) - { - if (entry.is_regular_file(error) && lower(entry.path().extension().string()) == ".inc") - found.insert(std::filesystem::relative(entry.path(), "scenery", error).generic_string()); - } - tool.models.assign(found.begin(), found.end()); + std::sort(tool.models.begin(), tool.models.end()); + tool.models.erase(std::unique(tool.models.begin(), tool.models.end()), tool.models.end()); } - void editor_mode::sweep_curve() { auto &tool{m_sweep}; diff --git a/application/editormodeswitchdrive.cpp b/application/editormodeswitchdrive.cpp index af3eb6ec..f692c2fa 100644 --- a/application/editormodeswitchdrive.cpp +++ b/application/editormodeswitchdrive.cpp @@ -77,15 +77,20 @@ double angle_value(std::vector const &Values, std::size_t const Ind } // namespace -void editor_mode::scan_switch_drives() +bool editor_mode::scan_switch_drives(bool const Wait) { auto &tool{m_switch}; - if (tool.drives_scanned) - return; - tool.drives_scanned = true; + if (Wait) + EditorIncludes.wait(); + else + EditorIncludes.start(); + if (false == EditorIncludes.scanned() || tool.drives_revision == EditorIncludes.revision()) + return false; + tool.drives_revision = EditorIncludes.revision(); + // the drive chosen stays chosen, also none + auto const chosen{tool.drive >= 0 && tool.drive < static_cast(tool.drives.size()) ? std::optional{tool.drives[tool.drive].name} : std::nullopt}; + auto const none{false == tool.drives.empty() && tool.drive < 0}; tool.drives.clear(); - if (false == EditorIncludes.scanned()) - EditorIncludes.scan(); for (auto const &entry : EditorIncludes.entries()) { if (entry.category != "switch drive") @@ -111,10 +116,14 @@ void editor_mode::scan_switch_drives() } std::sort(tool.drives.begin(), tool.drives.end(), [](switch_tool::drive_family const &A, switch_tool::drive_family const &B) { return A.name < B.name; }); auto const preferred{std::find_if(tool.drives.begin(), tool.drives.end(), [](switch_tool::drive_family const &Family) { return Family.preferred; })}; - if (tool.drives.empty()) + auto const kept{std::find_if(tool.drives.begin(), tool.drives.end(), [&](switch_tool::drive_family const &Family) { return chosen.has_value() && Family.name == *chosen; })}; + if (tool.drives.empty() || none) tool.drive = -1; + else if (kept != tool.drives.end()) + tool.drive = static_cast(kept - tool.drives.begin()); else tool.drive = preferred != tool.drives.end() ? static_cast(preferred - tool.drives.begin()) : 0; + return true; } void editor_mode::switch_drive_captured(TTrack const &Track) @@ -204,10 +213,10 @@ bool editor_mode::place_switch_drive(TTrack &Switch) return true; } -std::optional editor_mode::find_switch_drive(TTrack const &Switch) +std::optional editor_mode::find_switch_drive(TTrack const &Switch, bool const Wait) { auto const &tool{m_switch}; - scan_switch_drives(); + scan_switch_drives(Wait); std::map, std::less<>> variants; for (int family = 0; family < static_cast(tool.drives.size()); ++family) for (int index = 0; index < 4; ++index) @@ -286,10 +295,10 @@ bool editor_mode::replace_switch_drive(TTrack &Switch, int const Family, bool co bool editor_mode::render_switch_drive_choice() { auto &tool{m_switch}; - scan_switch_drives(); + scan_switch_drives(false); if (tool.drives.empty()) { - ImGui::TextDisabled("%s", STR_C("No switch drive models")); + ImGui::TextDisabled("%s", EditorIncludes.searching() ? STR_C("Looking for the templates...") : STR_C("No switch drive models")); return false; } auto const label = [&](int const Index) { return Index < 0 ? std::string{STR_C("no drive")} : tool.drives[Index].name; }; diff --git a/application/editormodetrack.cpp b/application/editormodetrack.cpp index 509b1b1e..3e9da2f8 100644 --- a/application/editormodetrack.cpp +++ b/application/editormodetrack.cpp @@ -410,11 +410,10 @@ void editor_mode::show_track_tab(track_tab const Wanted) profile_open_run(*track); break; case track_tab::turntable: - scan_turntables(); + scan_turntables(false); turntable_read(track); break; case track_tab::signals: - signal_scan(); signal_refresh(true); break; default: @@ -982,7 +981,9 @@ void editor_mode::render_turnout_ui() ImGui::PushID(&Switch); if (set.has_value()) ImGui::TextUnformatted(Switch.name().c_str()); - if (auto const drive{find_switch_drive(Switch)}) + if (false == EditorIncludes.scanned()) + ImGui::TextDisabled("%s", STR_C("Looking for the templates...")); + else if (auto const drive{find_switch_drive(Switch, false)}) { auto const family{drive->family}; auto const variant{drive->index}; diff --git a/application/editormodeturntable.cpp b/application/editormodeturntable.cpp index c571620e..1cc35b63 100644 --- a/application/editormodeturntable.cpp +++ b/application/editormodeturntable.cpp @@ -189,15 +189,18 @@ void label(screen_projection const &Projection, glm::dvec3 const &Point, std::st } // namespace -void editor_mode::scan_turntables() +bool editor_mode::scan_turntables(bool const Wait) { auto &tool{m_turntable}; - if (tool.scanned) - return; - tool.scanned = true; + if (Wait) + EditorIncludes.wait(); + else + EditorIncludes.start(); + if (false == EditorIncludes.scanned() || tool.revision == EditorIncludes.revision()) + return false; + tool.revision = EditorIncludes.revision(); + auto const chosen{tool.chosen >= 0 && tool.chosen < static_cast(tool.templates.size()) ? tool.templates[tool.chosen].file : std::string{}}; tool.templates.clear(); - if (false == EditorIncludes.scanned()) - EditorIncludes.scan(); for (auto const &entry : EditorIncludes.entries()) { if (entry.category != "turntable") @@ -224,7 +227,11 @@ void editor_mode::scan_turntables() tool.templates.push_back(std::move(item)); } std::stable_sort(tool.templates.begin(), tool.templates.end(), [](turntable_template const &A, turntable_template const &B) { return (A.angles > 0) != (B.angles > 0) ? A.angles > 0 : A.name < B.name; }); - tool.chosen = tool.templates.empty() ? -1 : 0; + auto const kept{std::find_if(tool.templates.begin(), tool.templates.end(), [&](turntable_template const &Template) { return Template.file == chosen; })}; + tool.chosen = tool.templates.empty() ? -1 : kept != tool.templates.end() ? static_cast(kept - tool.templates.begin()) : 0; + // the turntable read before points at the templates of before + tool.table = nullptr; + return true; } std::string editor_mode::turntable_name_for_new() const @@ -258,7 +265,7 @@ bool editor_mode::turntable_read(TTrack *Table) tool.status.clear(); tool.error.clear(); } - scan_turntables(); + scan_turntables(false); tool.table = Table; tool.length = length_of(*Table); auto const &path{Table->m_paths.front()}; @@ -794,7 +801,7 @@ editor_mode::track_intent editor_mode::turntable_intent(glm::dvec3 const &Ground return make(kind::select, track == tool.table ? std::string{} : STR("Click: this turntable")); } } - scan_turntables(); + scan_turntables(false); if (tool.chosen < 0) return intent; if (false == Shift) @@ -813,7 +820,7 @@ editor_mode::track_intent editor_mode::turntable_intent(glm::dvec3 const &Ground void editor_mode::render_turntable_ui() { auto &tool{m_turntable}; - scan_turntables(); + scan_turntables(false); auto *selected{selected_track()}; if (tool.table != selected) turntable_read(selected); @@ -979,7 +986,9 @@ void editor_mode::render_turntable_ui() if (selected != nullptr && selected->eType == tt_Table) ImGui::TextColored(warncolour, "%s", STR_C("This turntable can't be read")); ImGui::TextUnformatted(STR_C("New turntable")); - if (tool.templates.empty()) + if (tool.templates.empty() && EditorIncludes.searching()) + ImGui::TextDisabled("%s", STR_C("Looking for the templates...")); + else if (tool.templates.empty()) ImGui::TextColored(warncolour, "%s", STR_C("No turntables: no template is described with category: turntable and its turntable: {length}")); for (int i = 0; i < static_cast(tool.templates.size()); ++i) { diff --git a/application/editoruipanels.cpp b/application/editoruipanels.cpp index 9e986067..ed41bbf7 100644 --- a/application/editoruipanels.cpp +++ b/application/editoruipanels.cpp @@ -867,9 +867,11 @@ void nodebank_panel::render_list(std::vector +#include +#include #include +#include #include +#include #include #include #include @@ -93,12 +98,13 @@ std::string utf8_to_win1250(std::string const &Text) return output; } -bool read_template(std::string const &File, template_text &Text, std::string &Error) +// reads template File from the file at specified location. runs in the background as well, so it leaves the messages to +// the callers +bool read_file(std::filesystem::path const &Path, std::string const &File, template_text &Text) { - std::ifstream input{Global.asCurrentSceneryPath + File, std::ios_base::binary}; + std::ifstream input{Path, std::ios_base::binary}; if (false == input.is_open()) { - Error = format(STR_C("can't open file \"%s\""), File.c_str()); return false; } auto &content{Text.content}; @@ -146,6 +152,16 @@ bool read_template(std::string const &File, template_text &Text, std::string &Er return true; } +bool read_template(std::string const &File, template_text &Text, std::string &Error) +{ + if (false == read_file(Global.asCurrentSceneryPath + File, File, Text)) + { + Error = format(STR_C("can't open file \"%s\""), File.c_str()); + return false; + } + return true; +} + // number of the parameter if specified text holds (pN) placeholder at specified location, 0 otherwise. Length: size of the placeholder int placeholder(std::string const &Text, std::size_t const Location, std::size_t &Length) { @@ -752,16 +768,18 @@ editorIncludeBank EditorIncludes; namespace { -include_entry examine(std::string const &File) +// Text: the template read before, null if its file couldn't be opened +include_entry examine(std::string const &File, template_text const *Text) { include_entry entry; entry.file = File; entry.statement = std::make_shared(editor_includes::directive_mark + File); - template_text text; - if (false == read_template(File, text, entry.issue)) + if (Text == nullptr) { + entry.issue = format(STR_C("can't open file \"%s\""), File.c_str()); return entry; } + auto const &text{*Text}; entry.described = false == text.yaml.empty(); if (false == entry.described) { @@ -779,25 +797,43 @@ include_entry examine(std::string const &File) return entry; } -} // namespace - -void editorIncludeBank::scan() +include_entry examine(std::string const &File) { - // the node bank may hold one of the templates selected, the statements stay in place across the scans - std::unordered_map> statements; - for (auto &entry : m_entries) - { - statements.emplace(entry.file, entry.statement); - } - m_entries.clear(); - m_scanned = true; + template_text text; + std::string error; + auto const read{read_template(File, text, error)}; + return examine(File, read ? &text : nullptr); +} + +// template file found in the background, for examine() to read its description on the main thread +struct found_template +{ + std::string file; + bool read{false}; + template_text text; +}; + +// reads every template in the scenery directory, until told to stop +std::vector find_templates(std::filesystem::path const &Root, std::atomic const &Stop) +{ + std::vector found; std::error_code error; - auto const root{std::filesystem::path(Global.asCurrentSceneryPath)}; + // a folder linked into one of its own subfolders would lead the walk in circles + std::set folders{std::filesystem::canonical(Root, error)}; // NOTE: on an error the iterator turns into the end one. Folders linked into the scenery folder are a part of it auto const options{std::filesystem::directory_options::skip_permission_denied | std::filesystem::directory_options::follow_directory_symlink}; - for (std::filesystem::recursive_directory_iterator file{root, options, error}, end; file != end; file.increment(error)) + for (std::filesystem::recursive_directory_iterator file{Root, options, error}, end; file != end && false == Stop; file.increment(error)) { - if (false == file->is_regular_file(error)) + std::error_code status; + if (file->is_directory(status)) + { + if (auto const folder{std::filesystem::canonical(file->path(), status)}; false == static_cast(status) && false == folders.emplace(folder).second) + { + file.disable_recursion_pending(); + } + continue; + } + if (false == file->is_regular_file(status)) { continue; } @@ -805,7 +841,7 @@ void editorIncludeBank::scan() std::string name; try { - name = ToLower(file->path().lexically_relative(root).generic_string()); + name = ToLower(file->path().lexically_relative(Root).generic_string()); } catch (std::exception const &) { @@ -816,14 +852,94 @@ void editorIncludeBank::scan() { continue; } - m_entries.emplace_back(examine(name)); - if (auto const lookup{statements.find(name)}; lookup != statements.end()) + auto &entry{found.emplace_back()}; + entry.file = name; + entry.read = read_file(file->path(), name, entry.text); + if (entry.text.yaml.empty()) + { + // the rest of the file matters only to the described templates + entry.text = template_text{}; + } + } + return found; +} + +} // namespace + +struct editorIncludeBank::search +{ + std::atomic stop{false}; + std::future> result; + std::chrono::steady_clock::time_point started{std::chrono::steady_clock::now()}; + + ~search() + { + // the result waits for the search to end before it goes + stop = true; + } +}; + +editorIncludeBank::~editorIncludeBank() = default; + +void editorIncludeBank::start() +{ + if (m_scanned || m_search != nullptr) + { + return; + } + rescan(); +} + +void editorIncludeBank::rescan() +{ + if (m_search != nullptr) + { + return; + } + m_search = std::make_shared(); + m_search->result = std::async(std::launch::async, find_templates, std::filesystem::path(Global.asCurrentSceneryPath), std::cref(m_search->stop)); +} + +bool editorIncludeBank::poll() +{ + if (m_search == nullptr || m_search->result.wait_for(std::chrono::seconds(0)) != std::future_status::ready) + { + return false; + } + auto found{m_search->result.get()}; + auto const seconds{std::chrono::duration(std::chrono::steady_clock::now() - m_search->started).count()}; + m_search.reset(); + // the node bank may hold one of the templates selected, the statements stay in place across the scans + std::unordered_map> statements; + for (auto &entry : m_entries) + { + statements.emplace(entry.file, entry.statement); + } + m_entries.clear(); + m_scanned = true; + for (auto const &file : found) + { + m_entries.emplace_back(examine(file.file, file.read ? &file.text : nullptr)); + if (auto const lookup{statements.find(file.file)}; lookup != statements.end()) { m_entries.back().statement = lookup->second; } } std::sort(std::begin(m_entries), std::end(m_entries), [](include_entry const &Left, include_entry const &Right) { return Left.file < Right.file; }); index(); + WriteLog(format("Editor: %zu templates found in the scenery directory in %.1f s, %zu of them described for the editor", m_entries.size(), seconds, + static_cast(std::count_if(std::begin(m_entries), std::end(m_entries), [](include_entry const &Entry) { return Entry.described; })))); + return true; +} + +void editorIncludeBank::wait() +{ + start(); + if (m_search != nullptr) + { + m_search->result.wait(); + poll(); + } } void editorIncludeBank::index() diff --git a/editor/editorIncludeInfo.hpp b/editor/editorIncludeInfo.hpp index f60e2fb3..0f78cd76 100644 --- a/editor/editorIncludeInfo.hpp +++ b/editor/editorIncludeInfo.hpp @@ -114,12 +114,23 @@ struct include_entry class editorIncludeBank { public: - // looks through the scenery directory for the templates, and reads their descriptions - void scan(); + ~editorIncludeBank(); + // starts looking through the scenery directory for the templates in the background, unless they were found already + void start(); + // looks through the scenery directory again in the background, for the templates added or changed outside of the editor + void rescan(); + // takes the templates found in the background once the search is over; true if it took them + bool poll(); + // waits for the templates being looked for, or looks for them if they weren't yet + void wait(); bool scanned() const { return m_scanned; } + bool searching() const + { + return m_search != nullptr; + } std::vector const &entries() const { return m_entries; @@ -138,8 +149,11 @@ class editorIncludeBank } private: + struct search; + void index(); + std::shared_ptr m_search; // under way in the background std::vector m_entries; // sorted by file name std::vector m_ready; bool m_scanned{false}; diff --git a/lang/editor_pl.po b/lang/editor_pl.po index 2d79a2ba..8943ca6c 100644 --- a/lang/editor_pl.po +++ b/lang/editor_pl.po @@ -9862,3 +9862,6 @@ msgstr "Nie dopasowano pasów obok \"%s\": %s" msgid "\"%s\" couldn't be cut for the lanes to change" msgstr "Nie dało się przeciąć \"%s\", żeby zmienić pasy" + +msgid "Looking for the templates..." +msgstr "Szukam szablonów..."