yusur/salvi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add database url support

Browse source
This commit is contained in:
Yusur 2022-05-30 13:16:07 +02:00
parent c4e7c65ab2
commit 5f06aa7e9b
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app.py
View file

@ -18,6 +18,7 @@ from flask import (
render_template, send_from_directory) render_template, send_from_directory)
from werkzeug.routing import BaseConverter from werkzeug.routing import BaseConverter
from peewee import * from peewee import *
from playhouse.db_url import connect as dbconnect
import csv, datetime, hashlib, html, importlib, json, markdown, os, random, \ import csv, datetime, hashlib, html, importlib, json, markdown, os, random, \
re, sys, uuid, warnings re, sys, uuid, warnings
from functools import lru_cache, partial from functools import lru_cache, partial
@ -57,8 +58,7 @@ DATABASE_DIR = APP_BASE_DIR + "/database"
DEFAULT_CONF = { DEFAULT_CONF = {
('site', 'title'): 'Salvi', ('site', 'title'): 'Salvi',
('config', 'media_dir'): APP_BASE_DIR + '/media', ('database', 'directory'): APP_BASE_DIR + "/database",
('config', 'database_dir'): APP_BASE_DIR + "/database",
} }
_cfp = ConfigParser() _cfp = ConfigParser()
@ -120,7 +120,11 @@ class SpoilerExtension(markdown.extensions.Extension):
#### DATABASE SCHEMA #### #### DATABASE SCHEMA ####
database = SqliteDatabase(_getconf("config", "database_dir") + '/data.sqlite') database_url = _getconf('database', 'url')
if database_url:
database = dbconnect(database_url)
else:
database = SqliteDatabase(_getconf("database", "directory") + '/data.sqlite')
class BaseModel(Model): class BaseModel(Model):
class Meta: class Meta: