[FL-2481] Renamed assets->resources; enforcing Manifest build if it does not exist (#1135)

* Renamed assets->resources; enforcing Manifest build if it does not exist
* Rebuild resources from CI
* Added Manifest to repo - be sure to rebuild it with `make -C assets` before committing changes!
* Actually added Manifest.
* Keeping Manifest on assets clean
* Spelling fix in Makefile

scripts/flipper/assets/manifest.py

@@ -18,10 +18,10 @@ class ManifestRecord:
     def toLine(self):
         raise NotImplementedError
 
-    def _unpack(self, manifest, key, type):
+    def _unpack(self, manifest, key, nodetype):
         key, value = manifest.readline().split(":", 1)
         assert key == key
-        return type(value)
+        return nodetype(value)
 
 
 MANIFEST_TAGS_RECORDS = {}
@@ -94,7 +94,7 @@ class ManifestRecordFile(ManifestRecord):
     @staticmethod
     def fromLine(line):
         data = line.split(":", 3)
-        return ManifestRecordFile(data[2], data[0], data[1])
+        return ManifestRecordFile(data[2], data[0], int(data[1]))
 
     def toLine(self):
         return f"{self.tag}:{self.md5}:{self.size}:{self.path}\n"
@@ -133,7 +133,7 @@ class Manifest:
     def addFile(self, path, md5, size):
         self.records.append(ManifestRecordFile(path, md5, size))
 
-    def create(self, directory_path):
+    def create(self, directory_path, ignore_files=["Manifest"]):
         for root, dirs, files in os.walk(directory_path):
             relative_root = root.replace(directory_path, "", 1)
             if relative_root.startswith("/"):
@@ -141,13 +141,16 @@ class Manifest:
             # process directories
             for dir in dirs:
                 relative_dir_path = os.path.join(relative_root, dir)
-                self.logger.info(f'Adding directory: "{relative_dir_path}"')
+                self.logger.debug(f'Adding directory: "{relative_dir_path}"')
                 self.addDirectory(relative_dir_path)
             # Process files
             for file in files:
                 relative_file_path = os.path.join(relative_root, file)
+                if file in ignore_files:
+                    self.logger.info(f'Skipping file "{relative_file_path}"')
+                    continue
                 full_file_path = os.path.join(root, file)
-                self.logger.info(f'Adding file: "{relative_file_path}"')
+                self.logger.debug(f'Adding file: "{relative_file_path}"')
                 self.addFile(
                     relative_file_path,
                     file_md5(full_file_path),
@@ -155,7 +158,7 @@ class Manifest:
                 )
 
     def toFsTree(self):
-        root = FsNode("", FsNode.Type.Directory)
+        root = FsNode("", FsNode.NodeType.Directory)
         for record in self.records:
             if isinstance(record, ManifestRecordDirectory):
                 root.addDirectory(record.path)

scripts/flipper/utils/fstree.py

@@ -3,13 +3,13 @@ from collections import OrderedDict
 
 
 class FsNode:
-    class Type(Enum):
+    class NodeType(Enum):
         File = 0
         Directory = 1
 
-    def __init__(self, name: str, type: "FsNode.Type", **kwargs):
+    def __init__(self, name: str, nodetype: "FsNode.Type", **kwargs):
         self.name = name
-        self.type = type
+        self.nodetype = nodetype
         self.data = kwargs
         self.parent = None
         self.children = OrderedDict()
@@ -25,7 +25,7 @@ class FsNode:
         parent_node = self.traverse(fragments)
         if not parent_node:
             raise Exception(f"No parent node found for: {path}")
-        parent_node.addChild(FsNode(name, FsNode.Type.Directory))
+        parent_node.addChild(FsNode(name, FsNode.NodeType.Directory))
 
     def addFile(self, path, md5, size):
         fragments = path.split("/")
@@ -34,7 +34,7 @@ class FsNode:
         parent_node = self.traverse(fragments)
         if not parent_node:
             raise Exception(f"No parent node found for: {path}")
-        parent_node.addChild(FsNode(name, FsNode.Type.File, md5=md5, size=size))
+        parent_node.addChild(FsNode(name, FsNode.NodeType.File, md5=md5, size=size))
 
     def getChild(self, name):
         return self.children[name]
@@ -58,19 +58,37 @@ class FsNode:
     def dump(self):
         ret = {}
         ret["name"] = (self.name,)
-        ret["type"] = (self.type,)
+        ret["type"] = (self.nodetype,)
         ret["path"] = (self.getPath(),)
         if len(self.children):
             ret["children"] = [node.dump() for node in self.children.values()]
         return ret
 
 
+def walk_nodes(node: FsNode):
+    yield node
+    for child in node.children.values():
+        yield from walk_nodes(child)
+
+
+#  Returns filenames: [only_in_left], [changed], [only_in_right]
 def compare_fs_trees(left: FsNode, right: FsNode):
     # import pprint
     # pprint.pprint(left.dump())
     # pprint.pprint(right.dump())
+    left_dict = dict((node.getPath(), node) for node in walk_nodes(left))
+    right_dict = dict((node.getPath(), node) for node in walk_nodes(right))
 
-    only_in_left = []
-    changed = []
-    only_in_right = []
-    return [], [], []
+    left_names = set(left_dict.keys())
+    right_names = set(right_dict.keys())
+    common_names = left_names.intersection(right_names)
+
+    return (
+        list(left_names - right_names),
+        list(
+            name
+            for name in common_names
+            if left_dict[name].data != right_dict[name].data
+        ),
+        list(right_names - left_names),
+    )