now scraping rooms from capmus mgmt

models/__init__.py

@@ -4,3 +4,6 @@ Import all models...
 from backend.models.example_model import *
 from backend.models.user_model import *
 from backend.models.post_model import *
+from backend.models.recorder_model import *
+from backend.models.room_model import *
+from backend.models.virtual_command_model import *

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')

models/room_model.py

@@ -5,13 +5,12 @@ Models for lecture recorder
 import json
 
 from sqlalchemy import MetaData, CheckConstraint
+from sqlalchemy.exc import IntegrityError
+
+from datetime import datetime, timedelta
 
 from backend import db, app, login_manager
-import re
-from sqlalchemy import or_
-from datetime import datetime, timedelta
-from backend.models.recorder_model import Recorder
-
+from backend.tools.scrape_rooms import scrape_rooms
 
 metadata = MetaData()
 
@@ -19,10 +18,12 @@ metadata = MetaData()
 class Room(db.Model):
     id = db.Column(db.Integer, autoincrement=True, primary_key=True)
     created_at = db.Column(db.DateTime, nullable=False, default=datetime.utcnow())
-    name = db.Column(db.Unicode(127), unique=True, nullable=False)
-    alternate_name = db.Column(db.Unicode(127), unique=True, nullable=True, default=None)
+    name = db.Column(db.Unicode(127), unique=False, nullable=False)
+    alternate_name = db.Column(db.Unicode(127), unique=False, nullable=True, default=None)
     comment = db.Column(db.Unicode(2047), unique=False, nullable=True, default="")
-    number = db.Column(db.Unicode(63), unique=True, nullable=True)
+    number = db.Column(db.Unicode(63), unique=False, nullable=True)
+    building_name = db.Column(db.Unicode(63), unique=False, nullable=True)
+    building_number = db.Column(db.Unicode(63), unique=False, nullable=True)
 
     recorder = db.relationship('Recorder', uselist=False, back_populates='room')  # one-to-one relation (uselist=False)
 
@@ -34,7 +35,6 @@ class Room(db.Model):
     def __init__(self, **kwargs):
         super(Room, self).__init__(**kwargs)
 
-
     @staticmethod
     def get_by_name(name):
         """
@@ -47,7 +47,7 @@ class Room(db.Model):
     @staticmethod
     def get_all():
         """
-        Return all groups
+        Return all rooms
         :return:
         """
         return Room.query.all()
@@ -61,3 +61,16 @@ class Room(db.Model):
     def toJSON(self):
         return json.dumps(self.to_dict(), default=lambda o: o.__dict__,
                           sort_keys=True, indent=4)
+
+
+def pre_fill_table():
+    rooms = scrape_rooms()
+    i_tunes_u_mappings = [Room(name=room['name'], number=room['room_number'],
+                               building_name=room['building_name'], building_number=room['building_number']) for room in
+                          rooms]
+
+    try:
+        db.session.bulk_save_objects(i_tunes_u_mappings)
+        db.session.commit()
+    except IntegrityError as e:
+        db.session.rollback()