Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recursively load components #920

Merged
merged 4 commits into from
Oct 24, 2024
Merged

Conversation

myudev
Copy link
Contributor

@myudev myudev commented Apr 22, 2024

Easily done QoL change for people who want to structure their components, if there's a config switch needed for whatever reason or any other reason to not do this comment kty <3

@Y-Less
Copy link
Collaborator

Y-Less commented Apr 23, 2024

Have you tested how this works with the include/exclude fields? Would doing "exclude": [ "subdir/component" ] work? What about "exclude": [ "subdir\component" ] or even "exclude": [ "subdir" ]? Same for "include".

@AmyrAhmady
Copy link
Member

There's no include, and I believe we should rename "exclude" as well because it's not self explanatory. there is "components" to explicitly load specified components only and nothing else

@myudev
Copy link
Contributor Author

myudev commented Apr 23, 2024

Have you tested how this works with the include/exclude fields? Would doing "exclude": [ "subdir/component" ] work? What about "exclude": [ "subdir\component" ] or even "exclude": [ "subdir" ]? Same for "include".

I kept original behaviour to not break people servers suddenly as the exclude option only checks the filename not extension or path and I couldn't find any documentation. However if wanted I could add an option to detect folder paths in exclude, so u can also exclude whole subfolders

@Y-Less
Copy link
Collaborator

Y-Less commented Apr 23, 2024

There's no include, and I believe we should rename "exclude" as well because it's not self explanatory. there is "components" to explicitly load specified components only and nothing else

"components" is the one I meant.

@Hual
Copy link
Collaborator

Hual commented Sep 24, 2024

diff --git a/Server/Source/core_impl.hpp b/Server/Source/core_impl.hpp
index be8b3671..692c4886 100644
--- a/Server/Source/core_impl.hpp
+++ b/Server/Source/core_impl.hpp
@@ -1091,13 +1091,18 @@ private:
                                {
                                        if (excludeCfg && !excludeCfg->empty())
                                        {
-                                               p.replace_extension("");
+                                               ghc::filesystem::path rel = ghc::filesystem::relative(p, path);
+                                               rel.replace_extension();
                                                // Is this in the "don't load" list?
-                                               if (std::find(excludeCfg->begin(), excludeCfg->end(), p.filename().string()) != excludeCfg->end())
+                                               const auto isExcluded = [rel = std::move(rel)](const String& exclude)
+                                               {
+                                                       return ghc::filesystem::path(exclude) == rel;
+                                               };
+                                               if (std::find_if(excludeCfg->begin(), excludeCfg->end(), isExcluded)
+                                                       != excludeCfg->end())
                                                {
                                                        continue;
                                                }
-                                               p.replace_extension(LIBRARY_EXT);
                                        }

                                        IComponent* component = loadComponent(p);

Here's a diff that allows sub-directories for exclude

@Hual Hual merged commit 596ece7 into openmultiplayer:master Oct 24, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants