python qr

modules/nixos/common/common-crashlog.ulu.nix

@@ -65,24 +65,17 @@
         '';
       };
       
-      drmPanicDecode = pkgs.writeShellApplication {
+      panicInflate = pkgs.writers.writePython3Bin "drm-panic-inflate" {
-        name = "drm-panic-decode";
+        flakeIgnore = [ "E501" ];
-        runtimeInputs = [
+      } ''
-          pkgs.zbar
+        import sys
-          pkgs.python3
+        import zlib
-        ];
-        text = ''
-          if [ "$#" -lt 1 ]; then
-            echo "usage: drm-panic-decode <panic-screen-photo>" >&2
-            exit 1
-          fi
 
-          zbarimg --raw -q --oneshot -Sbinary "$1" | python3 -c '
-import sys, zlib
         data = sys.stdin.buffer.read()
         if not data:
-  sys.exit("Could not read QR: try taking a clearer/straighter photo")
+            sys.exit("Could not read QR: try a clearer, straighter photo")
-# Try raw deflate, zlib-wrapped, and gzip variants in order
+
+        # Try raw deflate, then zlib-wrapped, then gzip.
         for wbits in (-15, 15, 47):
             try:
                 sys.stdout.buffer.write(zlib.decompress(data, wbits))
@@ -90,9 +83,23 @@ for wbits in (-15, 15, 47):
             except zlib.error:
                 continue
         else:
-  sys.stderr.write("warning: could not decompress, printing raw data\n")
+            sys.stderr.write("warning: could not decompress, printing raw bytes\n")
             sys.stdout.buffer.write(data)
-'
+      '';
+
+      drmPanicDecode = pkgs.writeShellApplication {
+        name = "drm-panic-decode";
+        runtimeInputs = [
+          pkgs.zbar
+          panicInflate
+        ];
+        text = ''
+          if [ "$#" -lt 1 ]; then
+            echo "usage: drm-panic-decode <panic-screen-photo>" >&2
+            exit 1
+          fi
+
+          zbarimg --raw -q --oneshot -Sbinary "$1" | drm-panic-inflate
         '';
       };
     in