now scraping rooms from capmus mgmt

models/recorder_model.py

@@ -6,6 +6,7 @@ import json
 
 from sqlalchemy import MetaData
 from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import validates
 
 from backend import db, app, login_manager
 import re
@@ -19,6 +20,7 @@ metadata = MetaData()
 
 class RecorderModel(db.Model):
     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)
@@ -26,6 +28,8 @@ class RecorderModel(db.Model):
     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)
+    requires_user = db.Column(db.Boolean)
+    requires_password = db.Column(db.Boolean)
 
     @staticmethod
     def get_all():
@@ -49,13 +53,19 @@ class Recorder(db.Model):
     created_at = 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)
+    locked = db.Column(db.Boolean, default=False)
+    lock_message = db.Column(db.String, nullable=True, default=None)
+    offline = db.Column(db.Boolean, default=False)
     description = db.Column(db.Unicode(255), unique=False, nullable=True, default="")
     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)
     ip = db.Column(db.String(15), unique=True, nullable=True, default=None)
+    ip6 = db.Column(db.String(46), unique=True, nullable=True, default=None)
     network_name = db.Column(db.String(127), unique=True, nullable=True, default=None)
     telnet_port = db.Column(db.Integer, unique=False, nullable=False, default=23)
     ssh_port = db.Column(db.Integer, unique=False, nullable=False, default=22)
+    username = db.column(db.String(127))
+    password = db.column(db.String(127))
     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')
@@ -71,6 +81,11 @@ class Recorder(db.Model):
     def get_all():
         return Recorder.query.all()
 
+    @validates('name')
+    def validate_name(self, key, value):
+        assert len(value) > 2
+        return value
+
     def __str__(self):
         return self.name
 
@@ -85,8 +100,11 @@ class Recorder(db.Model):
 class RecorderCommand(db.Model):
     """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=None)
     name = db.Column(db.Unicode(63), unique=True, nullable=False)
+    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')