Improve monorepo discovery

Protect against parent directories containing Unreal Engine source code without
the current directory being part of a monorepo setup.

Author: samhocevar

nimp/environment.py

@@ -335,9 +335,9 @@ def validate_uproject(self, urpoject):
     def display_unreal_info(self):
         ''' display engine and selected uproject info '''
         if hasattr(self, 'unreal_full_version') and hasattr(self, 'unreal_dir'):
-            logging.info(f'Found Unreal engine {self.unreal_full_version} in {self.unreal_dir}')
+            logging.info(f'Found Unreal Engine {self.unreal_full_version} in {self.unreal_dir}')
         else:
-            logging.info('No Unreal engine loaded')
+            logging.info('No Unreal Engine found')
         if hasattr(self, 'uproject') and hasattr(self, 'uproject_dir'):
             logging.info(f'Found Unreal project {self.uproject} in {self.uproject_dir}')
         else:

nimp/unreal.py

@@ -47,15 +47,18 @@ def load_config(env):
     unreal_base_paths = [
         'UnrealEngine',
         'UE4',
-        '',
+        '.',
     ]
-    for unreal_path in unreal_base_paths:
-        unreal_dir = nimp.system.find_dir_containing_file(os.path.join(unreal_path, unreal_file))
-        if unreal_dir:
-            unreal_dir = os.path.join(unreal_dir, unreal_path)
-            break
-
-    if not unreal_dir:
+    for base in unreal_base_paths:
+        path_to_base = nimp.system.find_dir_containing_file(os.path.join(base, unreal_file))
+        if not path_to_base:
+            continue
+        # Sanity check: if `base` indicates a monorepo setup, check that it is really one
+        if base != '.' and not os.path.isfile(os.path.join(path_to_base, '.nimp/monorepo_commands/__init__.py')):
+            continue
+        unreal_dir = os.path.join(path_to_base, base)
+        break
+    finally:
         env.is_unreal = env.is_ue4 = env.is_ue5 = False
         env.is_dne_legacy_ue4 = True
         return True