next_functions, defer and decomp_progress: an easy-first queue per band, deferrals with reasons, tiered progress

harbor/reverse.py

@@ -61,7 +61,7 @@ class Reverse:
         def load(p):
             out = {}
             if p:
-                for line in p.open(encoding="utf-8"):
+                for line in p.read_text(encoding="utf-8").splitlines():
                     if line.strip():
                         d = json.loads(line)
                         out[_int(d["address"])] = d
@@ -81,7 +81,7 @@ class Reverse:
 
     def _imports(self):
         return self._load("imports", self.imports_path, lambda p: {
-            int(d["slot"]): f"{d['module']}!{d['name']}" for d in json.load(p.open(encoding="utf-8"))} if p else {})
+            int(d["slot"]): f"{d['module']}!{d['name']}" for d in json.loads(p.read_text(encoding="utf-8"))} if p else {})
 
     def _csv(self, name):
         path = self.annotations / name if self.annotations else None
@@ -89,7 +89,7 @@ class Reverse:
         def load(p):
             rows = {}
             if p:
-                for row in csv.reader(p.open(encoding="utf-8")):
+                for row in csv.reader(p.read_text(encoding="utf-8").splitlines()):
                     if row and row[0].lower().startswith("0x"):
                         rows[_int(row[0])] = row
             return rows