Small metadata and camera improvements (#1253)

* Clean up metadata saving.

Updating current metadata record should clobber, not merge.

* * Changing gphoto2 log entry to a warning.
* Try to get camera model.

* * Fix variable name.

* * Fix incorrect log entry.

src/panoptes/pocs/camera/gphoto/base.py

@@ -119,7 +119,7 @@ def get_command_result(self, timeout: float = 10) -> Union[List[str], None]:
 
         self.logger.trace(f'gphoto2 output: {outs=!r}')
         if errs != '':
-            self.logger.error(f'gphoto2 error: {errs!r}')
+            self.logger.warning(f'gphoto2 error: {errs!r}')
 
         if isinstance(outs, str):
             outs = outs.split('\n')

src/panoptes/pocs/camera/gphoto/canon.py

@@ -72,8 +72,7 @@ def connect(self):
 
         self.set_properties(prop2value=prop2value)
 
-        # TODO check this works on all Canon models.
-        self.model = self.get_property('d402')
+        self.model = self.get_property('model')
 
         self._connected = True
 

src/panoptes/pocs/state/states/default/parked.py

@@ -39,4 +39,4 @@ def on_enter(event_data):
                     pocs.next_state = 'housekeeping'
                     break
                 else:
-                    pocs.say("Seems to be bad weather. I'll wait another 30 minutes.")
+                    pocs.say("Seems to be bad weather. I'll wait another 5 minutes.")

src/panoptes/pocs/utils/cli/network.py

@@ -126,7 +126,7 @@ def handleEvent(event):
                 print(f'Adding {data=}')
 
             # Update the "current" record.
-            metadata_record.set(data, merge=True)
+            metadata_record.set(data)
             # Add a new record.
             doc_ts, doc_id = records_ref.add(data)
             if verbose:

src/panoptes/pocs/utils/cli/weather.py

@@ -25,9 +25,9 @@ def get_page(page, base_url):
 
 
 @app.command(help='Restart the weather station service via supervisorctl')
-def restart(serivce: str = 'pocs-weather-reader'):
+def restart(service: str = 'pocs-weather-reader'):
     """Restart the weather station service via supervisorctl"""
-    cmd = f'supervisorctl restart {serivce}'
+    cmd = f'supervisorctl restart {service}'
     print(f'Running: {cmd}')
     subprocess.run(cmd, shell=True)