Show all differences of all heads (folders to overlay into a base as a way of patching).

pyenliven/mtpatches.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import os
 import platform
 import shlex
@@ -19,6 +20,7 @@ def echo0(*args, **kwargs):
 DIFF_CMD_PARTS = None
 
 if platform.system() == "Windows":
+    HOME = os.environ['USERPROFILE']
     try_diff = shutil.which("diff")
     # ^ Requires Python 3.3 or later (not 2.7)
     if try_diff is not None:
@@ -26,10 +28,11 @@ if platform.system() == "Windows":
     else:
         DIFF_CMD_PARTS = ["fc"]
 else:
+    HOME = os.environ['HOME']
     DIFF_CMD_PARTS = ["diff"]
 
 
-def diff_only_head(base, head, rel=None, more_1char_args=None, depth=0):
+def diff_only_head(base, head, more_1char_args=None, log_level=0):
     """Compare two directories or files.
 
     Files not in head will not be checked!
@@ -46,10 +49,8 @@ def diff_only_head(base, head, rel=None, more_1char_args=None, depth=0):
         more_1char_args (Union[str,list[str]], optional): args. Defaults
             to "-wb", or if using Windows, then "/W" if diff is not
             present in PATH (in that case, fc is used).
-        rel (str, optional): Leave as None. This will be set
+        log_level (int): How much info to show (-1 to hide output of
-            automatically for recursion.
+            diff command).
-        depth (int, optional): Leave as 0. This will be set
-            automatically for recursion.
 
     Raises:
         FileNotFoundError: If base does not exist (and depth is 0).
@@ -63,6 +64,28 @@ def diff_only_head(base, head, rel=None, more_1char_args=None, depth=0):
         - 'rel': The path relative to head.
         - 'new': True if not in base, otherwise False or not present.
         - 'code': Return code (1 if file in head&base differ)
+
+    """
+    return _diff_only_head(
+        base,
+        head,
+        more_1char_args=more_1char_args,
+        log_level=log_level,
+    )
+
+
+def _diff_only_head(base, head, rel=None, more_1char_args=None, depth=0,
+                    log_level=0):
+    """Compare two directories or files.
+
+    For other documentation see diff_only_head.
+
+    Args:
+        rel (str, optional): Leave as None. This will be set
+            automatically for recursion.
+        depth (int, optional): Leave as 0. This will be set
+            automatically for recursion.
+
     """
     diffs = []
     if not DIFF_CMD_PARTS:
@@ -145,12 +168,13 @@ def diff_only_head(base, head, rel=None, more_1char_args=None, depth=0):
         #   (See docstring).
         for sub in os.listdir(head_path):
             sub_rel = os.path.join(rel, sub) if rel else sub
-            diffs += diff_only_head(
+            diffs += _diff_only_head(
                 base,
                 head,
                 rel=sub_rel,
                 more_1char_args=more_1char_args,
                 depth=depth+1,
+                log_level=log_level,
             )
     else:
         # echo0('base={}:"{}"'.format(whats[0], paths[0]))
@@ -176,10 +200,12 @@ def diff_only_head(base, head, rel=None, more_1char_args=None, depth=0):
         # echo0("\n\n{}".format(shlex.join(cmd_parts)))
         child = subprocess.Popen(cmd_parts, stdout=subprocess.PIPE)
         streamdata = child.communicate()[0]
-        data = streamdata
+        if log_level >= 0:
-        if sys.version_info.major >= 3:
+            # ^ Only -1 should hide diff output itself.
-            data = streamdata.decode(sys.stdout.encoding)
+            data = streamdata
-        print(data)
+            if sys.version_info.major >= 3:
+                data = streamdata.decode(sys.stdout.encoding)
+            print(data)
         rc = child.returncode
         if rc == 0:
             # echo0("^ files are the same")
@@ -194,19 +220,58 @@ def diff_only_head(base, head, rel=None, more_1char_args=None, depth=0):
     return diffs  # folder, so return every sub's diff(s) ([] if None)
 
 
-def get_shallowest_files_sub(root, rel=None, depth=0, log_level=0):
+def get_shallowest_files_sub(root, log_level=0, mask=None, name=None):
     """Get the shallowest folder relative to root that contains file(s).
 
     Args:
         root (str): The folder to check for files recursively.
+            NOTE: "" or paths ending with "." will be converted to a
+            real path (following symlinks if any).
+        log_level (int, optional): 0 for only errors. 1 for info.
+        mask (Union[str,list[str]], optional): Filename or list of
+            filenames to find (None/0/""/False/"*"/[] will match any
+            file). If a folder contains the files, the folder path
+            relative to root will be returned.
+        name (str, optional): What parent folder name to return, or None
+            for any with files (see mask). Defaults to None.
+
+    Returns:
+        str: Get the relative dir that contains file(s) ("" for root,
+            None if not found).
+    """
+    if (root == "") or root.endswith("."):
+        root = os.path.realpath(root)
+    return _get_shallowest_files_sub(
+        root,
+        log_level=log_level,
+        mask=mask,
+        name=name,
+    )
+
+
+def _get_shallowest_files_sub(root, rel=None, depth=0, log_level=0,
+                              mask=None, name=None):
+    """Get the shallowest folder relative to root that contains file(s).
+    See get_shallowest_files_sub for other arguments.
+
+    Args:
         rel (str, optional): Leave blank (set automatically during
             recursion).
         depth (int, optional): Leave as 0 (set automatically during
             recursion).
 
+    Raises:
+        ValueError: root is None
+        ValueError: _description_
+
     Returns:
-        Union(str, None): Get the relative dir that contains file(s).
+        str: Get the relative dir that contains file(s) ("" for root,
+            None if not found).
     """
+    if isinstance(mask, str):
+        if mask == "*":
+            mask = None
+        mask = [mask]
     if root is None:
         raise ValueError("root is {}".format(root))
     if rel and rel.startswith(os.path.sep):
@@ -217,10 +282,18 @@ def get_shallowest_files_sub(root, rel=None, depth=0, log_level=0):
         )
 
     parent = os.path.join(root, rel) if rel else root
+    _, parent_name = os.path.split(parent)
+    # ^ Ok even if rel is used, since split name results in ('', name)
     for sub in os.listdir(parent):
+        if name and (parent_name != name):
+            # Match against the name if name is set by caller.
+            continue
         sub_path = os.path.join(parent, sub)
         if os.path.isfile(sub_path):
-            return rel
+            if (not mask) or (sub in mask):
+                if rel is None:
+                    rel = ""  # found in root, so rel is ""
+                return rel
     # ^ Check *all* subs first, in case dir is listed before file.
     #   The *parent* has file(s), so return parent
     #   (must check if file *before* recursion
@@ -231,26 +304,222 @@ def get_shallowest_files_sub(root, rel=None, depth=0, log_level=0):
             continue
         sub_rel = os.path.join(rel, sub) if rel else sub
         if log_level > 0:
-            echo0("\ndepth={}".format(depth))
+            pass
-            echo0("root:{}".format(root))
+            # echo0("\ndepth={}".format(depth))
-            echo0("+rel:{}".format(rel))
+            # echo0("root:{}".format(root))
-            echo0("=parent:{}".format(parent))
+            # echo0("+rel:{}".format(rel))
-            echo0("sub={}".format(sub))
+            # echo0("=parent:{}".format(parent))
-            echo0("sub_rel={}".format(sub_rel))
+            # echo0("sub={}".format(sub))
-        found_path = get_shallowest_files_sub(
+            # echo0("sub_rel={}".format(sub_rel))
+        found_path = _get_shallowest_files_sub(
             root,
             rel=sub_rel,
             depth=depth+1,
             log_level=log_level,
+            mask=mask,
+            name=name,
         )
-        if found_path:
+
+        if found_path is not None:
             return found_path
         continue
 
     return None
 
 
+def find_mod(parent, name):
+    mask = ["init.lua", "mod.conf", "depends.txt", "description.txt"]
+    # return _find_sub_with_known_files(
+    #     parent,
+    #     name,
+    #     mask=mask,
+    # )
+    return get_shallowest_files_sub(
+        parent,
+        mask=mask,
+        name=name,
+    )
+
+
+def find_modpack(parent, name):
+    mask = ["modpack.txt", "modpack.conf"]
+    # return _find_sub_with_known_files(
+    #     parent,
+    #     name,
+    #     mask=mask,
+    # )
+    return get_shallowest_files_sub(
+        parent,
+        mask=mask,
+        name=name,
+    )
+
+
 def main():
+    bases = (
+        "/opt/minebest/assemble/bucket_game",
+        # "/opt/minebest/mtkit/minetest/src",
+    )
+    head_parents = (
+        os.path.join(REPO_DIR, "Bucket_Game-branches"),
+        os.path.join(HOME, "metaprojects", "pull-requests", "OldCoder"),
+        os.path.join(HOME, "metaprojects", "pull-requests",
+                     "Bucket_Game-branches"),
+    )
+    return check_if_head_files_applied(bases, head_parents)
+
+
+def check_if_head_files_applied(bases, head_parents):
+    """Check if head files are applied.
+
+    Args:
+        bases (list[str]): Directories where heads should have been
+            applied.
+        head_parents (list[str]): Folders containing various patches,
+            where each sub of each parent is in the form of files to
+            overlay onto base.
+
+    Returns:
+        int: 0 on success.
+    """
+    for base in bases:
+        if not os.path.isdir(base):
+            echo0('Warning: There is no base "{}".'.format(base))
+            continue
+        for head in head_parents:
+            echo0("\n# {}".format(head))
+            for head_sub in os.listdir(head):
+                # Identify each head folder as an overlay to "patch" a base.
+                head_sub_path = os.path.join(head, head_sub)
+                # region skip non-patch subs
+                if os.path.isfile(head_sub_path):
+                    # echo0('Warning: Only folders, skipped "{}"'
+                    #       ''.format(head_sub))
+                    continue
+                if "original" in head_sub:
+                    # echo0('INFO: skipped original: "{}"'
+                    #       ''.format(head_sub))
+                    continue
+                elif "-BASE" in head_sub:
+                    # echo0('INFO: skipped BASE: "{}"'
+                    #       ''.format(head_sub))
+                    continue
+                elif head_sub in ("1.Tasks", "1.old", "1.wontfix",
+                                  "1.website"):
+                    # echo0('INFO: skipped Tasks folder: "{}"'
+                    #       ''.format(head_sub))
+                    continue
+
+                # endregion skip non-patch subs
+
+                # region identify patch structure
+                mod_rel = get_shallowest_files_sub(
+                    head_sub_path,
+                    mask=["init.lua", "mod.conf", "depends.txt",
+                          "description.txt"],
+                )
+                modpack_rel = get_shallowest_files_sub(
+                    head_sub_path,
+                    mask=["modpack.txt", "modpack.conf"],
+                )
+                game_patch_root = None
+                mod_patch_root = None
+                modpack_patch_root = None
+
+                if head_sub.endswith("_game"):
+                    game_patch_root = head_sub_path
+                elif os.path.isdir(os.path.join(head_sub_path, "mods")):
+                    game_patch_root = head_sub_path
+                    echo0('game_patch_root="{}"'.format(head_sub))
+                elif (mod_rel is not None) and (modpack_rel is None):
+                    mod_parent = os.path.dirname(os.path.join(head_sub_path,
+                                                              mod_rel))
+                    mod_parent_rel = mod_parent[len(head_sub_path)+1:]
+                    # ^ +1 no os.path.sep
+                    _, mod_parent_name = os.path.split(mod_parent)
+                    if mod_parent_rel and (mod_parent_name not in ["mods"]):
+                        echo0('Warning: No modpack.txt nor modpack.conf,'
+                              ' so assuming modpack={} ("{}")'
+                              ''.format(mod_parent_name, mod_parent))
+                        modpack_patch_root = mod_parent
+
+                if game_patch_root:
+                    pass  # Already set above.
+                elif modpack_patch_root:
+                    pass  # Already set above.
+                elif mod_rel is not None:
+                    if mod_rel:
+                        mod_patch_root = os.path.join(head_sub_path, mod_rel)
+                    else:
+                        # Must be "", so don't do join or will add os.path.sep
+                        mod_patch_root = head_sub_path
+                    _, got_mod_name = os.path.split(mod_patch_root)
+                    echo0('mod_patch="{}" root="{}"'
+                          ''.format(got_mod_name, mod_patch_root))
+                else:
+                    pass
+                    # echo0('Warning: mod not identified in "{}"'
+                    #       ''.format(head_sub))
+                    # See output in "else" below instead.
+                # endregion identify patch structure
+
+                # region check whether base has it installed
+                patch_root = None
+                if game_patch_root is not None:
+                    patch_root = game_patch_root
+                    _, game_name = os.path.split(base)
+                    base_sub_path = base
+                    echo0("* Checking whether {} was applied to {} game"
+                          "".format(head_sub, game_name))
+                elif modpack_patch_root is not None:
+                    patch_root = modpack_patch_root
+                    _, modpack_name = os.path.split(modpack_patch_root)
+                    modpack_rel = find_modpack(base, modpack_name)
+                    if modpack_rel is None:
+                        echo0("Error: {} was not found in {}"
+                              "".format(modpack_name, base))
+                        continue
+                    if modpack_rel:
+                        base_sub_path = os.path.join(base, modpack_rel)
+                    else:
+                        # Must be "", so avoid join to avoid adding os.path.sep
+                        base_sub_path = base
+                    echo0("* Checking whether {} was applied to"
+                          " {} modpack in {} game"
+                          "".format(head_sub, modpack_name, game_name))
+                elif mod_patch_root is not None:
+                    patch_root = mod_patch_root
+                    _, mod_name = os.path.split(mod_patch_root)
+                    mod_rel = find_mod(base, mod_name)
+                    if mod_rel is None:
+                        echo0("Error: {} was not found in {}"
+                              "".format(mod_name, base))
+                        continue
+                    if modpack_rel:
+                        base_sub_path = os.path.join(base, modpack_rel)
+                    else:
+                        # Must be "", so avoid join to avoid adding os.path.sep
+                        base_sub_path = base
+                    echo0("* Checking whether {} was applied to"
+                          " {} mod in {} game"
+                          "".format(head_sub, mod_name, game_name))
+                else:
+                    echo0('Warning: Skipping unknown patch structure: "{}"'
+                          ''.format(head_sub))
+
+                diffs = diff_only_head(base_sub_path, patch_root, log_level=-1)
+                for diff in diffs:
+                    missing = bool(diff.get("new"))
+                    adjective = "missing" if missing else "differs"
+                    # TODO: echo0("  * {}: {}".format(adjective, diff))
+                    # if not missing:
+                    echo0("    "+shlex.join([
+                        "meld",
+                        os.path.join(base, diff['rel']),
+                        os.path.join(head, diff['rel']),
+                    ])+"  # base (original) vs head (patch)")
+                # endregion check whether base has it installed
+
     return 0
 
 

tests/data/mod_game/mods/extra_parent/modpack1/mod1/mod.conf

@@ -0,0 +1 @@
+name = mod1

tests/data/mod_game/mods/extra_parent/modpack1/mod1/not_this_folder/init.lua

@@ -0,0 +1 @@
+-- This represents a backup of init.lua that should be ignored by the test.

tests/data/modpack_game/mods/extra_parent/modpack1/mod1/mod.conf

@@ -0,0 +1 @@
+name = mod1

tests/data/modpack_game/mods/extra_parent/modpack1/mod1/not_this_folder/init.lua

@@ -0,0 +1 @@
+-- This represents a backup of init.lua that should be ignored by the test.

tests/data/modpack_game/mods/extra_parent/modpack1/modpack.conf

@@ -0,0 +1 @@
+name = modpack1

tests/data/modpack_game/mods/extra_parent/modpack2/mod2/mod.conf

@@ -0,0 +1 @@
+name = mod2

tests/data/modpack_game/mods/extra_parent/modpack2/mod2/not_this_folder/init.lua

@@ -0,0 +1 @@
+-- This represents a backup of init.lua that should be ignored by the test.

tests/data/modpack_game/mods/extra_parent/modpack2/modpack.conf

@@ -0,0 +1 @@
+name = modpack2

tests/test_mtpatches.py

@@ -13,6 +13,8 @@ if __name__ == "__main__":
 from pyenliven.mtpatches import (  # noqa F402
     get_shallowest_files_sub,
     diff_only_head,
+    find_mod,
+    find_modpack,
 )
 
 
@@ -30,7 +32,7 @@ class TestMTPatches(unittest.TestCase):
             os.path.join(TESTS_DATA_DIR, "base", "unused", "sub", "has_file"),
             log_level=1,
         )
-        self.assertEqual(sub, None)
+        self.assertEqual(sub, "")
         # ^ should be "has_file" dir, since that contains
         #   "shallowest_in_base.txt"
 
@@ -83,10 +85,69 @@ class TestMTPatches(unittest.TestCase):
             base,
             head,
         )
-
         # Same except ignore extra_file_to_ignore.txt:
         self.assertFalse(diffs)  # assert same (ignoring base extra file(s))
 
+    def test_find_mod(self):
+        game_path = os.path.join(TESTS_DATA_DIR, "mod_game")
+        self.assertEqual(
+            find_mod(game_path, "wrong_mod"),
+            None
+        )
+        self.assertEqual(
+            find_mod(game_path, "mod1"),
+            os.path.join("mods", "extra_parent", "modpack1", "mod1")
+        )
+        self.assertEqual(
+            find_mod(os.path.join(TESTS_DATA_DIR, "modpack_game"), "mod2"),
+            os.path.join("mods", "extra_parent", "modpack2", "mod2")
+        )
+
+        self.assertEqual(
+            find_mod(os.path.join(game_path, "mods", "extra_parent",
+                                  "modpack1", "mod1"),
+                     "mod1"),  # Yes, should still find mod1 ("") if root
+            ""
+        )
+        self.assertEqual(
+            find_mod(os.path.join(game_path, "mods"), "mod1"),
+            os.path.join("extra_parent", "modpack1", "mod1"),
+        )
+
+    def test_find_modpack(self):
+        game_path = os.path.join(TESTS_DATA_DIR, "modpack_game")
+        self.assertEqual(
+            find_modpack(game_path, "wrong_modpack"),
+            None
+        )
+        self.assertEqual(
+            find_modpack(game_path, "modpack1"),
+            os.path.join("mods", "extra_parent", "modpack1")
+        )
+        self.assertEqual(
+            find_modpack(os.path.join(TESTS_DATA_DIR, "modpack_game"),
+                         "modpack2"),
+            os.path.join("mods", "extra_parent", "modpack2")
+        )
+
+        self.assertEqual(
+            find_modpack(os.path.join(game_path, "mods", "extra_parent",
+                                      "modpack1"),
+                         "modpack1"),  # Yes, still find mod1 ("") if root
+            ""
+        )
+        self.assertEqual(
+            find_modpack(os.path.join(game_path, "mods", "extra_parent",
+                                      "modpack2"),
+                         "modpack2"),  # Yes, still find mod1 ("") if root
+            ""
+        )
+
+        self.assertEqual(
+            find_modpack(os.path.join(game_path, "mods"), "modpack1"),
+            os.path.join("extra_parent", "modpack1"),
+        )
+
 
 if __name__ == "__main__":
     unittest.main()