From 8866058467602a999dafae246e9087eee2c1cf69 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Wed, 4 Aug 2021 11:33:48 -0700 Subject: [PATCH] update requirements, fix DB strings for MySQL, add version to bridge.py --- bridge.py | 2 +- requirements.txt | 3 ++- web/app.py | 34 +++++++++++++++++----------------- web/config-SAMPLE.py | 4 ++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/bridge.py b/bridge.py index 2161480..8cbca28 100755 --- a/bridge.py +++ b/bridge.py @@ -214,7 +214,7 @@ def download_config(L_CONFIG_FILE, cli_file): corrected_config['SYSTEMS'][i]['DESCRIPTION'] = bytes((iterate_config[i]['DESCRIPTION']).ljust(19)[:19], 'utf-8') corrected_config['SYSTEMS'][i]['SLOTS'] = bytes((iterate_config[i]['SLOTS']), 'utf-8') corrected_config['SYSTEMS'][i]['URL'] = bytes((iterate_config[i]['URL']).ljust(124)[:124], 'utf-8') - corrected_config['SYSTEMS'][i]['SOFTWARE_ID'] = bytes(('HBNet DMR').ljust(40)[:40], 'utf-8') + corrected_config['SYSTEMS'][i]['SOFTWARE_ID'] = bytes(('HBNet V1.0').ljust(40)[:40], 'utf-8') corrected_config['SYSTEMS'][i]['PACKAGE_ID'] = bytes(('Dev').ljust(40)[:40], 'utf-8') corrected_config['SYSTEMS'][i]['OPTIONS'] = b''.join([b'Type=HBlink;', bytes(iterate_config[i]['OPTIONS'], 'utf-8')]) diff --git a/requirements.txt b/requirements.txt index dbbd847..0e95397 100755 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,6 @@ flask_babelex pymysql folium requests -libsrc +libscrc resettabletimer +pymysql diff --git a/web/app.py b/web/app.py index f5e4316..b466f41 100644 --- a/web/app.py +++ b/web/app.py @@ -221,7 +221,7 @@ def create_app(): tg1_acl = db.Column(db.String(100), nullable=False, server_default='') tg2_acl = db.Column(db.String(100), nullable=False, server_default='') server = db.Column(db.String(100), nullable=False, server_default='') - notes = db.Column(db.String(100), nullable=False, server_default='') + notes = db.Column(db.String(500), nullable=False, server_default='') class xlxPeer(db.Model): __tablename__ = 'XLX_peers' @@ -256,7 +256,7 @@ def create_app(): tg1_acl = db.Column(db.String(100), nullable=False, server_default='') tg2_acl = db.Column(db.String(100), nullable=False, server_default='') server = db.Column(db.String(100), nullable=False, server_default='') - notes = db.Column(db.String(100), nullable=False, server_default='') + notes = db.Column(db.String(500), nullable=False, server_default='') class ServerList(db.Model): __tablename__ = 'server_list' name = db.Column(db.String(100), unique=True, primary_key=True) @@ -293,8 +293,8 @@ def create_app(): report_clients =db.Column(db.String(100), nullable=False, server_default='127.0.0.1') unit_time = db.Column(db.Integer(), primary_key=False, server_default='10080') notes = db.Column(db.String(100), nullable=False, server_default='') - dash_url = db.Column(db.String(100), nullable=True, server_default='https://hbnet.xyz') - public_notes = db.Column(db.String(100), nullable=False, server_default='') + dash_url = db.Column(db.String(1000), nullable=True, server_default='https://hbnet.xyz') + public_notes = db.Column(db.String(1000), nullable=False, server_default='') class MasterList(db.Model): __tablename__ = 'master_list' @@ -316,7 +316,7 @@ def create_app(): tg2_acl = db.Column(db.String(100), nullable=False, server_default='') enable_unit = db.Column(db.Boolean(), nullable=False, server_default='1') server = db.Column(db.String(100), nullable=False, server_default='') - notes = db.Column(db.String(100), nullable=False, server_default='') + notes = db.Column(db.String(500), nullable=False, server_default='') public_list = db.Column(db.Boolean(), nullable=False, server_default='1') @@ -341,7 +341,7 @@ def create_app(): tg2_acl = db.Column(db.String(100), nullable=False, server_default='') enable_unit = db.Column(db.Boolean(), nullable=False, server_default='1') server = db.Column(db.String(100), nullable=False, server_default='') - notes = db.Column(db.String(100), nullable=False, server_default='') + notes = db.Column(db.String(500), nullable=False, server_default='') public_list = db.Column(db.Boolean(), nullable=False, server_default='1') @@ -362,7 +362,7 @@ def create_app(): tg_acl = db.Column(db.String(100), nullable=False, server_default='') enable_unit = db.Column(db.Boolean(), nullable=False, server_default='1') server = db.Column(db.String(100), nullable=False, server_default='') - notes = db.Column(db.String(100), nullable=False, server_default='') + notes = db.Column(db.String(500), nullable=False, server_default='') class BridgeRules(db.Model): __tablename__ = 'bridge_rules' @@ -385,7 +385,7 @@ def create_app(): __tablename__ = 'bridge_list' id = db.Column(db.Integer(), primary_key=True) bridge_name = db.Column(db.String(100), nullable=False, server_default='') - description = db.Column(db.String(100), nullable=False, server_default='') + description = db.Column(db.String(5000), nullable=False, server_default='') public_list = db.Column(db.Boolean(), nullable=False, server_default='0') tg = db.Column(db.Integer(), primary_key=False) @@ -393,7 +393,7 @@ def create_app(): __tablename__ = 'gps_locations' id = db.Column(db.Integer(), primary_key=True) callsign = db.Column(db.String(100), nullable=False, server_default='') - comment = db.Column(db.String(100), nullable=False, server_default='') + comment = db.Column(db.String(150), nullable=False, server_default='') lat = db.Column(db.String(100), nullable=False, server_default='') lon = db.Column(db.String(100), nullable=False, server_default='') time = db.Column(db.DateTime()) @@ -405,7 +405,7 @@ def create_app(): __tablename__ = 'sms_bb' id = db.Column(db.Integer(), primary_key=True) callsign = db.Column(db.String(100), nullable=False, server_default='') - bulletin = db.Column(db.String(100), nullable=False, server_default='') + bulletin = db.Column(db.String(150), nullable=False, server_default='') time = db.Column(db.DateTime()) server = db.Column(db.String(100), nullable=False, server_default='') system_name = db.Column(db.String(100), nullable=False, server_default='') @@ -428,7 +428,7 @@ def create_app(): id = db.Column(db.Integer(), primary_key=True) snd_callsign = db.Column(db.String(100), nullable=False, server_default='') rcv_callsign = db.Column(db.String(100), nullable=False, server_default='') - message = db.Column(db.String(100), nullable=False, server_default='') + message = db.Column(db.String(150), nullable=False, server_default='') time = db.Column(db.DateTime()) server = db.Column(db.String(100), nullable=False, server_default='') system_name = db.Column(db.String(100), nullable=False, server_default='') @@ -439,7 +439,7 @@ def create_app(): __tablename__ = 'news' id = db.Column(db.Integer(), primary_key=True) subject = db.Column(db.String(100), nullable=False, server_default='') - text = db.Column(db.String(100), nullable=False, server_default='') + text = db.Column(db.String(5000), nullable=False, server_default='') date = db.Column(db.String(100), nullable=False, server_default='') time = db.Column(db.DateTime()) @@ -470,16 +470,16 @@ def create_app(): __tablename__ = 'social' id = db.Column(db.Integer(), primary_key=True) callsign = db.Column(db.String(100), nullable=False, server_default='') - message = db.Column(db.String(100), nullable=False, server_default='') + message = db.Column(db.String(150), nullable=False, server_default='') time = db.Column(db.DateTime()) class Misc(db.Model): __tablename__ = 'misc' id = db.Column(db.Integer(), primary_key=True) - field_1 = db.Column(db.String(100), nullable=True, server_default='') - field_2 = db.Column(db.String(100), nullable=True, server_default='') - field_3 = db.Column(db.String(100), nullable=True, server_default='') - field_4 = db.Column(db.String(100), nullable=True, server_default='') + field_1 = db.Column(db.String(500), nullable=True, server_default='') + field_2 = db.Column(db.String(500), nullable=True, server_default='') + field_3 = db.Column(db.String(500), nullable=True, server_default='') + field_4 = db.Column(db.String(500), nullable=True, server_default='') int_1 = db.Column(db.Integer(), nullable=True) int_2 = db.Column(db.Integer(), nullable=True) int_3 = db.Column(db.Integer(), nullable=True) diff --git a/web/config-SAMPLE.py b/web/config-SAMPLE.py index db58108..4813004 100644 --- a/web/config-SAMPLE.py +++ b/web/config-SAMPLE.py @@ -13,8 +13,8 @@ db_location = 'sqlite:///hbnet.sqlite' #db_location = 'mysql+pymysql://DB_USERNAME:DB_PASSWORD@DB_HOST:MySQL_PORT/DB_NAME' -# Title of the HBNet Web Server -title = 'HBNet DMR server' +# Title of the HBNet Web Service/DMR network +title = 'HBNet Web Service' # Port to run server hws_port = 8080 # IP to run server on