Merge branch 'dev' into limness/some-fixes

flipperdevices · Nov 9, 2023 · 008c191 · 008c191
2 parents 94e7888 + 49364d6
commit 008c191
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/indexer/main.py b/indexer/main.py
@@ -42,7 +42,7 @@ def main() -> None:
             host=settings.gelf_host,
             port=settings.gelf_port,
             _kubernetes_namespace_name=settings.kubernetes_namespace,
-            _kubernetes_app_name=settings.kubernetes_app,
+            _kubernetes_labels_app=settings.kubernetes_app,
             _kubernetes_container_name=settings.kubernetes_container,
             _kubernetes_pod_name=settings.kubernetes_pod,
         )

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