Василь Свідрик / k2root

Download as
Browse Code »

Commit f7116fe57aaee846bb4f9e52ea0d8837c8e6db84

Authored by Василь Свідрик
1 parent ae2387fb06
Exists in master

del sqlite, add yml

Showing 2 changed files with 42 additions and 42 deletions Side-by-side Diff

... ... @@ -80,8 +80,8 @@
80 80 db_config = self.init_db_uri()
81 81 db_uri = f"mysql+{db_config['driver']}://{db_config['user']}:{db_config['password']}@{db_config['host']}/{db_config['dbname']}"
82 82 app.config['SQLALCHEMY_DATABASE_URI'] = db_uri
83   - db_path = '../db/database.db'
84   - app.config['SQLALCHEMY_BINDS'] = {'db2': f'sqlite:///{db_path}'}
  83 + #db_path = '../db/database.db'
  84 + #app.config['SQLALCHEMY_BINDS'] = {'db2': f'sqlite:///{db_path}'}
85 85 self.db.init_app(app)
86 86  
87 87 def init_lm(self, app):
1   -import uuid
2   -from datetime import datetime
3   -from .k2cfg import k2
4   -
5   -db = k2.db
6   -def generate_id():
7   - generated_id = uuid.uuid4().hex[:32]
8   - return ''.join([generated_id[i:i + 4] for i in range(0, len(generated_id), 4)])
9   -class Component(db.Model):
10   - __bind_key__ = 'db2'
11   - __tablename__ = 'component'
12   - __table_args__ = {'extend_existing': True}
13   - id = db.Column(db.String(36), primary_key=True, default=generate_id)
14   - name = db.Column(db.String(100), nullable=False)
15   - description = db.Column(db.String(200))
16   - version = db.Column(db.String(20))
17   - git_link = db.Column(db.String(200))
18   - dependencies = db.Column(db.String)
19   - date_installed = db.Column(db.DateTime, default=datetime.utcnow)
20   - installed = db.Column(db.Boolean, default=False)
21   -
22   - def __init__(self, name, description, version, git_link, dependencies, installed):
23   - self.name = name
24   - self.description = description
25   - self.version = version
26   - self.git_link = git_link
27   - self.dependencies = dependencies
28   - self.installed = installed
29   - def __repr__(self):
30   - return f"Component('{self.name}', '{self.version}')"
31   - @classmethod
32   - def get_repository_by_id(self,rep_id):
33   - component = db.session.query(Component).filter(Component.id == rep_id).first()
34   - return component
35   - @classmethod
36   - def get_repository_by_id(self,rep_id):
37   - component = db.session.query(Component).filter(Component.id == rep_id).first()
38   - return component
  1 +# import uuid
  2 +# from datetime import datetime
  3 +# from .k2cfg import k2
  4 +#
  5 +# db = k2.db
  6 +# def generate_id():
  7 +# generated_id = uuid.uuid4().hex[:32]
  8 +# return ''.join([generated_id[i:i + 4] for i in range(0, len(generated_id), 4)])
  9 +# class Component(db.Model):
  10 +# __bind_key__ = 'db2'
  11 +# __tablename__ = 'component'
  12 +# __table_args__ = {'extend_existing': True}
  13 +# id = db.Column(db.String(36), primary_key=True, default=generate_id)
  14 +# name = db.Column(db.String(100), nullable=False)
  15 +# description = db.Column(db.String(200))
  16 +# version = db.Column(db.String(20))
  17 +# git_link = db.Column(db.String(200))
  18 +# dependencies = db.Column(db.String)
  19 +# date_installed = db.Column(db.DateTime, default=datetime.utcnow)
  20 +# installed = db.Column(db.Boolean, default=False)
  21 +#
  22 +# def __init__(self, name, description, version, git_link, dependencies, installed):
  23 +# self.name = name
  24 +# self.description = description
  25 +# self.version = version
  26 +# self.git_link = git_link
  27 +# self.dependencies = dependencies
  28 +# self.installed = installed
  29 +# def __repr__(self):
  30 +# return f"Component('{self.name}', '{self.version}')"
  31 +# @classmethod
  32 +# def get_repository_by_id(self,rep_id):
  33 +# component = db.session.query(Component).filter(Component.id == rep_id).first()
  34 +# return component
  35 +# @classmethod
  36 +# def get_repository_by_id(self,rep_id):
  37 +# component = db.session.query(Component).filter(Component.id == rep_id).first()
  38 +# return component
  39 +#
  40 +#