Compare commits

...

2 Commits

Author SHA1 Message Date
j
42be31ca81 log next step 2022-10-30 12:36:21 +01:00
j
8f79d073e6 fail but retry if camera is gone 2022-10-30 12:29:32 +01:00

View File

@ -126,12 +126,20 @@ class Camera:
return {} return {}
def get(self, method): def get(self, method):
return requests.get(self.url(method), auth=self.auth).text while True:
try:
return requests.get(self.url(method), auth=self.auth).text
except requests.exceptions.ConnectionError:
time.sleep(0.1)
def put(self, method, data): def put(self, method, data):
if isinstance(data, dict): if isinstance(data, dict):
data = PTZData(data) data = PTZData(data)
return requests.put(self.url(method), data=data, auth=self.auth).text while True:
try:
return requests.put(self.url(method), data=data, auth=self.auth).text
except requests.exceptions.ConnectionError:
time.sleep(0.1)
def momentary(self, cmd, duration=None): def momentary(self, cmd, duration=None):
if duration: if duration:
@ -221,6 +229,11 @@ class Camera:
segment_t0 = time.time() segment_t0 = time.time()
if self.abort: if self.abort:
return return
print('next step %s at %s - %s' % (
steps.index(step),
datetime.now().strftime('%Y-%m-%d_%H:%M:%S'),
json.dumps(step)
))
if isinstance(step, dict): if isinstance(step, dict):
if 'fast' in step or ('speed' in step and step['speed'] > 100): if 'fast' in step or ('speed' in step and step['speed'] > 100):
self.fast_preset(step.get('fast', step.get('preset')), True) self.fast_preset(step.get('fast', step.get('preset')), True)