Merge branch 'dev' into timuriwe/fix_gelf_app_label

flipperdevices · Nov 9, 2023 · cc6c36d · cc6c36d
2 parents 43efd62 + b2a2cec
commit cc6c36d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/indexer/src/models.py b/indexer/src/models.py
@@ -164,12 +164,14 @@ def parse(self, filename: str) -> None:
 
 class qFlipperFileParser(FileParser):
     def parse(self, filename: str) -> None:
-        regex = re.compile(r"^(qFlipper\w*)(-.+)*-([0-9.a]+)(-rc\d+)?\.(\w+)$")
+        regex = re.compile(
+            r"^(qFlipper\w*)(-.+)*-([0-9.a]+(-rc\d+)?|(dev-\w+-\w+))\.(\w+)$"
+        )
         match = regex.match(filename)
         if not match:
             return
         arch = match.group(2)
-        extention = match.group(5)
+        extention = match.group(6)
         if extention == "dmg":
             target = "macos"
             file_type = "dmg"
@@ -191,7 +193,7 @@ def parse(self, filename: str) -> None:
             if arch in ["64bit", "x86_64"]:
                 jsonArch = "amd64"
             else:
-                raise Exception(f"Cannot parse target")
+                raise Exception(f"Cannot parse target, arch = {arch}")
         self.target = target + "/" + jsonArch
         self.type = file_type