Merge pull request #11312 from xXPBSXx/carry/6531-pad-input

fix(tools): normalize pad input output encoding and validate target path

tools/pad_input.py

@@ -74,6 +74,10 @@ def main():
         mask = button_mask(args.button)
     except argparse.ArgumentTypeError as error:
         parser.error(str(error))
+    if args.path.is_dir():
+        parser.error(f"{args.path} is a directory")
+    if not args.path.parent.is_dir():
+        parser.error(f"directory does not exist: {args.path.parent}")
     if not 1 <= args.hold_ms <= 5000:
         parser.error("--hold-ms must be between 1 and 5000")
     sticks = ""
@@ -94,7 +98,7 @@ def main():
             pass
     temporary = None
     try:
-        with tempfile.NamedTemporaryFile(mode="w", dir=args.path.parent, delete=False) as output:
+        with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", newline="\n", dir=args.path.parent, delete=False) as output:
             temporary = Path(output.name)
             if metadata is not None:
                 if os.geteuid() == 0:

tools/tests/test_pad_input.py

@@ -133,6 +133,39 @@ class PadInputTests(unittest.TestCase):
         self.assertEqual(self.path.read_text(encoding="utf-8"), original)
         self.assertEqual(list(self.root.iterdir()), [self.path])
 
+    def test_output_has_consistent_lf_newlines_and_utf8(self):
+        self.queue(1000, "cross")
+        content = self.path.read_bytes()
+        self.assertTrue(content.endswith(b"\n"))
+        self.assertFalse(content.endswith(b"\r\n"))
+        self.assertEqual(content.decode("utf-8"), "1000 16384 300\n")
+
+    def test_unreadable_command_file_is_not_replaced(self):
+        original = "7 16384 300\n"
+        self.path.write_text(original, encoding="utf-8")
+        with mock.patch.object(Path, "open", side_effect=PermissionError("denied")), \
+                self.assertRaises(PermissionError):
+            self.queue(1000, "cross")
+        self.assertEqual(self.path.read_text(encoding="utf-8"), original)
+        self.assertEqual(list(self.root.iterdir()), [self.path])
+
+    def test_missing_parent_directory_reports_error(self):
+        missing = self.root / "nonexistent" / "command"
+        errors = io.StringIO()
+        with mock.patch.object(sys, "argv", ["pad_input.py", str(missing), "cross"]), \
+                contextlib.redirect_stderr(errors), self.assertRaises(SystemExit) as error:
+            pad_input.main()
+        self.assertEqual(error.exception.code, 2)
+        self.assertIn("directory does not exist", errors.getvalue())
+
+    def test_directory_path_reports_error(self):
+        errors = io.StringIO()
+        with mock.patch.object(sys, "argv", ["pad_input.py", str(self.root), "cross"]), \
+                contextlib.redirect_stderr(errors), self.assertRaises(SystemExit) as error:
+            pad_input.main()
+        self.assertEqual(error.exception.code, 2)
+        self.assertIn("is a directory", errors.getvalue())
+
 
 if __name__ == "__main__":
     unittest.main()