reformated some code
This commit is contained in:
@@ -18,26 +18,32 @@ from backend import db, app, login_manager, LrcException
|
||||
from sqlalchemy import or_
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from backend.models.virtual_command_model import virtual_command_recorder_command_table, virtual_command_recorder_table
|
||||
from backend.models.virtual_command_model import (
|
||||
virtual_command_recorder_command_table,
|
||||
virtual_command_recorder_table,
|
||||
)
|
||||
|
||||
metadata = MetaData()
|
||||
|
||||
|
||||
class RecorderModel(db.Model):
|
||||
__table_args__ = {'extend_existing': True}
|
||||
__table_args__ = {"extend_existing": True}
|
||||
id = db.Column(db.Integer, autoincrement=True, primary_key=True)
|
||||
created_at = db.Column(db.DateTime, nullable=False, default=datetime.utcnow())
|
||||
last_time_modified = db.Column(db.DateTime, nullable=True, default=None)
|
||||
record_adapter_id = db.Column(db.Unicode(63), unique=True, nullable=False)
|
||||
model_name = db.Column(db.Unicode(63), unique=True, nullable=False)
|
||||
notes = db.Column(db.Unicode(255), unique=False, nullable=True, default=None)
|
||||
recorder_commands = db.relationship('RecorderCommand', back_populates='recorder_model')
|
||||
recorders = db.relationship('Recorder', back_populates='recorder_model')
|
||||
checksum = db.Column(db.String(63), unique=True,
|
||||
nullable=False) # checksum of the recorder commands! (see: model_updater.py)
|
||||
recorder_commands = db.relationship(
|
||||
"RecorderCommand", back_populates="recorder_model"
|
||||
)
|
||||
recorders = db.relationship("Recorder", back_populates="recorder_model")
|
||||
checksum = db.Column(
|
||||
db.String(63), unique=True, nullable=False
|
||||
) # checksum of the recorder commands! (see: model_updater.py)
|
||||
last_checksum_change = db.Column(db.DateTime, nullable=True, default=None)
|
||||
_requires_user = db.Column(db.Integer, default=False, name='requires_user')
|
||||
_requires_password = db.Column(db.Integer, default=True, name='requires_password')
|
||||
_requires_user = db.Column(db.Integer, default=False, name="requires_user")
|
||||
_requires_password = db.Column(db.Integer, default=True, name="requires_password")
|
||||
|
||||
@staticmethod
|
||||
def get_all():
|
||||
@@ -49,11 +55,15 @@ class RecorderModel(db.Model):
|
||||
|
||||
@staticmethod
|
||||
def get_by_adapter_id(name):
|
||||
return RecorderModel.query.filter(RecorderModel.record_adapter_id == name).first()
|
||||
return RecorderModel.query.filter(
|
||||
RecorderModel.record_adapter_id == name
|
||||
).first()
|
||||
|
||||
@staticmethod
|
||||
def get_where_adapter_id_contains(adapter_id):
|
||||
return RecorderModel.query.filter(RecorderModel.record_adapter_id.contains(adapter_id)).first()
|
||||
return RecorderModel.query.filter(
|
||||
RecorderModel.record_adapter_id.contains(adapter_id)
|
||||
).first()
|
||||
|
||||
@staticmethod
|
||||
def get_by_checksum(md5_sum):
|
||||
@@ -80,10 +90,12 @@ class RecorderModel(db.Model):
|
||||
|
||||
|
||||
class Recorder(db.Model):
|
||||
__table_args__ = {'extend_existing': True}
|
||||
__table_args__ = {"extend_existing": True}
|
||||
id = db.Column(db.Integer, autoincrement=True, primary_key=True)
|
||||
created_at = db.Column(db.DateTime, nullable=False, default=datetime.utcnow())
|
||||
last_time_modified = db.Column(db.DateTime, nullable=False, default=datetime.utcnow())
|
||||
last_time_modified = db.Column(
|
||||
db.DateTime, nullable=False, default=datetime.utcnow()
|
||||
)
|
||||
name = db.Column(db.Unicode(63), unique=True, nullable=False)
|
||||
model_name = db.Column(db.Unicode(63), unique=False, nullable=False)
|
||||
serial_number = db.Column(db.Unicode(63), unique=True, nullable=True)
|
||||
@@ -99,16 +111,21 @@ class Recorder(db.Model):
|
||||
ssh_port = db.Column(db.Integer, unique=False, nullable=False, default=22)
|
||||
username = db.Column(db.String, nullable=True, default=None)
|
||||
password = db.Column(db.String, nullable=True, default=None)
|
||||
_configured_options_json_string = db.Column(db.UnicodeText, default='')
|
||||
_additional_notes_json_string = db.Column(db.UnicodeText, default='')
|
||||
_configured_options_json_string = db.Column(db.UnicodeText, default="")
|
||||
_additional_notes_json_string = db.Column(db.UnicodeText, default="")
|
||||
additional_camera_connected = db.Column(db.Boolean, default=False)
|
||||
firmware_version = db.Column(db.String, nullable=True, default=None)
|
||||
room_id = db.Column(db.Integer, db.ForeignKey('room.id'))
|
||||
room = db.relationship('Room', uselist=False, back_populates='recorder') # one-to-one relation (uselist=False)
|
||||
recorder_model_id = db.Column(db.Integer, db.ForeignKey('recorder_model.id'))
|
||||
recorder_model = db.relationship('RecorderModel', back_populates='recorders')
|
||||
virtual_commands = db.relationship('VirtualCommand', secondary=virtual_command_recorder_table,
|
||||
back_populates='recorders')
|
||||
room_id = db.Column(db.Integer, db.ForeignKey("room.id"))
|
||||
room = db.relationship(
|
||||
"Room", uselist=False, back_populates="recorder"
|
||||
) # one-to-one relation (uselist=False)
|
||||
recorder_model_id = db.Column(db.Integer, db.ForeignKey("recorder_model.id"))
|
||||
recorder_model = db.relationship("RecorderModel", back_populates="recorders")
|
||||
virtual_commands = db.relationship(
|
||||
"VirtualCommand",
|
||||
secondary=virtual_command_recorder_table,
|
||||
back_populates="recorders",
|
||||
)
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super(Recorder, self).__init__(**kwargs)
|
||||
@@ -123,16 +140,16 @@ class Recorder(db.Model):
|
||||
|
||||
@staticmethod
|
||||
def get_by_mac(mac: str):
|
||||
if mac is None or mac == '':
|
||||
if mac is None or mac == "":
|
||||
return None
|
||||
mac = mac.replace('-', ':').lower()
|
||||
mac = mac.replace("-", ":").lower()
|
||||
return Recorder.query.filter(Recorder._mac == mac).first()
|
||||
|
||||
@staticmethod
|
||||
def get_all():
|
||||
return Recorder.query.all()
|
||||
|
||||
@validates('name')
|
||||
@validates("name")
|
||||
def validate_name(self, key, value):
|
||||
assert len(value) > 2
|
||||
return value
|
||||
@@ -146,7 +163,9 @@ class Recorder(db.Model):
|
||||
self._configured_options_json_string = json.dumps(value)
|
||||
|
||||
def add_configured_option(self, value: str):
|
||||
self._configured_options_json_string = json.dumps(self.configured_options.append(value))
|
||||
self._configured_options_json_string = json.dumps(
|
||||
self.configured_options.append(value)
|
||||
)
|
||||
|
||||
@hybrid_property
|
||||
def additional_notes(self) -> list:
|
||||
@@ -157,7 +176,9 @@ class Recorder(db.Model):
|
||||
self._additional_notes_json_string = json.dumps(value)
|
||||
|
||||
def add_additional_notes(self, value: str):
|
||||
self._additional_notes_json_string = json.dumps(self._additional_notes_json_string.append(value))
|
||||
self._additional_notes_json_string = json.dumps(
|
||||
self._additional_notes_json_string.append(value)
|
||||
)
|
||||
|
||||
@hybrid_property
|
||||
def mac(self) -> str:
|
||||
@@ -165,10 +186,10 @@ class Recorder(db.Model):
|
||||
|
||||
@mac.setter
|
||||
def mac(self, value: str):
|
||||
if value is None or value == '':
|
||||
if value is None or value == "":
|
||||
return
|
||||
if re.match("[0-9a-f]{2}([-:]?)[0-9a-f]{2}(\\1[0-9a-f]{2}){4}$", value.lower()):
|
||||
self._mac = value.replace('-', ':').lower()
|
||||
self._mac = value.replace("-", ":").lower()
|
||||
else:
|
||||
raise LrcException("'{}' is not a valid MAC Address!".format(value))
|
||||
|
||||
@@ -205,25 +226,35 @@ class Recorder(db.Model):
|
||||
return dict(id=self.id, name=self.name)
|
||||
|
||||
def toJSON(self):
|
||||
return json.dumps(self.to_dict(), default=lambda o: o.__dict__,
|
||||
sort_keys=True, indent=4)
|
||||
return json.dumps(
|
||||
self.to_dict(), default=lambda o: o.__dict__, sort_keys=True, indent=4
|
||||
)
|
||||
|
||||
|
||||
class RecorderCommand(db.Model):
|
||||
__table_args__ = {'extend_existing': True}
|
||||
__table_args__ = {"extend_existing": True}
|
||||
"""Table containing permissions associated with groups."""
|
||||
id = db.Column(db.Integer, autoincrement=True, primary_key=True)
|
||||
created_at = db.Column(db.DateTime, nullable=False, default=datetime.utcnow())
|
||||
last_time_modified = db.Column(db.DateTime, nullable=True, default=datetime.utcnow())
|
||||
last_time_modified = db.Column(
|
||||
db.DateTime, nullable=True, default=datetime.utcnow()
|
||||
)
|
||||
name = db.Column(db.Unicode(63), unique=True, nullable=False)
|
||||
alternative_name = db.Column(db.Unicode(63), unique=True, nullable=True, default=None)
|
||||
alternative_name = db.Column(
|
||||
db.Unicode(63), unique=True, nullable=True, default=None
|
||||
)
|
||||
disabled = db.Column(db.Boolean, default=False)
|
||||
description = db.Column(db.Unicode(511), nullable=True, default=None)
|
||||
parameters_string = db.Column(db.String(2047), nullable=True)
|
||||
recorder_model = db.relationship('RecorderModel', back_populates='recorder_commands')
|
||||
recorder_model_id = db.Column(db.Integer, db.ForeignKey('recorder_model.id'))
|
||||
virtual_commands = db.relationship('VirtualCommand', secondary=virtual_command_recorder_command_table,
|
||||
back_populates='recorder_commands')
|
||||
recorder_model = db.relationship(
|
||||
"RecorderModel", back_populates="recorder_commands"
|
||||
)
|
||||
recorder_model_id = db.Column(db.Integer, db.ForeignKey("recorder_model.id"))
|
||||
virtual_commands = db.relationship(
|
||||
"VirtualCommand",
|
||||
secondary=virtual_command_recorder_command_table,
|
||||
back_populates="recorder_commands",
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def get_all():
|
||||
|
||||
Reference in New Issue
Block a user