Merge branch 'main' into add_usbcam_support

Signed-off-by: Patrick Gehrsitz <mryel00.github@gmail.com>

CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.14.0 (2024-06-05)
+
+### Feat
+
+- Expand camera control ability (#14)
+
+## v0.13.1 (2024-06-05)
+
+### Fix
+
+- **install**: fix missing directory during install (#73)
+
 ## v0.13.0 (2023-07-22)
 
 ### Feat

Makefile

@@ -18,6 +18,7 @@ all:
 	$(MAKE) help
 
 install: ## Install Spyglass as service
+	@mkdir -p $(CONF_PATH)
 	@printf "\nCopying systemd service file ...\n"
 	@sudo cp -f "${PWD}/resources/spyglass.service" $(SYSTEMD)
 	@sudo sed -i "s/%USER%/$(USER)/g" $(SYSTEMD)/spyglass.service

README.md

@@ -8,7 +8,7 @@ A simple mjpeg server for Picamera2.
 With Spyglass you are able to stream videos from a camera that is supported by [libcamera](http://libcamera.org) like
 the [Raspberry Pi Camera Module 3](https://www.raspberrypi.com/products/camera-module-3/).
 
-Current version: 0.13.0
+Current version: 0.14.0
 
 ## Prerequisites
 
@@ -199,7 +199,7 @@ set up to check commit messages pre commit.
 
  You may get the following error message when you try to push to your branch:
  ```
-  fatal: ambiguous argument 'origin/HEAD..HEAD': unknown revision or path not in the working tree.
+ fatal: ambiguous argument 'origin/HEAD..HEAD': unknown revision or path not in the working tree.
  Use '--' to separate paths from revisions, like this:
  'git <command> [<revision>...] -- [<file>...]'
  ```

pyproject.toml

@@ -13,7 +13,7 @@ mock_use_standalone_module = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.13.0"
+version = "0.14.0"
 tag_format = "v$version"
 version_files = [
     "spyglass/__version__.py",

requirements.txt

@@ -1 +1 @@
-setuptools~=69.0.3
+setuptools~=69.2.0

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = spyglass
-version = 0.13.0
+version = 0.14.0
 description = A simple mjpeg server for Picamera2
 url = https://github.com/roamingthings/spyglass
 license = GPL-3.0-only

spyglass/__version__.py

@@ -1 +1 @@
-__version__ = "0.13.0"
+__version__ = "0.14.0"

spyglass/camera_options.py

@@ -84,10 +84,11 @@ def get_libcamera_controls_string(camera_path: str) -> str:
     ctrls_str = ""
     libcam_cm = libcamera.CameraManager.singleton()
     cam = libcam_cm.cameras[0]
-    for k, v in cam.controls.items():
-        def rectangle_to_tuple(rectangle):
-            return (rectangle.x, rectangle.y, rectangle.width, rectangle.height)
 
+    def rectangle_to_tuple(rectangle):
+        return (rectangle.x, rectangle.y, rectangle.width, rectangle.height)
+
+    for k, v in cam.controls.items():
         if isinstance(v.min, libcamera.Rectangle):
             min = rectangle_to_tuple(v.min)
             max = rectangle_to_tuple(v.max)

spyglass/cli.py

@@ -52,7 +52,7 @@ def main(args=None):
                   parse_autofocus(parsed_args.autofocus),
                   parsed_args.lensposition,
                   parse_autofocus_speed(parsed_args.autofocusspeed),
-                  parsed_args.controls,
+                  controls,
                   parsed_args.upsidedown,
                   parsed_args.flip_horizontal,
                   parsed_args.flip_vertical,)
@@ -67,12 +67,12 @@ def main(args=None):
 
 # region args parsers
 
-
 def resolution_type(arg_value, pat=re.compile(r"^\d+x\d+$")):
     if not pat.match(arg_value):
         raise argparse.ArgumentTypeError("invalid value: <width>x<height> expected.")
     return arg_value
 
+
 def control_type(arg_value: str):
     if '=' in arg_value:
         return arg_value.split('=')
@@ -87,13 +87,6 @@ def orientation_type(arg_value):
         raise argparse.ArgumentTypeError(f"invalid value: unknown orientation {arg_value}.")
 
 
-def orientation_type(arg_value):
-    if arg_value in option_to_exif_orientation:
-        return option_to_exif_orientation[arg_value]
-    else:
-        raise argparse.ArgumentTypeError(f"invalid value: unknown orientation {arg_value}.")
-
-
 def parse_autofocus(arg_value):
     if arg_value == 'manual':
         return libcamera.controls.AfModeEnum.Manual
@@ -120,20 +113,11 @@ def split_resolution(res):
         raise argparse.ArgumentTypeError("Maximum supported resolution is 1920x1920")
     return w, h
 
-
-def control_type(arg_value: str):
-    if '=' in arg_value:
-        return arg_value.split('=')
-    else:
-        raise argparse.ArgumentTypeError(f"Invalid control: Missing value: {arg_value}")
-
-
 # endregion args parsers
 
 
 # region cli args
 
-
 def get_args(args):
     """Parse arguments passed in from shell."""
     return get_parser().parse_args(args)
@@ -188,11 +172,11 @@ def get_parser():
                         help='Define camera controls to start with spyglass. '
                              'Input as a long string.\n'
                              'Format: <control1>=<value1> <control2>=<value2>')
-    parser.add_argument('--list-controls', action='store_true', help='List available camera controls and exits.')
     parser.add_argument('-tf', '--tuning_filter', type=str, default=None, nargs='?', const="",
                         help='Set a tuning filter file name.')
     parser.add_argument('-tfd', '--tuning_filter_dir', type=str, default=None, nargs='?',const="",
                         help='Set the directory to look for tuning filters.')
+    parser.add_argument('--list-controls', action='store_true', help='List available camera controls and exits.')
     parser.add_argument('-n', '--camera_num', type=int, default=0, help='Camera number to be used')
     return parser